diff mbox series

[net-next] net: phylink: disable BMCR_ISOLATE in phylink_mii_c22_pcs_config

Message ID 20201026175802.1332477-1-robert.hancock@calian.com
State New
Headers show
Series [net-next] net: phylink: disable BMCR_ISOLATE in phylink_mii_c22_pcs_config | expand

Commit Message

Robert Hancock Oct. 26, 2020, 5:58 p.m. UTC 
The Xilinx PCS/PMA PHY requires that BMCR_ISOLATE be disabled for proper
operation in 1000BaseX mode. It should be safe to ensure this bit is
disabled in phylink_mii_c22_pcs_config in all cases.

Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Reviewed-by: Russell King <rmk+kernel@armlinux.org.uk>
---

Resubmit tagged for net-next.

 drivers/net/phy/phylink.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jakub Kicinski Oct. 28, 2020, 1:31 a.m. UTC | #1 
On Mon, 26 Oct 2020 11:58:02 -0600 Robert Hancock wrote:
> The Xilinx PCS/PMA PHY requires that BMCR_ISOLATE be disabled for proper
> operation in 1000BaseX mode. It should be safe to ensure this bit is
> disabled in phylink_mii_c22_pcs_config in all cases.
> 
> Signed-off-by: Robert Hancock <robert.hancock@calian.com>
> Reviewed-by: Russell King <rmk+kernel@armlinux.org.uk>
> ---
> 
> Resubmit tagged for net-next.

Applied, thank you!
diff mbox series

Patch

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index fe2296fdda19..5d8c015bc9f2 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -2515,9 +2515,10 @@  int phylink_mii_c22_pcs_config(struct mdio_device *pcs, unsigned int mode,
 
 	changed = ret > 0;
 
+	/* Ensure ISOLATE bit is disabled */
 	bmcr = mode == MLO_AN_INBAND ? BMCR_ANENABLE : 0;
 	ret = mdiobus_modify(pcs->bus, pcs->addr, MII_BMCR,
-			     BMCR_ANENABLE, bmcr);
+			     BMCR_ANENABLE | BMCR_ISOLATE, bmcr);
 	if (ret < 0)
 		return ret;