| Message ID | 0ab74b1142006d2e7a8065ec8a2d3ba48fc3ec0c.1391172839.git.agordeev@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
> -----Original Message----- > From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On Behalf > Of Alexander Gordeev > > As result of deprecation of MSI-X/MSI enablement functions > pci_enable_msix() and pci_enable_msi_block() all drivers > using these two interfaces need to be updated to use the > new pci_enable_msi_range() and pci_enable_msix_range() > interfaces. > > Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Acked-by: Sathya Perla < sathya.perla@emulex.com> > --- > drivers/net/ethernet/emulex/benet/be_main.c | 31 +++++++++++--------------- > 1 files changed, 13 insertions(+), 18 deletions(-) > > diff --git a/drivers/net/ethernet/emulex/benet/be_main.c > b/drivers/net/ethernet/emulex/benet/be_main.c > index 04ac9c6..f55c09b 100644 > --- a/drivers/net/ethernet/emulex/benet/be_main.c > +++ b/drivers/net/ethernet/emulex/benet/be_main.c > @@ -2505,7 +2505,7 @@ static void be_msix_disable(struct be_adapter *adapter) > > static int be_msix_enable(struct be_adapter *adapter) > { > - int i, status, num_vec; > + int i, num_vec; > struct device *dev = &adapter->pdev->dev; > > /* If RoCE is supported, program the max number of NIC vectors that > @@ -2521,24 +2521,11 @@ static int be_msix_enable(struct be_adapter *adapter) > for (i = 0; i < num_vec; i++) > adapter->msix_entries[i].entry = i; > > - status = pci_enable_msix(adapter->pdev, adapter->msix_entries, num_vec); > - if (status == 0) { > - goto done; > - } else if (status >= MIN_MSIX_VECTORS) { > - num_vec = status; > - status = pci_enable_msix(adapter->pdev, adapter->msix_entries, > - num_vec); > - if (!status) > - goto done; > - } > + num_vec = pci_enable_msix_range(adapter->pdev, adapter->msix_entries, > + MIN_MSIX_VECTORS, num_vec); > + if (num_vec < 0) > + goto fail; > > - dev_warn(dev, "MSIx enable failed\n"); > - > - /* INTx is not supported in VFs, so fail probe if enable_msix fails */ > - if (!be_physfn(adapter)) > - return status; > - return 0; > -done: > if (be_roce_supported(adapter) && num_vec > MIN_MSIX_VECTORS) { > adapter->num_msix_roce_vec = num_vec / 2; > dev_info(dev, "enabled %d MSI-x vector(s) for RoCE\n", > @@ -2550,6 +2537,14 @@ done: > dev_info(dev, "enabled %d MSI-x vector(s) for NIC\n", > adapter->num_msix_vec); > return 0; > + > +fail: > + dev_warn(dev, "MSIx enable failed\n"); > + > + /* INTx is not supported in VFs, so fail probe if enable_msix fails */ > + if (!be_physfn(adapter)) > + return num_vec; > + return 0; > } > > static inline int be_msix_vec_get(struct be_adapter *adapter, > -- > 1.7.7.6 > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 04ac9c6..f55c09b 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -2505,7 +2505,7 @@ static void be_msix_disable(struct be_adapter *adapter) static int be_msix_enable(struct be_adapter *adapter) { - int i, status, num_vec; + int i, num_vec; struct device *dev = &adapter->pdev->dev; /* If RoCE is supported, program the max number of NIC vectors that @@ -2521,24 +2521,11 @@ static int be_msix_enable(struct be_adapter *adapter) for (i = 0; i < num_vec; i++) adapter->msix_entries[i].entry = i; - status = pci_enable_msix(adapter->pdev, adapter->msix_entries, num_vec); - if (status == 0) { - goto done; - } else if (status >= MIN_MSIX_VECTORS) { - num_vec = status; - status = pci_enable_msix(adapter->pdev, adapter->msix_entries, - num_vec); - if (!status) - goto done; - } + num_vec = pci_enable_msix_range(adapter->pdev, adapter->msix_entries, + MIN_MSIX_VECTORS, num_vec); + if (num_vec < 0) + goto fail; - dev_warn(dev, "MSIx enable failed\n"); - - /* INTx is not supported in VFs, so fail probe if enable_msix fails */ - if (!be_physfn(adapter)) - return status; - return 0; -done: if (be_roce_supported(adapter) && num_vec > MIN_MSIX_VECTORS) { adapter->num_msix_roce_vec = num_vec / 2; dev_info(dev, "enabled %d MSI-x vector(s) for RoCE\n", @@ -2550,6 +2537,14 @@ done: dev_info(dev, "enabled %d MSI-x vector(s) for NIC\n", adapter->num_msix_vec); return 0; + +fail: + dev_warn(dev, "MSIx enable failed\n"); + + /* INTx is not supported in VFs, so fail probe if enable_msix fails */ + if (!be_physfn(adapter)) + return num_vec; + return 0; } static inline int be_msix_vec_get(struct be_adapter *adapter,
As result of deprecation of MSI-X/MSI enablement functions pci_enable_msix() and pci_enable_msi_block() all drivers using these two interfaces need to be updated to use the new pci_enable_msi_range() and pci_enable_msix_range() interfaces. Signed-off-by: Alexander Gordeev <agordeev@redhat.com> --- drivers/net/ethernet/emulex/benet/be_main.c | 31 +++++++++++--------------- 1 files changed, 13 insertions(+), 18 deletions(-)