On Mon, Feb 24, 2014 at 09:02:00AM +0100, Alexander Gordeev wrote:
> Hello!
>
> This series is against James Bottomley's SCSI tree [1], but it needs
> commit f7fc32c ("PCI/MSI: Add pci_enable_msi_exact() and
> pci_enable_msix_exact()") from from Bjorn Helgaas's PCI tree [2]:
>
> 1. git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next
> 2. git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/msi
>
> Recently pci_enable_msix_exact() function has been accepted to
> the mainline. That is a variation of pci_enable_msix_range() which
> allows a device driver to request a particular number of MSI-Xs.
>
> As result, most of the changes posted in version 1 of this series
> are invalidated and need to use pci_enable_msix_exact() instead of
> originally posted pci_enable_msix_range() usages.
>
> I removed almost all ACKs, since unlike pci_enable_msix_range()
> function which returns the number of MSI-Xs allocated or negative
> errno, pci_enable_msix_exact() returns either zero success code or
> a negative errno. Although this change is simple, it still entails
> an updated error code analysis and would be better reviewed by
> driver maintainers.
Hi James,
I think Alexander sent these to linux-scsi hoping that you would handle
them, but I know it's a hassle because they depend on f7fc32c, which went
in after the merge window.
I'd be glad to review these and apply them through my tree, unless you want
to do it. I'd like to get these merged in the v3.15 merge window so
Alexander can move on to something else. I haven't checked for merge
conflicts with scsi.git yet, but I assume they'd be pretty trivial if there
are any.
Bjorn
> Cc: iss_storagedev@xxxxxx
> Cc: intel-linux-scu@xxxxxxxxx
> Cc: support@xxxxxxx
> Cc: DL-MPTFusionLinux@xxxxxxx
> Cc: qla2xxx-upstream@xxxxxxxxxx
> Cc: iscsi-driver@xxxxxxxxxx
> Cc: pv-drivers@xxxxxxxxxx
> Cc: linux-scsi@xxxxxxxxxxxxxxx
> Cc: linux-pci@xxxxxxxxxxxxxxx
>
> Alexander Gordeev (23):
> be2iscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
> bfa: Do not call pci_enable_msix() after it failed once
> bfa: Cleanup bfad_setup_intr() function
> bfa: Use pci_enable_msix_exact() instead of pci_enable_msix()
> csiostor: Remove superfluous call to pci_disable_msix()
> csiostor: Use pci_enable_msix_range() instead of pci_enable_msix()
> fnic: Use pci_enable_msix_exact() instead of pci_enable_msix()
> hpsa: Fallback to MSI rather than to INTx if MSI-X failed
> hpsa: Use pci_enable_msix_exact() instead of pci_enable_msix()
> isci: Use pci_enable_msix_exact() instead of pci_enable_msix()
> lpfc: Remove superfluous call to pci_disable_msix()
> lpfc: Use pci_enable_msix_range() instead of pci_enable_msix()
> megaraid: Fail resume if MSI-X re-initialization failed
> megaraid: Use pci_enable_msix_range() instead of pci_enable_msix()
> mpt2sas: Use pci_enable_msix_exact() instead of pci_enable_msix()
> mpt3sas: Use pci_enable_msix_exact() instead of pci_enable_msix()
> pm8001: Fix invalid return when request_irq() failed
> pm8001: Use pci_enable_msix_exact() instead of pci_enable_msix()
> pmcraid: Get rid of a redundant assignment
> pmcraid: Use pci_enable_msix_range() instead of pci_enable_msix()
> qla2xxx: Use pci_enable_msix_range() instead of pci_enable_msix()
> qla4xxx: Use pci_enable_msix_exact() instead of pci_enable_msix()
> vmw_pvscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
>
> drivers/scsi/be2iscsi/be_main.c | 6 +--
> drivers/scsi/bfa/bfad.c | 62 ++++++++++++-----------------
> drivers/scsi/csiostor/csio_hw.h | 2 +-
> drivers/scsi/csiostor/csio_isr.c | 24 ++++-------
> drivers/scsi/fnic/fnic_isr.c | 4 +-
> drivers/scsi/hpsa.c | 12 +-----
> drivers/scsi/isci/init.c | 2 +-
> drivers/scsi/lpfc/lpfc_init.c | 54 ++++++++++++-------------
> drivers/scsi/megaraid/megaraid_sas_base.c | 24 +++++------
> drivers/scsi/mpt2sas/mpt2sas_base.c | 6 +-
> drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +-
> drivers/scsi/pm8001/pm8001_init.c | 44 +++++++++++----------
> drivers/scsi/pmcraid.c | 14 +------
> drivers/scsi/qla2xxx/qla_isr.c | 27 +++++-------
> drivers/scsi/qla4xxx/ql4_nx.c | 2 +-
> drivers/scsi/vmw_pvscsi.c | 2 +-
> 16 files changed, 121 insertions(+), 168 deletions(-)
>
> --
> 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/
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
