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

Commit 308c6caf authored by Yonglong Liu's avatar Yonglong Liu Committed by David S. Miller
Browse files

net: hns: All ports can not work when insmod hns ko after rmmod. 



There are two test cases:
1. Remove the 4 modules:hns_enet_drv/hns_dsaf/hnae/hns_mdio,
   and install them again, must use "ifconfig down/ifconfig up"
   command pair to bring port to work.

   This patch calls phy_stop function when init phy to fix this bug.

2. Remove the 2 modules:hns_enet_drv/hns_dsaf, and install them again,
   all ports can not use anymore, because of the phy devices register
   failed(phy devices already exists).

   Phy devices are registered when hns_dsaf installed, this patch
   removes them when hns_dsaf removed.

The two cases are sometimes related, fixing the second case also requires
fixing the first case, so fix them together.

Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e1d4be6

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c

+15 −0
Original line number Diff line number Diff line
@@ -778,6 +778,17 @@ static int hns_mac_register_phy(struct hns_mac_cb *mac_cb) 
	return rc;

}



static void hns_mac_remove_phydev(struct hns_mac_cb *mac_cb)

{

	if (!to_acpi_device_node(mac_cb->fw_port) || !mac_cb->phy_dev)

		return;



	phy_device_remove(mac_cb->phy_dev);

	phy_device_free(mac_cb->phy_dev);



	mac_cb->phy_dev = NULL;

}



#define MAC_MEDIA_TYPE_MAX_LEN		16



static const struct {
@@ -1117,7 +1128,11 @@ void hns_mac_uninit(struct dsaf_device *dsaf_dev) 
	int max_port_num = hns_mac_get_max_port_num(dsaf_dev);



	for (i = 0; i < max_port_num; i++) {

		if (!dsaf_dev->mac_cb[i])

			continue;



		dsaf_dev->misc_op->cpld_reset_led(dsaf_dev->mac_cb[i]);

		hns_mac_remove_phydev(dsaf_dev->mac_cb[i]);

		dsaf_dev->mac_cb[i] = NULL;

	}

}

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+3 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,9 @@ int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h) 
	if (h->phy_if == PHY_INTERFACE_MODE_XGMII)

		phy_dev->autoneg = false;



	if (h->phy_if == PHY_INTERFACE_MODE_SGMII)

		phy_stop(phy_dev);



	return 0;

}