Re: [PATCH v2 RESEND 04/23] bfa: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Wed, Jul 16, 2014 at 08:05:08PM +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.

Anil, Sudarsana,

Could you please review bfa patches in this series?

Thanks!

> Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx>
> Cc: Anil Gurumurthy <agurumur@xxxxxxxxxxx>
> Cc: Vijaya Mohan Guvva <vmohan@xxxxxxxxxxx>
> Cc: linux-scsi@xxxxxxxxxxxxxxx
> Cc: linux-pci@xxxxxxxxxxxxxxx
> Acked-by: Anil Gurumurthy <anil.gurumurthy@xxxxxxxxxx>
> ---
>  drivers/scsi/bfa/bfad.c |   20 ++++++--------------
>  1 files changed, 6 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
> index c18279f..e90a374 100644
> --- a/drivers/scsi/bfa/bfad.c
> +++ b/drivers/scsi/bfa/bfad.c
> @@ -1234,29 +1234,21 @@ bfad_setup_intr(struct bfad_s *bfad)
>  	if ((bfa_asic_id_ctc(pdev->device) && !msix_disable_ct) ||
>  	   (bfa_asic_id_cb(pdev->device) && !msix_disable_cb)) {
>  
> -		error = pci_enable_msix(bfad->pcidev, msix_entries, bfad->nvec);
> +		error = pci_enable_msix_exact(bfad->pcidev,
> +					      msix_entries, bfad->nvec);
>  		/* In CT1 & CT2, try to allocate just one vector */
> -		if (error > 0 && bfa_asic_id_ctc(pdev->device)) {
> +		if (error == -ENOSPC && bfa_asic_id_ctc(pdev->device)) {
>  			printk(KERN_WARNING "bfa %s: trying one msix "
>  			       "vector failed to allocate %d[%d]\n",
>  			       bfad->pci_name, bfad->nvec, error);
>  			bfad->nvec = 1;
> -			error = pci_enable_msix(bfad->pcidev,
> -						msix_entries, bfad->nvec);
> +			error = pci_enable_msix_exact(bfad->pcidev,
> +						      msix_entries, 1);
>  		}
>  
> -		/*
> -		 * Only error number of vector is available.
> -		 * We don't have a mechanism to map multiple
> -		 * interrupts into one vector, so even if we
> -		 * can try to request less vectors, we don't
> -		 * know how to associate interrupt events to
> -		 *  vectors. Linux doesn't duplicate vectors
> -		 * in the MSIX table for this case.
> -		 */
>  		if (error) {
>  			printk(KERN_WARNING "bfad%d: "
> -			       "pci_enable_msix failed (%d), "
> +			       "pci_enable_msix_exact failed (%d), "
>  			       "use line based.\n",
>  				bfad->inst_no, error);
>  			goto line_based;
> -- 
> 1.7.7.6
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/