diff mbox series

net: gem: Disable PCS autonegotiation in case of fixed-link

Message ID 0f0e0c199ac23831418858586543676293021bb4.1589438922.git.michal.simek@xilinx.com
State Accepted
Commit 26e62cc9713ebe728d01826e8c22c3c56f8e3bf4
Headers show
Series net: gem: Disable PCS autonegotiation in case of fixed-link | expand

Commit Message

Michal Simek May 14, 2020, 6:48 a.m. UTC 
Disable PCS autonegotiation if fixed-link node is present in device tree.
This way systems with multiple GEM instances with a combination of
SGMII-fixed and SGMII-PHY will work.

Reported-by: Goran Marinkovic <goran.marinkovic at psi.ch>
Signed-off-by: Michal Simek <michal.simek at xilinx.com>
Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma at xilinx.com>
---

 drivers/net/zynq_gem.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox series

Patch

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index a158824fc9fd..8cbe40dc75b1 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -448,8 +448,12 @@  static int zynq_gem_init(struct udevice *dev)
 		nwconfig |= ZYNQ_GEM_NWCFG_SGMII_ENBL |
 			    ZYNQ_GEM_NWCFG_PCS_SEL;
 #ifdef CONFIG_ARM64
+	if (priv->phydev->phy_id != PHY_FIXED_ID)
 		writel(readl(&regs->pcscntrl) | ZYNQ_GEM_PCS_CTL_ANEG_ENBL,
 		       &regs->pcscntrl);
+	else
+		writel(readl(&regs->pcscntrl) & ~ZYNQ_GEM_PCS_CTL_ANEG_ENBL,
+		       &regs->pcscntrl);
 #endif
 	}