diff mbox

[v2,RESEND,20/23] pmcraid: Use pci_enable_msix_range() instead of pci_enable_msix()

Message ID 0d3b343a9a1e2146add1dcf51791c4e5914d5612.1405533479.git.agordeev@redhat.com (mailing list archive)
State New, archived
Delegated to: Bjorn Helgaas
Headers show

Commit Message

Alexander Gordeev July 16, 2014, 6:05 p.m. UTC
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.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
Cc: linux-scsi@vger.kernel.org
Cc: linux-pci@vger.kernel.org
---
 drivers/scsi/pmcraid.c |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

Comments

Alexander Gordeev July 26, 2014, 8:37 a.m. UTC | #1
On Wed, Jul 16, 2014 at 08:05:24PM +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.

Hi Anil,

Could you please review pmcraid patches in this series?

Thanks!

> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> Cc: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
> Cc: linux-scsi@vger.kernel.org
> Cc: linux-pci@vger.kernel.org
> ---
>  drivers/scsi/pmcraid.c |   13 ++-----------
>  1 files changed, 2 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
> index c06af7f..6d0f208 100644
> --- a/drivers/scsi/pmcraid.c
> +++ b/drivers/scsi/pmcraid.c
> @@ -4698,19 +4698,10 @@ pmcraid_register_interrupt_handler(struct pmcraid_instance *pinstance)
>  		for (i = 0; i < PMCRAID_NUM_MSIX_VECTORS; i++)
>  			entries[i].entry = i;
>  
> -		rc = pci_enable_msix(pdev, entries, num_hrrq);
> -		if (rc < 0)
> +		num_hrrq = pci_enable_msix_range(pdev, entries, 1, num_hrrq);
> +		if (num_hrrq < 0)
>  			goto pmcraid_isr_legacy;
>  
> -		/* Check how many MSIX vectors are allocated and register
> -		 * msi-x handlers for each of them giving appropriate buffer
> -		 */
> -		if (rc > 0) {
> -			num_hrrq = rc;
> -			if (pci_enable_msix(pdev, entries, num_hrrq))
> -				goto pmcraid_isr_legacy;
> -		}
> -
>  		for (i = 0; i < num_hrrq; i++) {
>  			pinstance->hrrq_vector[i].hrrq_id = i;
>  			pinstance->hrrq_vector[i].drv_inst = pinstance;
> -- 
> 1.7.7.6
>
Alexander Gordeev Aug. 11, 2014, 7:44 a.m. UTC | #2
On Wed, Jul 16, 2014 at 08:05:24PM +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.

Hi Christoph,

This device's maintainer mail <anil_ravindranath@pmc-sierra.com>
does not seem exist anymore.

> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> Cc: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
> Cc: linux-scsi@vger.kernel.org
> Cc: linux-pci@vger.kernel.org
> ---
>  drivers/scsi/pmcraid.c |   13 ++-----------
>  1 files changed, 2 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
> index c06af7f..6d0f208 100644
> --- a/drivers/scsi/pmcraid.c
> +++ b/drivers/scsi/pmcraid.c
> @@ -4698,19 +4698,10 @@ pmcraid_register_interrupt_handler(struct pmcraid_instance *pinstance)
>  		for (i = 0; i < PMCRAID_NUM_MSIX_VECTORS; i++)
>  			entries[i].entry = i;
>  
> -		rc = pci_enable_msix(pdev, entries, num_hrrq);
> -		if (rc < 0)
> +		num_hrrq = pci_enable_msix_range(pdev, entries, 1, num_hrrq);
> +		if (num_hrrq < 0)
>  			goto pmcraid_isr_legacy;
>  
> -		/* Check how many MSIX vectors are allocated and register
> -		 * msi-x handlers for each of them giving appropriate buffer
> -		 */
> -		if (rc > 0) {
> -			num_hrrq = rc;
> -			if (pci_enable_msix(pdev, entries, num_hrrq))
> -				goto pmcraid_isr_legacy;
> -		}
> -
>  		for (i = 0; i < num_hrrq; i++) {
>  			pinstance->hrrq_vector[i].hrrq_id = i;
>  			pinstance->hrrq_vector[i].drv_inst = pinstance;
> -- 
> 1.7.7.6
> 
--
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 mbox

Patch

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index c06af7f..6d0f208 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4698,19 +4698,10 @@  pmcraid_register_interrupt_handler(struct pmcraid_instance *pinstance)
 		for (i = 0; i < PMCRAID_NUM_MSIX_VECTORS; i++)
 			entries[i].entry = i;
 
-		rc = pci_enable_msix(pdev, entries, num_hrrq);
-		if (rc < 0)
+		num_hrrq = pci_enable_msix_range(pdev, entries, 1, num_hrrq);
+		if (num_hrrq < 0)
 			goto pmcraid_isr_legacy;
 
-		/* Check how many MSIX vectors are allocated and register
-		 * msi-x handlers for each of them giving appropriate buffer
-		 */
-		if (rc > 0) {
-			num_hrrq = rc;
-			if (pci_enable_msix(pdev, entries, num_hrrq))
-				goto pmcraid_isr_legacy;
-		}
-
 		for (i = 0; i < num_hrrq; i++) {
 			pinstance->hrrq_vector[i].hrrq_id = i;
 			pinstance->hrrq_vector[i].drv_inst = pinstance;