From nobody Mon May 25 06:41:07 2026 Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E82D83B775E for ; Sun, 17 May 2026 14:20:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779027605; cv=none; b=OOtzaIRbhN2ldtHZnoUg1nhJMSUToUmSSLMHUPoaDJcukqdBMxZzPbma6QjtnB38fI46ZqkzdJWRXI7X1S1envnUdbYlxvbcZcjwYpIxaJEw7iCWUrPIvFSYpqiU901U2vjJW3jnNDjDRRWUlw/NE2223Qen5m+6U8Mff6FLJIU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779027605; c=relaxed/simple; bh=FgMuZMFbAPsvJz1TbL2odfi2bqtJjH8DMVa7sdhzyHI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ZMilnPYUqDwMSj9GrllBIVEhQRGuhXjpgVKQrVbr2j35Stya7Uj9LT43Kh7ESPLzQC626UCqlM2UZ8/F7RGvWMtEchoteAWMjugFqGZwC8HnsrClvn6afaiRPx0Ik1Bnhd1TMacnwEiv0nP7jWVnNEnK3iL7rQVz/+uQaNnu4Es= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=V7WqV8oM; arc=none smtp.client-ip=209.85.161.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V7WqV8oM" Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-6948fb494a0so682363eaf.2 for ; Sun, 17 May 2026 07:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779027599; x=1779632399; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=X2dHAbJHKvqoa7MzKayL3x2YgTfCv90vmXzecnGUpW4=; b=V7WqV8oMq5y1paz6QetWMyIOVXe1STmu7RcDXg3V8Ng768he8cOSLCkI23XlGqAYus CKfaY1o6tV+Imw7T1/atwKtsAbG9KGF46HOLLMg+TI5V9CxWqnPKbT1O0I0eLWuZhkyy 5843M7URwcaw9oDWHyBhyG3jJ1jm0BHHKc9Ppa73lxRe32rD4Sy4Qt8SWLhsnVwLYkAw 7vFvNdW93Kuxa6vfypMQPhvghCP00l6YLOuHdI3zs1pdQO8aVh9agLqHmEBGUGLZOxhI a3QC5E/7HBjk5h4lW5StOOrw/awovgu2xqXFVwyM910la7vyuoyJ2JzJwVAObDT6fe0j vDqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779027599; x=1779632399; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=X2dHAbJHKvqoa7MzKayL3x2YgTfCv90vmXzecnGUpW4=; b=F8/Mcz7isN+W7j5ve2hfPpCNeaqudev2b81j76vlawTJERYMXKL8J7wvgX5D0xC4ef RUACiN4/2aT3tk3wM0cXhP2N8Pqd6tacIJPOywtg7vYuWNce9V3/yqus8n6/mkvHuMl9 I5JC+ICfmy/TnZXeeEfNaqFaNq3zE80dnWZd8C7j3xKOWt3V4JBXEoVvf+4pRNeEiZf5 m33Owc0bQpM5GcuZMejdmw/Bj9+mKulDFcnlF+siroKL5IeYyZB0Lnb/HFMfCewxcjl6 k8vW+G6q9D6kVSTyNwGBMXiPc22vNq2IcH9hce0flJSW2/p6wxoh6LGTJLcR40JqgD8U t5Tg== X-Forwarded-Encrypted: i=1; AFNElJ8dKY1Fk786V3D819xZXgS4UZgcmjjngpe9Msqffzu/SSM5UZis+eWwHFgn0faLwal3HboQiWJnHVMnB8Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxMaChL+irXe8juNkcFcrMtz79AphyJk7/5/+p69hQq1uQz4taL LCzOh0t9Qe9BtFdlAQiUwtKm6BqSyaWA+COrBUA7GbpGO3mHu/dUU368EAOr1uVM X-Gm-Gg: Acq92OHFXp0Hda/DP1fNySw4iywNuFE7e16FlNLdo6fLdGWbe3OudMCHU8GaxPpOAVe jaJOUz/tce9jhYOTRX1tC76oA8adAt7gkAruVeGBbZ7lNya9Fo0M53NcdViL2X0aFclZZ6WLSeX 5Tc/7t4l7/5FXxcGQiGxlG40Z0hVqqGgpN9reAT3U4Qjo/CNyEyW7+KWexzXhqEm9ie+F8XfOyw xmza6FiHvgHhR3Kv0eiBLGltNhVoHRU2E7HyccgKO2KuaWA2vHSUoxUKuG+16B7ma9iznUhC6xR dmdM4nZ09l/I7bXp81YRcTGUpVey95iYXsnOoZj8AyfW9IyKM2fU5UFx1XlHu86hoJOs/ec8dSr HRME1XxaAGzzJyc36yYpplNn+hc0GcC+Q8u2RHhJbB6W48UemHIXRGPxS296WxeTgq0EEKFnpzK +PqI3rrOYk9aqNSPJ9HUoKB5kNh2++LuYlvwHwxdH3 X-Received: by 2002:a05:6820:615:b0:681:b070:3dc6 with SMTP id 006d021491bc7-69c942ad83cmr7426375eaf.10.1779027599500; Sun, 17 May 2026 07:19:59 -0700 (PDT) Received: from MacMini.lan ([172.127.162.94]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-69d04911744sm4153583eaf.12.2026.05.17.07.19.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 17 May 2026 07:19:59 -0700 (PDT) From: shayderrr To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Pranav Bajjuri Subject: [PATCH] net: octeon: fix carrier state, null guard, and modernize phy ioctl Date: Sun, 17 May 2026 09:19:55 -0500 Message-ID: <20260517141955.79666-1-darknessshayder@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pranav Bajjuri Add netif_carrier_off() to cvm_oct_common_stop(), guard cvm_oct_adjust_link() against null phydev, replace open-coded ioctl checks with phy_do_ioctl_running(), and zero priv->link_info on stop alongside last_link. Signed-off-by: Pranav Bajjuri --- drivers/staging/octeon/ethernet-mdio.c | 64 +++++++++----------------- 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeo= n/ethernet-mdio.c index 211423059e30..4b5cac324eff 100644 --- a/drivers/staging/octeon/ethernet-mdio.c +++ b/drivers/staging/octeon/ethernet-mdio.c @@ -17,6 +17,8 @@ #include "ethernet-mdio.h" #include "ethernet-util.h" =20 +#define CVM_OCT_PHY_FLAGS 0 + static void cvm_oct_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { @@ -36,30 +38,16 @@ static int cvm_oct_nway_reset(struct net_device *dev) } =20 const struct ethtool_ops cvm_oct_ethtool_ops =3D { - .get_drvinfo =3D cvm_oct_get_drvinfo, - .nway_reset =3D cvm_oct_nway_reset, - .get_link =3D ethtool_op_get_link, - .get_link_ksettings =3D phy_ethtool_get_link_ksettings, - .set_link_ksettings =3D phy_ethtool_set_link_ksettings, + .get_drvinfo =3D cvm_oct_get_drvinfo, + .nway_reset =3D cvm_oct_nway_reset, + .get_link =3D ethtool_op_get_link, + .get_link_ksettings =3D phy_ethtool_get_link_ksettings, + .set_link_ksettings =3D phy_ethtool_set_link_ksettings, }; =20 -/** - * cvm_oct_ioctl - IOCTL support for PHY control - * @dev: Device to change - * @rq: the request - * @cmd: the command - * - * Returns Zero on success - */ int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - if (!netif_running(dev)) - return -EINVAL; - - if (!dev->phydev) - return -EINVAL; - - return phy_mii_ioctl(dev->phydev, rq, cmd); + return phy_do_ioctl_running(dev, rq, cmd); } =20 void cvm_oct_note_carrier(struct octeon_ethernet *priv, @@ -81,15 +69,15 @@ void cvm_oct_adjust_link(struct net_device *dev) struct octeon_ethernet *priv =3D netdev_priv(dev); union cvmx_helper_link_info link_info; =20 + if (WARN_ON(!dev->phydev)) + return; + link_info.u64 =3D 0; link_info.s.link_up =3D dev->phydev->link ? 1 : 0; - link_info.s.full_duplex =3D dev->phydev->duplex ? 1 : 0; + link_info.s.full_duplex =3D dev->phydev->duplex ? 1 : 0; link_info.s.speed =3D dev->phydev->speed; priv->link_info =3D link_info.u64; =20 - /* - * The polling task need to know about link status changes. - */ if (priv->poll) priv->poll(dev); =20 @@ -100,13 +88,13 @@ void cvm_oct_adjust_link(struct net_device *dev) } } =20 -int cvm_oct_common_stop(struct net_device *dev) +void cvm_oct_common_stop(struct net_device *dev) { struct octeon_ethernet *priv =3D netdev_priv(dev); int interface =3D INTERFACE(priv->port); + int index =3D INDEX(priv->port); union cvmx_helper_link_info link_info; union cvmx_gmxx_prtx_cfg gmx_cfg; - int index =3D INDEX(priv->port); =20 gmx_cfg.u64 =3D cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface)); gmx_cfg.s.en =3D 0; @@ -114,26 +102,21 @@ int cvm_oct_common_stop(struct net_device *dev) =20 priv->poll =3D NULL; =20 + netif_carrier_off(dev); + if (dev->phydev) phy_disconnect(dev->phydev); =20 if (priv->last_link) { - link_info.u64 =3D 0; - priv->last_link =3D 0; + link_info.u64 =3D 0; + priv->link_info =3D 0; + priv->last_link =3D 0; =20 cvmx_helper_link_set(priv->port, link_info); cvm_oct_note_carrier(priv, link_info); } - return 0; } =20 -/** - * cvm_oct_phy_setup_device - setup the PHY - * - * @dev: Device to setup - * - * Returns Zero on success, negative on failure - */ int cvm_oct_phy_setup_device(struct net_device *dev) { struct octeon_ethernet *priv =3D netdev_priv(dev); @@ -149,8 +132,8 @@ int cvm_oct_phy_setup_device(struct net_device *dev) if (!phy_node) goto no_phy; =20 - phydev =3D of_phy_connect(dev, phy_node, cvm_oct_adjust_link, 0, - priv->phy_mode); + phydev =3D of_phy_connect(dev, phy_node, cvm_oct_adjust_link, + CVM_OCT_PHY_FLAGS, priv->phy_mode); of_node_put(phy_node); =20 if (!phydev) @@ -160,10 +143,9 @@ int cvm_oct_phy_setup_device(struct net_device *dev) phy_start(phydev); =20 return 0; + no_phy: - /* If there is no phy, assume a direct MAC connection and that - * the link is up. - */ netif_carrier_on(dev); return 0; } + --=20 2.50.1 (Apple Git-155)