On Wed, 2019-07-24 at 11:18 +0800, Huazhong Tan wrote: > From: Yonglong Liu <liuyongl...@huawei.com> > > The num_msi_left means the vector numbers of NIC, but if the > PF supported RoCE, it contains the vector numbers of NIC and > RoCE(Not expected). > > This may cause interrupts lost in some case, because of the > NIC module used the vector resources which belongs to RoCE. > > This patch corrects the value of num_msi_left to be equals to > the vector numbers of NIC, and adjust the default tqp numbers > according to the value of num_msi_left. > > Fixes: 46a3df9f9718 ("net: hns3: Add HNS3 Acceleration Engine & > Compatibility Layer Support") > Signed-off-by: Yonglong Liu <liuyongl...@huawei.com> > Signed-off-by: Peng Li <lipeng...@huawei.com> > Signed-off-by: Huazhong Tan <tanhuazh...@huawei.com> > --- > drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 5 ++++- > drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 12 > ++++++++++-- > 2 files changed, 14 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > index 3c64d70..a59d13f 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > @@ -1470,13 +1470,16 @@ static int hclge_vport_setup(struct > hclge_vport *vport, u16 num_tqps) > { > struct hnae3_handle *nic = &vport->nic; > struct hclge_dev *hdev = vport->back; > + u16 alloc_tqps; > int ret; > > nic->pdev = hdev->pdev; > nic->ae_algo = &ae_algo; > nic->numa_node_mask = hdev->numa_node_mask; > > - ret = hclge_knic_setup(vport, num_tqps, > + alloc_tqps = min_t(u16, hdev->roce_base_msix_offset - 1,
Why do you need the extra alloc_tqps ? just overwrite num_tqps, the original value is not needed afterwards. > num_tqps); > + > + ret = hclge_knic_setup(vport, alloc_tqps, > hdev->num_tx_desc, hdev->num_rx_desc); > if (ret) > dev_err(&hdev->pdev->dev, "knic setup failed %d\n", > ret); >