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

Commit c4b64011 authored by Peng Li's avatar Peng Li Committed by Greg Kroah-Hartman
Browse files

net: hns3: disable sriov before unload hclge layer 



[ Upstream commit 0dd8a25f355b4df2d41c08df1716340854c7d4c5 ]

HNS3 driver includes hns3.ko, hnae3.ko and hclge.ko.
hns3.ko includes network stack and pci_driver, hclge.ko includes
HW device action, algo_ops and timer task, hnae3.ko includes some
register function.

When SRIOV is enable and hclge.ko is removed, HW device is unloaded
but VF still exists, PF will not reply VF mbx messages, and cause
errors.

This patch fix it by disable SRIOV before remove hclge.ko.

Fixes: e2cb1dec ("net: hns3: Add HNS3 VF HCL(Hardware Compatibility Layer) Support")
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 472acf15

drivers/net/ethernet/hisilicon/hns3/hnae3.c

+21 −0
Original line number Diff line number Diff line
@@ -10,6 +10,27 @@ static LIST_HEAD(hnae3_ae_algo_list); 
static LIST_HEAD(hnae3_client_list);

static LIST_HEAD(hnae3_ae_dev_list);



void hnae3_unregister_ae_algo_prepare(struct hnae3_ae_algo *ae_algo)

{

	const struct pci_device_id *pci_id;

	struct hnae3_ae_dev *ae_dev;



	if (!ae_algo)

		return;



	list_for_each_entry(ae_dev, &hnae3_ae_dev_list, node) {

		if (!hnae3_get_bit(ae_dev->flag, HNAE3_DEV_INITED_B))

			continue;



		pci_id = pci_match_id(ae_algo->pdev_id_table, ae_dev->pdev);

		if (!pci_id)

			continue;

		if (IS_ENABLED(CONFIG_PCI_IOV))

			pci_disable_sriov(ae_dev->pdev);

	}

}

EXPORT_SYMBOL(hnae3_unregister_ae_algo_prepare);



/* we are keeping things simple and using single lock for all the

 * list. This is a non-critical code so other updations, if happen

 * in parallel, can wait.

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+1 −0
Original line number Diff line number Diff line
@@ -666,6 +666,7 @@ struct hnae3_handle { 
int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev);

void hnae3_unregister_ae_dev(struct hnae3_ae_dev *ae_dev);



void hnae3_unregister_ae_algo_prepare(struct hnae3_ae_algo *ae_algo);

void hnae3_unregister_ae_algo(struct hnae3_ae_algo *ae_algo);

void hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo);

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

+1 −0
Original line number Diff line number Diff line
@@ -10274,6 +10274,7 @@ static int hclge_init(void) 


static void hclge_exit(void)

{

	hnae3_unregister_ae_algo_prepare(&ae_algo);

	hnae3_unregister_ae_algo(&ae_algo);

}

module_init(hclge_init);