net: hns3: get vf count by pci_sriov_get_totalvfs

321lipeng · davem330 · commit 709eb41ad8cd · 2017-10-24T01:16:41.000+01:00
This patch gets vf count by standard function pci_sriov_get_totalvfs,
instead of info from NIC HW.

Signed-off-by: Lipeng &lt;lipeng321@huawei.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -837,7 +837,6 @@ static int hclge_parse_func_status(struct hclge_dev *hdev,
 	else
 		hdev->flag &= ~HCLGE_FLAG_MAIN;
 
-	hdev->num_req_vfs = status->vf_num / status->pf_num;
 	return 0;
 }
 
@@ -4361,6 +4360,8 @@ static int hclge_pci_init(struct hclge_dev *hdev)
 		goto err_clr_master;
 	}
 
+	hdev->num_req_vfs = pci_sriov_get_totalvfs(pdev);
+
 	return 0;
 err_clr_master:
 	pci_clear_master(pdev);

Original file line number	Diff line number	Diff line change
`@@ -837,7 +837,6 @@ static int hclge_parse_func_status(struct hclge_dev *hdev,`
`837`	`837`	`else`
`838`	`838`	`hdev->flag &= ~HCLGE_FLAG_MAIN;`
`839`	`839`
`840`		`- hdev->num_req_vfs = status->vf_num / status->pf_num;`
`841`	`840`	`return 0;`
`842`	`841`	`}`
`843`	`842`
`@@ -4361,6 +4360,8 @@ static int hclge_pci_init(struct hclge_dev *hdev)`
`4361`	`4360`	`goto err_clr_master;`
`4362`	`4361`	`}`
`4363`	`4362`
	`4363`	`+ hdev->num_req_vfs = pci_sriov_get_totalvfs(pdev);`
	`4364`	`+`
`4364`	`4365`	`return 0;`
`4365`	`4366`	`err_clr_master:`
`4366`	`4367`	`pci_clear_master(pdev);`