From: Valentin-catalin Neacsu <valentin-catalin.neacsu@nxp.com>
Date: Tue, 30 Oct 2018 09:54:46 +0000 (+0000)
Subject: net: phy: aquantia: Enable autoneg when on USXGMII
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c54bfbf96f908e8b84291b7c556a2a1cabecac23;p=u-boot.git

net: phy: aquantia: Enable autoneg when on USXGMII

If System Interface protocol is USXGMII then enable USXGMII autoneg

Signed-off-by: Valentin Catalin Neacsu <valentin-catalin.neacsu@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index a0abb23299..3edc35eb21 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -3,6 +3,7 @@
  * Aquantia PHY drivers
  *
  * Copyright 2014 Freescale Semiconductor, Inc.
+ * Copyright 2018 NXP
  */
 #include <config.h>
 #include <common.h>
@@ -19,6 +20,13 @@
 #define AQUNTIA_SPEED_LSB_MASK	0x2000
 #define AQUNTIA_SPEED_MSB_MASK	0x40
 
+#define AQUANTIA_SYSTEM_INTERFACE_SR     0xe812
+#define AQUANTIA_VENDOR_PROVISIONING_REG 0xC441
+
+#define AQUANTIA_USX_AUTONEG_CONTROL_ENA 0x0008
+#define AQUANTIA_SI_IN_USE_MASK          0x0078
+#define AQUANTIA_SI_USXGMII              0x0018
+
 /* registers in MDIO_MMD_VEND1 region */
 #define GLOBAL_FIRMWARE_ID 0x20
 #define GLOBAL_FAULT 0xc850
@@ -284,6 +292,16 @@ int aquantia_config(struct phy_device *phydev)
 			phy_write(phydev, MDIO_MMD_PMAPMD, MII_BMCR,
 				  AQUNTIA_SPEED_LSB_MASK |
 				  AQUNTIA_SPEED_MSB_MASK);
+
+		val = phy_read(phydev, MDIO_MMD_PHYXS,
+			       AQUANTIA_SYSTEM_INTERFACE_SR);
+		/* If SI is USXGMII then start USXGMII autoneg */
+		if ((val & AQUANTIA_SI_IN_USE_MASK) == AQUANTIA_SI_USXGMII) {
+			phy_write(phydev, MDIO_MMD_PHYXS,
+				  AQUANTIA_VENDOR_PROVISIONING_REG,
+				  AQUANTIA_USX_AUTONEG_CONTROL_ENA);
+		}
+
 	} else if (phydev->interface == PHY_INTERFACE_MODE_SGMII_2500) {
 		/* 2.5GBASE-T mode */
 		phydev->advertising = SUPPORTED_1000baseT_Full;