Merge branch pull request #13 into aspeed-dev-v2019.04

Change-Id: I642bbbb0700c982119137d7cdae034635f9dc3d2
openbmc · Jul 28, 2022 · d473bc7 · d473bc7
2 parents d96d7db + 2116324
commit d473bc7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 4 deletions.
diff --git a/configs/evb-ast2400_defconfig b/configs/evb-ast2400_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_NCSI=y
 CONFIG_DEFAULT_DEVICE_TREE="ast2400-evb"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
@@ -56,6 +57,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y

diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_NCSI=y
 CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
@@ -57,6 +58,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y

diff --git a/configs/evb-ast2600-spl_defconfig b/configs/evb-ast2600-spl_defconfig
@@ -67,6 +67,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_NCSI=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
@@ -115,6 +116,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y

diff --git a/configs/evb-ast2600_defconfig b/configs/evb-ast2600_defconfig
@@ -35,6 +35,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_NCSI=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
@@ -74,6 +75,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y

diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
@@ -117,7 +117,7 @@ static int ftgmac100_mdio_read(struct mii_dev *bus, int phy_addr, int dev_addr,
  FTGMAC100_MDIO_TIMEOUT_USEC);
  if (ret) {
  pr_err("%s: mdio read failed (phy:%d reg:%x)\n",
- priv->phydev->dev->name, phy_addr, reg_addr);
+ bus->name, phy_addr, reg_addr);
  return ret;
  }
 
@@ -149,7 +149,7 @@ static int ftgmac100_mdio_write(struct mii_dev *bus, int phy_addr, int dev_addr,
  FTGMAC100_MDIO_TIMEOUT_USEC);
  if (ret) {
  pr_err("%s: mdio write failed (phy:%d reg:%x)\n",
- priv->phydev->dev->name, phy_addr, reg_addr);
+ bus->name, phy_addr, reg_addr);
  }
 
  return ret;
@@ -597,6 +597,12 @@ static int ftgmac100_probe(struct udevice *dev)
  goto out;
 
  if (priv->ncsi_mode) {
+ if (!IS_ENABLED(CONFIG_PHY_NCSI)) {
+ dev_err(dev,
+ "ftgmac100: NCSI in dts but CONFIG_PHY_NCSI missing. Please fix config\n");
+ return -EINVAL;
+ }
+
  printf("%s - NCSI detected\n", __func__);
  } else {
  ret = ftgmac100_mdio_init(dev);

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
@@ -932,7 +932,8 @@ struct phy_device *phy_connect(struct mii_dev *bus, int addr,
 #endif
 
 #ifdef CONFIG_PHY_NCSI
- phydev = phy_device_create(bus, 0, PHY_NCSI_ID, false, interface);
+ if (interface == PHY_INTERFACE_MODE_NCSI)
+ phydev = phy_device_create(bus, 0, PHY_NCSI_ID, false, interface);
 #endif
 
  if (!phydev)
@@ -988,3 +989,10 @@ int phy_get_interface_by_name(const char *str)
 
  return -1;
 }
+
+bool phy_interface_is_ncsi(void)
+{
+ struct eth_pdata *pdata = dev_get_platdata(eth_get_dev());
+
+ return pdata->phy_interface == PHY_INTERFACE_MODE_NCSI;
+}
diff --git a/include/phy.h b/include/phy.h
@@ -287,6 +287,8 @@ static inline bool phy_interface_is_sgmii(struct phy_device *phydev)
  phydev->interface <= PHY_INTERFACE_MODE_QSGMII;
 }
 
+bool phy_interface_is_ncsi(void);
+
 /* PHY UIDs for various PHYs that are referenced in external code */
 #define PHY_UID_CS4340 0x13e51002
 #define PHY_UID_CS4223 0x03e57003

diff --git a/net/net.c b/net/net.c
@@ -409,7 +409,7 @@ int net_loop(enum proto_t protocol)
  debug_cond(DEBUG_INT_STATE, "--- net_loop Entry\n");
 
 #ifdef CONFIG_PHY_NCSI
- if (protocol != NCSI && !ncsi_active()) {
+ if (phy_interface_is_ncsi() && protocol != NCSI && !ncsi_active()) {
  printf("Configuring NCSI\n");
  if (net_loop(NCSI) < 0)
  return ret;