41c164d32b
Import patches to fix several issues with status reporting of RealTek 2.5G PHYs. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
From patchwork Wed Jan 15 14:43:35 2025
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
|
|
X-Patchwork-Id: 13940510
|
|
X-Patchwork-Delegate: kuba@kernel.org
|
|
Date: Wed, 15 Jan 2025 14:43:35 +0000
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>,
|
|
Russell King <linux@armlinux.org.uk>,
|
|
"David S. Miller" <davem@davemloft.net>,
|
|
Eric Dumazet <edumazet@google.com>,
|
|
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
|
|
Daniel Golle <daniel@makrotopia.org>,
|
|
"Russell King (Oracle)" <linux@armlinux.org.uk>,
|
|
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
|
|
Subject: [PATCH net 1/3] net: phy: realtek: clear 1000Base-T lpa if link is
|
|
down
|
|
Message-ID:
|
|
<67e38eee4c46b921938fb33f5bc86c8979b9aa33.1736951652.git.daniel@makrotopia.org>
|
|
References: <cover.1736951652.git.daniel@makrotopia.org>
|
|
Precedence: bulk
|
|
X-Mailing-List: netdev@vger.kernel.org
|
|
List-Id: <netdev.vger.kernel.org>
|
|
List-Subscribe: <mailto:netdev+subscribe@vger.kernel.org>
|
|
List-Unsubscribe: <mailto:netdev+unsubscribe@vger.kernel.org>
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
In-Reply-To: <cover.1736951652.git.daniel@makrotopia.org>
|
|
X-Patchwork-Delegate: kuba@kernel.org
|
|
|
|
Only read 1000Base-T link partner advertisement if autonegotiation has
|
|
completed and otherwise 1000Base-T link partner advertisement bits.
|
|
|
|
This fixes bogus 1000Base-T link partner advertisement after link goes
|
|
down (eg. by disconnecting the wire).
|
|
Fixes: 5cb409b3960e ("net: phy: realtek: clear 1000Base-T link partner advertisement")
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
|
|
---
|
|
drivers/net/phy/realtek/realtek_main.c | 19 ++++++++-----------
|
|
1 file changed, 8 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/net/phy/realtek/realtek_main.c
|
|
+++ b/drivers/net/phy/realtek/realtek_main.c
|
|
@@ -1068,23 +1068,20 @@ static int rtl822x_c45_read_status(struc
|
|
{
|
|
int ret, val;
|
|
|
|
- ret = genphy_c45_read_status(phydev);
|
|
- if (ret < 0)
|
|
- return ret;
|
|
-
|
|
- if (phydev->autoneg == AUTONEG_DISABLE ||
|
|
- !genphy_c45_aneg_done(phydev))
|
|
- mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
|
|
-
|
|
/* Vendor register as C45 has no standardized support for 1000BaseT */
|
|
- if (phydev->autoneg == AUTONEG_ENABLE) {
|
|
+ if (phydev->autoneg == AUTONEG_ENABLE && genphy_c45_aneg_done(phydev)) {
|
|
val = phy_read_mmd(phydev, MDIO_MMD_VEND2,
|
|
RTL822X_VND2_GANLPAR);
|
|
if (val < 0)
|
|
return val;
|
|
-
|
|
- mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
|
|
+ } else {
|
|
+ val = 0;
|
|
}
|
|
+ mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
|
|
+
|
|
+ ret = genphy_c45_read_status(phydev);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
|
|
if (!phydev->link)
|
|
return 0;
|