2014-01-31 15:16:39

by Alexander Gordeev

Subject: [PATCH 12/34] e1000e: Use pci_enable_msix_range()

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 <[email protected]>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 6d91933..7735d1a 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2041,10 +2041,11 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
for (i = 0; i < adapter->num_vectors; i++)
adapter->msix_entries[i].entry = i;

- err = pci_enable_msix(adapter->pdev,
- adapter->msix_entries,
- adapter->num_vectors);
- if (err == 0)
+ err = pci_enable_msix_range(adapter->pdev,
+ adapter->msix_entries,
+ adapter->num_vectors,
+ adapter->num_vectors);
+ if (err > 0)
return;
}
/* MSI-X failed, so fall through and try MSI */
--
1.7.7.6

2014-01-31 18:17:10

by Sergei Shtylyov

Subject: Re: [PATCH 12/34] e1000e: Use pci_enable_msix_range()

Hello.

On 01/31/2014 06:08 PM, Alexander Gordeev wrote:

> 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 <[email protected]>
> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)

> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index 6d91933..7735d1a 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -2041,10 +2041,11 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
> for (i = 0; i < adapter->num_vectors; i++)
> adapter->msix_entries[i].entry = i;
>
> - err = pci_enable_msix(adapter->pdev,
> - adapter->msix_entries,
> - adapter->num_vectors);
> - if (err == 0)
> + err = pci_enable_msix_range(adapter->pdev,
> + adapter->msix_entries,
> + adapter->num_vectors,
> + adapter->num_vectors);

You should align all 'adapter' references under each other, according to
networking coding rules.

WBR, Sergei