46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From cdb08aa0473730315dbc088d5394e59622314034 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Fri, 16 Jun 2023 13:06:27 +0100
|
|
Subject: [PATCH 1/2] net: phylink: convert phylink_mii_c22_pcs_config() to
|
|
neg_mode
|
|
|
|
Use phylink_pcs_neg_mode() for phylink_mii_c22_pcs_config(). This
|
|
results in no functional change.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Link: https://lore.kernel.org/r/E1qA8Dj-00EaFG-Mt@rmk-PC.armlinux.org.uk
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/phy/phylink.c | 9 ++++-----
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -3558,6 +3558,7 @@ int phylink_mii_c22_pcs_config(struct md
|
|
phy_interface_t interface,
|
|
const unsigned long *advertising)
|
|
{
|
|
+ unsigned int neg_mode;
|
|
bool changed = 0;
|
|
u16 bmcr;
|
|
int ret, adv;
|
|
@@ -3571,15 +3572,13 @@ int phylink_mii_c22_pcs_config(struct md
|
|
changed = ret;
|
|
}
|
|
|
|
- /* Ensure ISOLATE bit is disabled */
|
|
- if (mode == MLO_AN_INBAND &&
|
|
- (interface == PHY_INTERFACE_MODE_SGMII ||
|
|
- interface == PHY_INTERFACE_MODE_QSGMII ||
|
|
- linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, advertising)))
|
|
+ neg_mode = phylink_pcs_neg_mode(mode, interface, advertising);
|
|
+ if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED)
|
|
bmcr = BMCR_ANENABLE;
|
|
else
|
|
bmcr = 0;
|
|
|
|
+ /* Configure the inband state. Ensure ISOLATE bit is disabled */
|
|
ret = mdiodev_modify(pcs, MII_BMCR, BMCR_ANENABLE | BMCR_ISOLATE, bmcr);
|
|
if (ret < 0)
|
|
return ret;
|