net: hns3: fix for phy_addr error in hclge_mac_mdio_config

When phy exists, phy_addr must less than PHY_MAX_ADDR.
If not, hclge_mac_mdio_config should return error.
And for fiber(phy_addr=0xff), it does not need hclge_mac_mdio_config.

Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index b5e0c58fe0c23e9766677fa2233485c94ac65a57..cc09713b89ada1bb182f62fac931c41c553d5aca 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -5503,11 +5503,13 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
                goto err_sriov_disable;
        }
 
-       ret = hclge_mac_mdio_config(hdev);
-       if (ret) {
-               dev_warn(&hdev->pdev->dev,
-                        "mdio config fail ret=%d\n", ret);
-               goto err_sriov_disable;
+       if (hdev->hw.mac.media_type == HNAE3_MEDIA_TYPE_COPPER) {
+               ret = hclge_mac_mdio_config(hdev);
+               if (ret) {
+                       dev_err(&hdev->pdev->dev,
+                               "mdio config fail ret=%d\n", ret);
+                       goto err_sriov_disable;
+               }
        }
 
        ret = hclge_mac_init(hdev);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
index 682c2d6618e7b547c544e3a92d86a83eca554fd8..9f7932e423b5ec3efdad1b7d0cce4f39a1847e07 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
@@ -140,8 +140,11 @@ int hclge_mac_mdio_config(struct hclge_dev *hdev)
        struct mii_bus *mdio_bus;
        int ret;
 
-       if (hdev->hw.mac.phy_addr >= PHY_MAX_ADDR)
-               return 0;
+       if (hdev->hw.mac.phy_addr >= PHY_MAX_ADDR) {
+               dev_err(&hdev->pdev->dev, "phy_addr(%d) is too large.\n",
+                       hdev->hw.mac.phy_addr);
+               return -EINVAL;
+       }
 
        mdio_bus = devm_mdiobus_alloc(&hdev->pdev->dev);
        if (!mdio_bus)