Hi Yuval,
> -----Original Message-----
> From: Yuval Shaia [mailto:[email protected]]
> Sent: Thursday, November 09, 2017 8:27 AM
> To: Salil Mehta
> Cc: [email protected]; [email protected]; Zhuangyuzeng (Yisen); lipeng (Y);
> [email protected]; [email protected]; linux-
> [email protected]; [email protected]; Linuxarm
> Subject: Re: [PATCH net] net: hns3: Updates MSI/MSI-X alloc/free
> APIs(depricated) to new APIs
>
> On Wed, Nov 08, 2017 at 11:56:06AM +0000, Salil Mehta wrote:
> > This patch migrates the HNS3 driver code from use of depricated PCI
> > MSI/MSI-X interrupt vector allocation/free APIs to new common APIs.
> >
> > Signed-off-by: Salil Mehta <[email protected]>
> > Suggested-by: Christoph Hellwig <[email protected]>
> > ---
> > .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 108 +++++++----
> ----------
> > .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 15 ++-
> > 2 files changed, 42 insertions(+), 81 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> > index c1cdbfd..09fa068 100644
> > --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> > @@ -885,14 +885,14 @@ static int hclge_query_pf_resource(struct
> hclge_dev *hdev)
> > hdev->pkt_buf_size = __le16_to_cpu(req->buf_size) <<
> HCLGE_BUF_UNIT_S;
> >
> > if (hnae3_dev_roce_supported(hdev)) {
> > - hdev->num_roce_msix =
> > + hdev->num_roce_msi =
> > hnae_get_field(__le16_to_cpu(req->pf_intr_vector_number),
> > HCLGE_PF_VEC_NUM_M, HCLGE_PF_VEC_NUM_S);
> >
> > /* PF should have NIC vectors and Roce vectors,
> > * NIC vectors are queued before Roce vectors.
> > */
> > - hdev->num_msi = hdev->num_roce_msix +
> HCLGE_ROCE_VECTOR_OFFSET;
> > + hdev->num_msi = hdev->num_roce_msi +
> HCLGE_ROCE_VECTOR_OFFSET;
> > } else {
> > hdev->num_msi =
> > hnae_get_field(__le16_to_cpu(req->pf_intr_vector_number),
> > @@ -1835,7 +1835,7 @@ static int hclge_init_roce_base_info(struct
> hclge_vport *vport)
> > struct hnae3_handle *roce = &vport->roce;
> > struct hnae3_handle *nic = &vport->nic;
> >
> > - roce->rinfo.num_vectors = vport->back->num_roce_msix;
> > + roce->rinfo.num_vectors = vport->back->num_roce_msi;
> >
> > if (vport->back->num_msi_left < vport->roce.rinfo.num_vectors ||
> > vport->back->num_msi_left == 0)
> > @@ -1853,67 +1853,46 @@ static int hclge_init_roce_base_info(struct
> hclge_vport *vport)
> > return 0;
> > }
> >
> > -static int hclge_init_msix(struct hclge_dev *hdev)
> > +static int hclge_init_msi(struct hclge_dev *hdev)
> > {
> > struct pci_dev *pdev = hdev->pdev;
> > - int ret, i;
> > -
> > - hdev->msix_entries = devm_kcalloc(&pdev->dev, hdev->num_msi,
> > - sizeof(struct msix_entry),
> > - GFP_KERNEL);
> > - if (!hdev->msix_entries)
> > - return -ENOMEM;
> > -
> > - hdev->vector_status = devm_kcalloc(&pdev->dev, hdev->num_msi,
> > - sizeof(u16), GFP_KERNEL);
> > - if (!hdev->vector_status)
> > - return -ENOMEM;
> > + int vectors;
> > + int i;
> >
> > - for (i = 0; i < hdev->num_msi; i++) {
> > - hdev->msix_entries[i].entry = i;
> > - hdev->vector_status[i] = HCLGE_INVALID_VPORT;
> > + vectors = pci_alloc_irq_vectors(pdev, 1, hdev->num_msi,
> > + PCI_IRQ_MSI | PCI_IRQ_MSIX);
> > + if (vectors < 0) {
> > + dev_err(&pdev->dev, "failed to allocate MSI/MSI-X vectors
> %d\n",
>
> Suggesting:
> dev_err(&pdev->dev, "failed to allocate MSI/MSI-X %d
> vecrors, error=%d",
> hdev->num_msi, vectors);
Ok.
>
> > + vectors);
> > + return vectors;
> > }
> > + if (vectors < hdev->num_msi)
> > + dev_warn(&hdev->pdev->dev,
> > + "could not alloc(=%d) all requested(=%d) MSI/MSI-
> X\n",
>
> Suggesting something like:
> "Requested %d, allocated %d"
Ok :)
>
> > + hdev->num_msi, vectors);
> >
> > - hdev->num_msi_left = hdev->num_msi;
> > - hdev->base_msi_vector = hdev->pdev->irq;
> > + hdev->num_msi = vectors;
> > + hdev->num_msi_left = vectors;
> > + hdev->base_msi_vector = pdev->irq;
> > hdev->roce_base_vector = hdev->base_msi_vector +
> > - HCLGE_ROCE_VECTOR_OFFSET;
> > -
> > - ret = pci_enable_msix_range(hdev->pdev, hdev->msix_entries,
> > - hdev->num_msi, hdev->num_msi);
> > - if (ret < 0) {
> > - dev_info(&hdev->pdev->dev,
> > - "MSI-X vector alloc failed: %d\n", ret);
> > - return ret;
> > - }
> > -
> > - return 0;
> > -}
> > -
> > -static int hclge_init_msi(struct hclge_dev *hdev)
> > -{
> > - struct pci_dev *pdev = hdev->pdev;
> > - int vectors;
> > - int i;
> > + HCLGE_ROCE_VECTOR_OFFSET;
>
> Any reason for this ^^^^^^^^^^^^^^^^^^^^^^^^
Maybe "git am" played some trick while porting the patch.
I can nullify this diff but I guess this is harmless.
Thanks
>
> >
> > hdev->vector_status = devm_kcalloc(&pdev->dev, hdev->num_msi,
> > sizeof(u16), GFP_KERNEL);
> > - if (!hdev->vector_status)
> > + if (!hdev->vector_status) {
> > + pci_free_irq_vectors(pdev);
> > return -ENOMEM;
> > + }
> >
> > for (i = 0; i < hdev->num_msi; i++)
> > hdev->vector_status[i] = HCLGE_INVALID_VPORT;
> >
> > - vectors = pci_alloc_irq_vectors(pdev, 1, hdev->num_msi,
> PCI_IRQ_MSI);
> > - if (vectors < 0) {
> > - dev_err(&pdev->dev, "MSI vectors enable failed %d\n",
> vectors);
> > - return -EINVAL;
> > + hdev->vector_irq = devm_kcalloc(&pdev->dev, hdev->num_msi,
> > + sizeof(int), GFP_KERNEL);
> > + if (!hdev->vector_irq) {
> > + pci_free_irq_vectors(pdev);
> > + return -ENOMEM;
> > }
> > - hdev->num_msi = vectors;
> > - hdev->num_msi_left = vectors;
> > - hdev->base_msi_vector = pdev->irq;
> > - hdev->roce_base_vector = hdev->base_msi_vector +
> > - HCLGE_ROCE_VECTOR_OFFSET;
> >
> > return 0;
> > }
> > @@ -2341,6 +2320,7 @@ static int hclge_get_vector(struct hnae3_handle
> *handle, u16 vector_num,
> > vport->vport_id *
> > HCLGE_VECTOR_VF_OFFSET;
> > hdev->vector_status[i] = vport->vport_id;
> > + hdev->vector_irq[i] = vector->vector;
> >
> > vector++;
> > alloc++;
> > @@ -2359,15 +2339,10 @@ static int hclge_get_vector_index(struct
> hclge_dev *hdev, int vector)
> > {
> > int i;
> >
> > - for (i = 0; i < hdev->num_msi; i++) {
> > - if (hdev->msix_entries) {
> > - if (vector == hdev->msix_entries[i].vector)
> > - return i;
> > - } else {
> > - if (vector == (hdev->base_msi_vector + i))
> > - return i;
> > - }
> > - }
> > + for (i = 0; i < hdev->num_msi; i++)
> > + if (vector == hdev->vector_irq[i])
> > + return i;
> > +
> > return -EINVAL;
> > }
> >
> > @@ -4072,14 +4047,7 @@ static void hclge_pci_uninit(struct hclge_dev
> *hdev)
> > {
> > struct pci_dev *pdev = hdev->pdev;
> >
> > - if (hdev->flag & HCLGE_FLAG_USE_MSIX) {
> > - pci_disable_msix(pdev);
> > - devm_kfree(&pdev->dev, hdev->msix_entries);
> > - hdev->msix_entries = NULL;
> > - } else {
> > - pci_disable_msi(pdev);
> > - }
> > -
> > + pci_free_irq_vectors(pdev);
> > pci_clear_master(pdev);
> > pci_release_mem_regions(pdev);
> > pci_disable_device(pdev);
> > @@ -4097,7 +4065,6 @@ static int hclge_init_ae_dev(struct
> hnae3_ae_dev *ae_dev)
> > goto err_hclge_dev;
> > }
> >
> > - hdev->flag |= HCLGE_FLAG_USE_MSIX;
> > hdev->pdev = pdev;
> > hdev->ae_dev = ae_dev;
> > ae_dev->priv = hdev;
> > @@ -4126,12 +4093,9 @@ static int hclge_init_ae_dev(struct
> hnae3_ae_dev *ae_dev)
> > return ret;
> > }
> >
> > - if (hdev->flag & HCLGE_FLAG_USE_MSIX)
> > - ret = hclge_init_msix(hdev);
> > - else
> > - ret = hclge_init_msi(hdev);
> > + ret = hclge_init_msi(hdev);
> > if (ret) {
> > - dev_err(&pdev->dev, "Init msix/msi error, ret = %d.\n",
> ret);
> > + dev_err(&pdev->dev, "Init MSI/MSI-X error, ret = %d.\n",
> ret);
> > return ret;
> > }
> >
> > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
> b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
> > index 9fcfd93..ab87843 100644
> > --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
> > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
> > @@ -400,9 +400,6 @@ struct hclge_dev {
> > u16 num_tqps; /* Num task queue pairs of this PF
> */
> > u16 num_req_vfs; /* Num VFs requested for this PF */
> >
> > - u16 num_roce_msix; /* Num of roce vectors for this PF
> */
> > - int roce_base_vector;
> > -
> > /* Base task tqp physical id of this PF */
> > u16 base_tqp_pid;
> > u16 alloc_rss_size; /* Allocated RSS task queue */
> > @@ -429,8 +426,10 @@ struct hclge_dev {
> > u16 num_msi_left;
> > u16 num_msi_used;
> > u32 base_msi_vector;
> > - struct msix_entry *msix_entries;
> > u16 *vector_status;
> > + int *vector_irq;
> > + u16 num_roce_msi; /* Num of roce vectors for this PF */
> > + int roce_base_vector;
> >
> > u16 pending_udp_bitmap;
> >
> > @@ -454,11 +453,9 @@ struct hclge_dev {
> > struct hnae3_client *nic_client;
> > struct hnae3_client *roce_client;
> >
> > -#define HCLGE_FLAG_USE_MSI 0x00000001
> > -#define HCLGE_FLAG_USE_MSIX 0x00000002
> > -#define HCLGE_FLAG_MAIN 0x00000004
> > -#define HCLGE_FLAG_DCB_CAPABLE 0x00000008
> > -#define HCLGE_FLAG_DCB_ENABLE 0x00000010
> > +#define HCLGE_FLAG_MAIN BIT(0)
> > +#define HCLGE_FLAG_DCB_CAPABLE BIT(1)
> > +#define HCLGE_FLAG_DCB_ENABLE BIT(2)
> > u32 flag;
> >
> > u32 pkt_buf_size; /* Total pf buf size for tx/rx */
> > --
> > 2.7.4
> >
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-rdma"
> in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
From 1583576363498287840@xxx Thu Nov 09 08:28:25 +0000 2017
X-GM-THRID: 1583498936056662774
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread