Re: [PATCH v2 RESEND 14/23] megaraid: Use pci_enable_msix_range() instead of pci_enable_msix()

Alexander Gordeev
2014-08-11T08:10:12Z

On Wed, Jul 16, 2014 at 08:05:18PM +0200, 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() or pci_enable_msi_exact()
> and pci_enable_msix_range() or pci_enable_msix_exact()
> interfaces.

Kashyap, Neela,

Could you please reveiw this patch?

Thanks!

> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> Cc: Neela Syam Kolli <megaraidlinux@lsi.com>
> Cc: linux-scsi@vger.kernel.org
> Cc: linux-pci@vger.kernel.org
> ---
> drivers/scsi/megaraid/megaraid_sas_base.c | 20 +++++++-------------
> 1 files changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
> index ba06102..7a4e75e 100644
> --- a/drivers/scsi/megaraid/megaraid_sas_base.c
> +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
> @@ -4105,17 +4105,11 @@ static int megasas_init_fw(struct megasas_instance *instance)
> (unsigned int)num_online_cpus());
> for (i = 0; i < instance->msix_vectors; i++)
> instance->msixentry[i].entry = i;
> - i = pci_enable_msix(instance->pdev, instance->msixentry,
> - instance->msix_vectors);
> - if (i >= 0) {
> - if (i) {
> - if (!pci_enable_msix(instance->pdev,
> - instance->msixentry, i))
> - instance->msix_vectors = i;
> - else
> - instance->msix_vectors = 0;
> - }
> - } else
> + i = pci_enable_msix_range(instance->pdev, instance->msixentry,
> + 1, instance->msix_vectors);
> + if (i)
> + instance->msix_vectors = i;
> + else
> instance->msix_vectors = 0;
>
> dev_info(&instance->pdev->dev, "[scsi%d]: FW supports"
> @@ -5135,8 +5129,8 @@ megasas_resume(struct pci_dev *pdev)
>
> /* Now re-enable MSI-X */
> if (instance->msix_vectors &&
> - pci_enable_msix(instance->pdev, instance->msixentry,
> - instance->msix_vectors))
> + pci_enable_msix_exact(instance->pdev, instance->msixentry,
> + instance->msix_vectors))
> goto fail_reenable_msix;
>
> switch (instance->pdev->device) {
> --
> 1.7.7.6
>