čt 14. 5. 2020 v 8:48 odesílatel Michal Simek michal.simek@xilinx.com napsal:

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@psi.ch Signed-off-by: Michal Simek michal.simek@xilinx.com Signed-off-by: Ashok Reddy Soma ashok.reddy.soma@xilinx.com

---

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

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 }

-- 2.26.2

Applied. M