Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5ef83cb authored May 01, 2018 by Huazhong Tan Committed by David S. Miller May 01, 2018

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>

parent ffd5656e

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -5503,12 +5503,14 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
		goto err_sriov_disable;
		}

		if (hdev->hw.mac.media_type == HNAE3_MEDIA_TYPE_COPPER) {
		ret = hclge_mac_mdio_config(hdev);
		if (ret) {
		dev_warn(&hdev->pdev->dev,
		dev_err(&hdev->pdev->dev,
		"mdio config fail ret=%d\n", ret);
		goto err_sriov_disable;
		}
		}

		ret = hclge_mac_init(hdev);
		if (ret) {

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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)