scsi: Use pci_enable_msix_range() instead of pci_enable_msix()
Subsystems (15)
v2 cover scsi: Use pci_enable_msix_range() instead of pci_enable_msix()
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.
Thanks!
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(-)
Signature · 1 line
1.7.7.6
PATCH v2 1/23 be2iscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
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.
--- drivers/scsi/be2iscsi/be_main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/be2iscsi/be_main.c +2 -4
@@ -5284,12 +5284,10 @@ static void beiscsi_msix_enable(struct beiscsi_hba *phba)for (i =0 ; i <= phba->num_cpus; i++) phba->msix_entries[i].entry = i; - status =pci_enable_msix (phba->pcidev, phba->msix_entries, - (phba->num_cpus +1 )); + status =pci_enable_msix_exact (phba->pcidev, phba->msix_entries, + phba->num_cpus +1 );if (!status) phba->msix_enabled = true; - -return ; }/*
Signature · 1 line
1.7.7.6
RE: [PATCH v2 01/23] be2iscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
-----Original Message-----
From: Alexander Gordeev [mailto:[email protected]]
Sent: Monday, February 24, 2014 12:02 AM
To: [email protected]
Cc: Alexander Gordeev; Jayamohan Kallickal; [email protected]; [email protected]
Subject: [PATCH v2 01/23] be2iscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
As result of deprecation of MSI-X/MSI enablement functionspci_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.
--- drivers/scsi/be2iscsi/be_main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/be2iscsi/be_main.c +2 -4
@@ -5284,12 +5284,10 @@ static void beiscsi_msix_enable(struct beiscsi_hba *phba)for (i =0 ; i <= phba->num_cpus; i++) phba->msix_entries[i].entry = i; - status =pci_enable_msix (phba->pcidev, phba->msix_entries, - (phba->num_cpus +1 )); + status =pci_enable_msix_exact (phba->pcidev, phba->msix_entries, + phba->num_cpus +1 );if (!status) phba->msix_enabled = true; - -return ; }/*
--
1.7.7.6
--
PATCH v2 2/23 bfa: Do not call pci_enable_msix() after it failed once
In reply to Alexander GordeevFunction pci_enable_msix() should not be called in case it threw a negative errno from a previous call.
--- drivers/scsi/bfa/bfad.c | 48 ++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 25 deletions(-)
drivers/scsi/bfa/bfad.c +23 -25
@@ -1235,33 +1235,31 @@ bfad_setup_intr(struct bfad_s *bfad) (bfa_asic_id_cb(pdev->device) && !msix_disable_cb)) { error =pci_enable_msix (bfad->pcidev, msix_entries, bfad->nvec); -if (error) { -/* In CT1 & CT2, try to allocate just one vector */ -if (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, +/* In CT1 & CT2, try to allocate just one vector */ +if (error >0 &&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); - } + } -/* -* 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), " -"use line based.\n" , - bfad->inst_no, error); - goto line_based; - } +/* +* 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), " +"use line based.\n" , + bfad->inst_no, error); + goto line_based; }/* Disable INTX in MSI-X mode */
Signature · 1 line
1.7.7.6
RE: [PATCH v2 02/23] bfa: Do not call pci_enable_msix() after it failed once
Patch look good.
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Alexander Gordeev
Sent: 24 February 2014 13:32
To: linux-kernel
Cc: Alexander Gordeev; Anil Gurumurthy; Vijaya Mohan Guvva; linux-scsi; linux-pci
Subject: [PATCH v2 02/23] bfa: Do not call pci_enable_msix() after it failed once
Function pci_enable_msix() should not be called in case it threw a negative errno from a previous call.
--- drivers/scsi/bfa/bfad.c | 48 ++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 25 deletions(-)
drivers/scsi/bfa/bfad.c +23 -25
@@ -1235,33 +1235,31 @@ bfad_setup_intr(struct bfad_s *bfad) (bfa_asic_id_cb(pdev->device) && !msix_disable_cb)) { error =pci_enable_msix (bfad->pcidev, msix_entries, bfad->nvec); -if (error) { -/* In CT1 & CT2, try to allocate just one vector */ -if (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, +/* In CT1 & CT2, try to allocate just one vector */ +if (error >0 &&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); - } + } -/* -* 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), " -"use line based.\n" , - bfad->inst_no, error); - goto line_based; - } +/* +* 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), " +"use line based.\n" , + bfad->inst_no, error); + goto line_based; }/* Disable INTX in MSI-X mode */
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
________________________________
This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.
PATCH v2 3/23 bfa: Cleanup bfad_setup_intr() function
In reply to Alexander Gordeev--- drivers/scsi/bfa/bfad.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)
drivers/scsi/bfa/bfad.c +8 -10
@@ -1219,7 +1219,7 @@ bfad_install_msix_handler(struct bfad_s *bfad)int bfad_setup_intr (struct bfad_s *bfad) { -int error =0 ; +int error;u32 mask =0 , i, num_bit =0 , max_bit =0 ;struct msix_entry msix_entries[MAX_MSIX_ENTRY ];struct pci_dev *pdev = bfad->pcidev;
@@ -1279,20 +1279,18 @@ bfad_setup_intr(struct bfad_s *bfad) bfad->bfad_flags |=BFAD_MSIX_ON ; -return error; +return 0 ; } line_based: - error =0 ; -if (request_irq - (bfad->pcidev->irq, (irq_handler_t ) bfad_intx,BFAD_IRQ_FLAGS , -BFAD_DRIVER_NAME , bfad) !=0 ) { -/* Enable interrupt handler failed */ -return 1 ; - } + error =request_irq (bfad->pcidev->irq, (irq_handler_t )bfad_intx, +BFAD_IRQ_FLAGS ,BFAD_DRIVER_NAME , bfad); +if (error) +return error; + bfad->bfad_flags |=BFAD_INTX_ON ; -return error; +return 0 ; }void
Signature · 1 line
1.7.7.6
RE: [PATCH v2 03/23] bfa: Cleanup bfad_setup_intr() function
Patch look good.
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Alexander Gordeev
Sent: 24 February 2014 13:32
To: linux-kernel
Cc: Alexander Gordeev; Anil Gurumurthy; Vijaya Mohan Guvva; linux-scsi; linux-pci
Subject: [PATCH v2 03/23] bfa: Cleanup bfad_setup_intr() function
--- drivers/scsi/bfa/bfad.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)
drivers/scsi/bfa/bfad.c +8 -10
@@ -1219,7 +1219,7 @@ bfad_install_msix_handler(struct bfad_s *bfad) int bfad_setup_intr(struct bfad_s *bfad) { -int error =0 ; +int error;u32 mask =0 , i, num_bit =0 , max_bit =0 ;struct msix_entry msix_entries[MAX_MSIX_ENTRY ];struct pci_dev *pdev = bfad->pcidev;
@@ -1279,20 +1279,18 @@ bfad_setup_intr(struct bfad_s *bfad) bfad->bfad_flags |=BFAD_MSIX_ON ; -return error; +return 0 ; } line_based: - error =0 ; -if (request_irq - (bfad->pcidev->irq, (irq_handler_t ) bfad_intx,BFAD_IRQ_FLAGS , -BFAD_DRIVER_NAME , bfad) !=0 ) { -/* Enable interrupt handler failed */ -return 1 ; - } + error =request_irq (bfad->pcidev->irq, (irq_handler_t )bfad_intx, +BFAD_IRQ_FLAGS ,BFAD_DRIVER_NAME , bfad); +if (error) +return error; + bfad->bfad_flags |=BFAD_INTX_ON ; -return error; +return 0 ; }void
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
________________________________
This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.
PATCH v2 4/23 bfa: Use pci_enable_msix_exact() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/bfa/bfad.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-)
drivers/scsi/bfa/bfad.c +5 -13
@@ -1234,26 +1234,18 @@ 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), "
Signature · 1 line
1.7.7.6
PATCH v2 5/23 csiostor: Remove superfluous call to pci_disable_msix()
In reply to Alexander GordeevThere is no need to call pci_disable_msix() in case the previous call to pci_enable_msix() failed
--- drivers/scsi/csiostor/csio_isr.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/scsi/csiostor/csio_isr.c +1 -3
@@ -529,10 +529,8 @@ csio_enable_msix(struct csio_hw *hw)csio_reduce_sqsets (hw, cnt - extra); } }else { -if (rv >0 ) { -pci_disable_msix (hw->pdev); +if (rv >0 )csio_info (hw,"Not using MSI-X, remainder:%d\n" , rv); - }kfree (entries);return -ENOMEM ;
Signature · 1 line
1.7.7.6
PATCH v2 6/23 csiostor: Use pci_enable_msix_range() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/csiostor/csio_hw.h | 2 +- drivers/scsi/csiostor/csio_isr.c | 22 +++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-)
drivers/scsi/csiostor/csio_hw.h +1 -1
@@ -94,7 +94,7 @@ enum { };struct csio_msix_entries { -unsigned short vector;/* Vector assigned by pci_enable_msix */ +unsigned short vector;/* Assigned MSI-X vector */ void *dev_id;/* Priv object associated w/ this msix*/ char desc[24 ];/* Description of this vector */ };
drivers/scsi/csiostor/csio_isr.c +9 -13
@@ -499,7 +499,7 @@ csio_reduce_sqsets(struct csio_hw *hw, int cnt)static int csio_enable_msix (struct csio_hw *hw) { -int rv, i, j, k, n, min, cnt; +int i, j, k, n, min, cnt;struct csio_msix_entries *entryp;struct msix_entry *entries;int extra =CSIO_EXTRA_VECS ;
@@ -521,19 +521,15 @@ csio_enable_msix(struct csio_hw *hw)csio_dbg (hw,"FW supp #niq:%d, trying %d msix's\n" , hw->cfg_niq, cnt); -while ((rv =pci_enable_msix (hw->pdev, entries, cnt)) >= min) - cnt = rv; -if (!rv) { -if (cnt < (hw->num_sqsets + extra)) { -csio_dbg (hw,"Reducing sqsets to %d\n" , cnt - extra); -csio_reduce_sqsets (hw, cnt - extra); - } - }else { -if (rv >0 ) -csio_info (hw,"Not using MSI-X, remainder:%d\n" , rv); - + cnt =pci_enable_msix_range (hw->pdev, entries, min, cnt); +if (cnt <0 ) {kfree (entries); -return -ENOMEM ; +return cnt; + } + +if (cnt < (hw->num_sqsets + extra)) { +csio_dbg (hw,"Reducing sqsets to %d\n" , cnt - extra); +csio_reduce_sqsets (hw, cnt - extra); }/* Save off vectors */
Signature · 1 line
1.7.7.6
PATCH v2 7/23 fnic: Use pci_enable_msix_exact() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/fnic/fnic_isr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/fnic/fnic_isr.c +2 -2
@@ -257,8 +257,8 @@ int fnic_set_intr_mode(struct fnic *fnic) fnic->raw_wq_count >= m && fnic->wq_copy_count >= o && fnic->cq_count >= n + m + o) { -if (!pci_enable_msix (fnic->pdev, fnic->msix_entry, - n + m + o +1 )) { +if (!pci_enable_msix_exact (fnic->pdev, fnic->msix_entry, + n + m + o +1 )) { fnic->rq_count = n; fnic->raw_wq_count = m; fnic->wq_copy_count = o;
Signature · 1 line
1.7.7.6
PATCH v2 8/23 hpsa: Fallback to MSI rather than to INTx if MSI-X failed
In reply to Alexander GordeevCurrently the driver falls back to INTx mode when MSI-X initialization failed. This is a suboptimal behaviour for chips that also support MSI. This update changes that behaviour and falls back to MSI mode in case MSI-X mode initialization failed.
--- drivers/scsi/hpsa.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/scsi/hpsa.c +0 -2
@@ -4180,11 +4180,9 @@ static void hpsa_interrupt_mode(struct ctlr_info *h)if (err >0 ) {dev_warn (&h->pdev->dev,"only %d MSI-X vectors " "available\n" , err); - goto default_int_mode; }else {dev_warn (&h->pdev->dev,"MSI-X init failed %d\n" , err); - goto default_int_mode; } }if (pci_find_capability (h->pdev,PCI_CAP_ID_MSI )) {
Signature · 1 line
1.7.7.6
PATCH v2 9/23 hpsa: Use pci_enable_msix_exact() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/hpsa.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)
drivers/scsi/hpsa.c +2 -8
@@ -4169,7 +4169,7 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) goto default_int_mode;if (pci_find_capability (h->pdev,PCI_CAP_ID_MSIX )) {dev_info (&h->pdev->dev,"MSIX\n" ); - err =pci_enable_msix (h->pdev, hpsa_msix_entries, + err =pci_enable_msix_exact (h->pdev, hpsa_msix_entries,MAX_REPLY_QUEUES );if (!err) {for (i =0 ; i <MAX_REPLY_QUEUES ; i++)
@@ -4177,13 +4177,7 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) h->msix_vector =1 ;return ; } -if (err >0 ) { -dev_warn (&h->pdev->dev,"only %d MSI-X vectors " -"available\n" , err); - }else { -dev_warn (&h->pdev->dev,"MSI-X init failed %d\n" , - err); - } +dev_warn (&h->pdev->dev,"MSI-X init failed %d\n" , err); }if (pci_find_capability (h->pdev,PCI_CAP_ID_MSI )) {dev_info (&h->pdev->dev,"MSI\n" );
Signature · 1 line
1.7.7.6
PATCH v2 10/23 isci: Use pci_enable_msix_exact() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/isci/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/scsi/isci/init.c +1 -1
@@ -356,7 +356,7 @@ static int isci_setup_interrupts(struct pci_dev *pdev)for (i =0 ; i < num_msix; i++) pci_info->msix_entries[i].entry = i; - err =pci_enable_msix (pdev, pci_info->msix_entries, num_msix); + err =pci_enable_msix_exact (pdev, pci_info->msix_entries, num_msix);if (err) goto intx;
Signature · 1 line
1.7.7.6
RE: [PATCH v2 10/23] isci: Use pci_enable_msix_exact() instead of pci_enable_msix()
Quoted 32 lines · Alexander Gordeev
As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix()andpci_enable_msi_block()all drivers using these two interfaces need to be updated to use the newpci_enable_msi_range()orpci_enable_msi_exact()andpci_enable_msix_range()orpci_enable_msix_exact()interfaces.Signed-off-by Alexander Gordeev <[email protected]>Cc Lukasz Dorau <[email protected]>Cc Maciej Patelczyk <[email protected]>Cc Dave Jiang <[email protected]>--- drivers/scsi/isci/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/scsi/isci/init.c +1
-2@@ -356,7 +356,7 @@ static int isci_setup_interrupts(struct pci_dev *pdev)for (i =0 ; i < num_msix; i++) pci_info->msix_entries[i].entry = i; - err =pci_enable_msix (pdev, pci_info->msix_entries, num_msix); + err =pci_enable_msix_exact (pdev, pci_info->msix_entries, num_msix);if (err) goto intx; --
Quoted 1 line
1.7.7.6
Looks fine.
Thanks,
Lukasz
PATCH v2 11/23 lpfc: Remove superfluous call to pci_disable_msix()
In reply to Alexander GordeevThere is no need to call pci_disable_msix() in case the previous call to pci_enable_msix() failed
--- drivers/scsi/lpfc/lpfc_init.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +6 -3
@@ -8078,7 +8078,7 @@ lpfc_sli_enable_msix(struct lpfc_hba *phba)if (rc) {lpfc_printf_log (phba,KERN_INFO ,LOG_INIT ,"0420 PCI enable MSI-X failed (%d)\n" , rc); - goto msi_fail_out; + goto vec_fail_out; }for (i =0 ; i <LPFC_MSIX_VECTORS ; i++) lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
@@ -8156,6 +8156,8 @@ irq_fail_out: msi_fail_out:/* Unconfigure MSI-X capability structure */ pci_disable_msix (phba->pcidev); + +vec_fail_out:return rc; }
@@ -8644,7 +8646,7 @@ enable_msix_vectors: }else if (rc) {lpfc_printf_log (phba,KERN_INFO ,LOG_INIT ,"0484 PCI enable MSI-X failed (%d)\n" , rc); - goto msi_fail_out; + goto vec_fail_out; }/* Log MSI-X vector assignment */
@@ -8696,9 +8698,10 @@ cfg_fail_out: &phba->sli4_hba.fcp_eq_hdl[index]); } -msi_fail_out:/* Unconfigure MSI-X capability structure */ pci_disable_msix (phba->pcidev); + +vec_fail_out:return rc; }
Signature · 1 line
1.7.7.6
PATCH v2 12/23 lpfc: Use pci_enable_msix_range() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/lpfc/lpfc_init.c | 45 ++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 25 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +20 -25
@@ -8047,9 +8047,9 @@ lpfc_sli4_pci_mem_unset(struct lpfc_hba *phba)* @phba: pointer to lpfc hba data structure. * * This routine is invoked to enable the MSI-X interrupt vectors to device -* with SLI-3 interface specs. The kernel function pci_enable_msix() is -* called to enable the MSI-X vectors. Note that pci_enable_msix(), once -* invoked, enables either all or nothing, depending on the current +* with SLI-3 interface specs. The kernel function pci_enable_msix_exact() +* is called to enable the MSI-X vectors. Note that pci_enable_msix_exact(), +* once invoked, enables either all or nothing, depending on the current * availability of PCI vector resources. The device driver is responsible * for calling the individual request_irq() to register each MSI-X vector * with a interrupt handler, which is done in this function. Note that
@@ -8073,8 +8073,8 @@ lpfc_sli_enable_msix(struct lpfc_hba *phba) phba->msix_entries[i].entry = i;/* Configure MSI-X capability structure */ - rc =pci_enable_msix (phba->pcidev, phba->msix_entries, -ARRAY_SIZE (phba->msix_entries)); + rc =pci_enable_msix_exact (phba->pcidev, phba->msix_entries, +ARRAY_SIZE (phba->msix_entries));if (rc) {lpfc_printf_log (phba,KERN_INFO ,LOG_INIT ,"0420 PCI enable MSI-X failed (%d)\n" , rc);
@@ -8187,8 +8187,8 @@ lpfc_sli_disable_msix(struct lpfc_hba *phba)* @phba: pointer to lpfc hba data structure. * * This routine is invoked to enable the MSI interrupt mode to device with -* SLI-3 interface spec. The kernel function pci_enable_msi() is called to -* enable the MSI vector. The device driver is responsible for calling the +* SLI-3 interface spec. The kernel function pci_enable_msi() is called +* to enable the MSI vector. The device driver is responsible for calling the * request_irq() to register MSI vector with a interrupt the handler, which * is done in this function. *
@@ -8611,16 +8611,14 @@ out:* @phba: pointer to lpfc hba data structure. * * This routine is invoked to enable the MSI-X interrupt vectors to device -* with SLI-4 interface spec. The kernel function pci_enable_msix() is called -* to enable the MSI-X vectors. Note that pci_enable_msix(), once invoked, -* enables either all or nothing, depending on the current availability of -* PCI vector resources. The device driver is responsible for calling the -* individual request_irq() to register each MSI-X vector with a interrupt -* handler, which is done in this function. Note that later when device is -* unloading, the driver should always call free_irq() on all MSI-X vectors -* it has done request_irq() on before calling pci_disable_msix(). Failure -* to do so results in a BUG_ON() and a device will be left with MSI-X -* enabled and leaks its vectors. +* with SLI-4 interface spec. The kernel function pci_enable_msix_range() +* is called to enable the MSI-X vectors. The device driver is responsible +* for calling the individual request_irq() to register each MSI-X vector +* with a interrupt handler, which is done in this function. Note that +* later when device is unloading, the driver should always call free_irq() +* on all MSI-X vectors it has done request_irq() on before calling +* pci_disable_msix(). Failure to do so results in a BUG_ON() and a device +* will be left with MSI-X enabled and leaks its vectors. * * Return codes * 0 - successful
@@ -8636,17 +8634,14 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) phba->sli4_hba.msix_entries[index].entry = index;/* Configure MSI-X capability structure */ - vectors = phba->cfg_fcp_io_channel; -enable_msix_vectors: - rc =pci_enable_msix (phba->pcidev, phba->sli4_hba.msix_entries, - vectors); -if (rc >1 ) { - vectors = rc; - goto enable_msix_vectors; - }else if (rc) { + rc =pci_enable_msix_range (phba->pcidev, phba->sli4_hba.msix_entries, +2 , phba->cfg_fcp_io_channel); +if (rc <0 ) {lpfc_printf_log (phba,KERN_INFO ,LOG_INIT ,"0484 PCI enable MSI-X failed (%d)\n" , rc); goto vec_fail_out; + }else { + vectors = rc; }/* Log MSI-X vector assignment */
Signature · 1 line
1.7.7.6
PATCH v2 13/23 megaraid: Fail resume if MSI-X re-initialization failed
In reply to Alexander GordeevCurrently the driver fails to analize MSI-X re-enablement status on resuming and always assumes the success. This update checks the MSI-X initialization result and fails to resume if MSI-Xs re-enablement failed.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +5 -3
@@ -4667,9 +4667,10 @@ megasas_resume(struct pci_dev *pdev) goto fail_ready_state;/* Now re-enable MSI-X */ -if (instance->msix_vectors) -pci_enable_msix (instance->pdev, instance->msixentry, - instance->msix_vectors); +if (instance->msix_vectors && +pci_enable_msix (instance->pdev, instance->msixentry, + instance->msix_vectors)) + goto fail_reenable_msix;switch (instance->pdev->device) {case PCI_DEVICE_ID_LSI_FUSION :
@@ -4756,6 +4757,7 @@ fail_init_mfi: fail_set_dma_mask: fail_ready_state: +fail_reenable_msix:pci_disable_device (pdev);
Signature · 1 line
1.7.7.6
PATCH v2 14/23 megaraid: Use pci_enable_msix_range() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +7 -13
@@ -3731,17 +3731,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"
@@ -4668,8 +4662,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) {
Signature · 1 line
1.7.7.6
PATCH v2 15/23 mpt2sas: Use pci_enable_msix_exact() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/mpt2sas/mpt2sas_base.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/mpt2sas/mpt2sas_base.c +3 -3
@@ -1432,10 +1432,10 @@ _base_enable_msix(struct MPT2SAS_ADAPTER *ioc)for (i =0 , a = entries; i < ioc->reply_queue_count; i++, a++) a->entry = i; - r =pci_enable_msix (ioc->pdev, entries, ioc->reply_queue_count); + r =pci_enable_msix_exact (ioc->pdev, entries, ioc->reply_queue_count);if (r) { -dfailprintk (ioc,printk (MPT2SAS_INFO_FMT "pci_enable_msix " -"failed (r=%d) !!!\n" , ioc->name, r)); +dfailprintk (ioc,printk (MPT2SAS_INFO_FMT +"pci_enable_msix_exact failed (r=%d) !!!\n" , ioc->name, r));kfree (entries); goto try_ioapic; }
Signature · 1 line
1.7.7.6
PATCH v2 16/23 mpt3sas: Use pci_enable_msix_exact() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +2 -2
@@ -1747,10 +1747,10 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc)for (i =0 , a = entries; i < ioc->reply_queue_count; i++, a++) a->entry = i; - r =pci_enable_msix (ioc->pdev, entries, ioc->reply_queue_count); + r =pci_enable_msix_exact (ioc->pdev, entries, ioc->reply_queue_count);if (r) {dfailprintk (ioc,pr_info (MPT3SAS_FMT -"pci_enable_msix failed (r=%d) !!!\n" , +"pci_enable_msix_exact failed (r=%d) !!!\n" , ioc->name, r));kfree (entries); goto try_ioapic;
Signature · 1 line
1.7.7.6
PATCH v2 17/23 pm8001: Fix invalid return when request_irq() failed
In reply to Alexander GordeevWhen a call to request_irq() failed pm8001_setup_msix() still returns the success. This udate fixes the described misbehaviour.
--- drivers/scsi/pm8001/pm8001_init.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/pm8001/pm8001_init.c +3 -2
@@ -739,9 +739,10 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha) pm8001_ha->irq_vector[i].irq_id = i; pm8001_ha->irq_vector[i].drv_inst = pm8001_ha; -if (request_irq (pm8001_ha->msix_entries[i].vector, + rc =request_irq (pm8001_ha->msix_entries[i].vector, pm8001_interrupt_handler_msix, flag, - intr_drvname[i], &(pm8001_ha->irq_vector[i]))) { + intr_drvname[i], &(pm8001_ha->irq_vector[i])); +if (rc) {for (j =0 ; j < i; j++) free_irq( pm8001_ha->msix_entries[j].vector,
Signature · 1 line
1.7.7.6
PATCH v2 18/23 pm8001: Use pci_enable_msix_exact() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/pm8001/pm8001_init.c | 39 +++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 19 deletions(-)
drivers/scsi/pm8001/pm8001_init.c +20 -19
@@ -724,34 +724,35 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha)sizeof (pm8001_ha->msix_entries[0 ]);for (i =0 ; i < max_entry ; i++) pm8001_ha->msix_entries[i].entry = i; - rc =pci_enable_msix (pm8001_ha->pdev, pm8001_ha->msix_entries, + rc =pci_enable_msix_exact (pm8001_ha->pdev, pm8001_ha->msix_entries, number_of_intr); pm8001_ha->number_of_intr = number_of_intr; -if (!rc) { -PM8001_INIT_DBG (pm8001_ha,pm8001_printk ( -"pci_enable_msix request ret:%d no of intr %d\n" , - rc, pm8001_ha->number_of_intr)); +if (rc) +return rc; +PM8001_INIT_DBG (pm8001_ha,pm8001_printk ( +"pci_enable_msix_exact request ret:%d no of intr %d\n" , + rc, pm8001_ha->number_of_intr)); -for (i =0 ; i < number_of_intr; i++) { -snprintf (intr_drvname[i],sizeof (intr_drvname[0 ]), -DRV_NAME "%d" , i); - pm8001_ha->irq_vector[i].irq_id = i; - pm8001_ha->irq_vector[i].drv_inst = pm8001_ha; +for (i =0 ; i < number_of_intr; i++) { +snprintf (intr_drvname[i],sizeof (intr_drvname[0 ]), +DRV_NAME "%d" , i); + pm8001_ha->irq_vector[i].irq_id = i; + pm8001_ha->irq_vector[i].drv_inst = pm8001_ha; - rc =request_irq (pm8001_ha->msix_entries[i].vector, - pm8001_interrupt_handler_msix, flag, - intr_drvname[i], &(pm8001_ha->irq_vector[i])); -if (rc) { -for (j =0 ; j < i; j++) -free_irq ( - pm8001_ha->msix_entries[j].vector, + rc =request_irq (pm8001_ha->msix_entries[i].vector, + pm8001_interrupt_handler_msix, flag, + intr_drvname[i], &(pm8001_ha->irq_vector[i])); +if (rc) { +for (j =0 ; j < i; j++) { +free_irq (pm8001_ha->msix_entries[j].vector, &(pm8001_ha->irq_vector[i])); -pci_disable_msix (pm8001_ha->pdev); -break ; } +pci_disable_msix (pm8001_ha->pdev); +break ; } } + return rc; }#endif
Signature · 1 line
1.7.7.6
PATCH v2 19/23 pmcraid: Get rid of a redundant assignment
In reply to Alexander Gordeev--- drivers/scsi/pmcraid.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/scsi/pmcraid.c +0 -1
@@ -4746,7 +4746,6 @@ pmcraid_isr_legacy: pinstance->hrrq_vector[0 ].drv_inst = pinstance; pinstance->hrrq_vector[0 ].vector = pdev->irq; pinstance->num_hrrq =1 ; - rc =0 ; rc =request_irq (pdev->irq, pmcraid_isr,IRQF_SHARED ,PMCRAID_DRIVER_NAME , &pinstance->hrrq_vector[0 ]);
Signature · 1 line
1.7.7.6
PATCH v2 20/23 pmcraid: Use pci_enable_msix_range() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/pmcraid.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-)
drivers/scsi/pmcraid.c +2 -11
@@ -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;
Signature · 1 line
1.7.7.6
PATCH v2 21/23 qla2xxx: Use pci_enable_msix_range() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
Log message code 0x00c6 preserved, although it is reported after successful call to pci_enable_msix_range(), not before possibly unsuccessful call to pci_enable_msix(). Consumers of the error code should not notice the difference.
--- drivers/scsi/qla2xxx/qla_isr.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +11 -16
@@ -2896,27 +2896,22 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)for (i =0 ; i < ha->msix_count; i++) entries[i].entry = i; - ret =pci_enable_msix (ha->pdev, entries, ha->msix_count); -if (ret) { -if (ret <MIN_MSIX_COUNT ) - goto msix_failed; - + ret =pci_enable_msix_range (ha->pdev, + entries,MIN_MSIX_COUNT , ha->msix_count); +if (ret <0 ) { +ql_log (ql_log_fatal, vha,0x00c7 , +"MSI-X: Failed to enable support, " +"giving up -- %d/%d.\n" , + ha->msix_count, ret); + goto msix_out; + }else if (ret < ha->msix_count) {ql_log (ql_log_warn, vha,0x00c6 ,"MSI-X: Failed to enable support " "-- %d/%d\n Retry with %d vectors.\n" , ha->msix_count, ret, ret); - ha->msix_count = ret; - ret =pci_enable_msix (ha->pdev, entries, ha->msix_count); -if (ret) { -msix_failed: -ql_log (ql_log_fatal, vha,0x00c7 , -"MSI-X: Failed to enable support, " -"giving up -- %d/%d.\n" , - ha->msix_count, ret); - goto msix_out; - } - ha->max_rsp_queues = ha->msix_count -1 ; } + ha->msix_count = ret; + ha->max_rsp_queues = ha->msix_count -1 ; ha->msix_entries =kzalloc (sizeof (struct qla_msix_entry ) * ha->msix_count,GFP_KERNEL );if (!ha->msix_entries) {
Signature · 1 line
1.7.7.6
PATCH v2 22/23 qla4xxx: Use pci_enable_msix_exact() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/qla4xxx/ql4_nx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/scsi/qla4xxx/ql4_nx.c +1 -1
@@ -3805,7 +3805,7 @@ qla4_8xxx_enable_msix(struct scsi_qla_host *ha)for (i =0 ; i <QLA_MSIX_ENTRIES ; i++) entries[i].entry = qla4_8xxx_msix_entries[i].entry; - ret =pci_enable_msix (ha->pdev, entries,ARRAY_SIZE (entries)); + ret =pci_enable_msix_exact (ha->pdev, entries,ARRAY_SIZE (entries));if (ret) { ql4_printk(KERN_WARNING, ha, "MSI-X: Failed to enable support -- %d/%d\n",
Signature · 1 line
1.7.7.6
PATCH v2 23/23 vmw_pvscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
In reply to Alexander GordeevAs 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.
--- drivers/scsi/vmw_pvscsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/scsi/vmw_pvscsi.c +1 -1
@@ -1078,7 +1078,7 @@ static int pvscsi_setup_msix(const struct pvscsi_adapter *adapter,struct msix_entry entry = {0 ,PVSCSI_VECTOR_COMPLETION };int ret; - ret =pci_enable_msix (adapter->dev, &entry,1 ); + ret =pci_enable_msix_exact (adapter->dev, &entry,1 );if (ret)return ret;
Signature · 1 line
1.7.7.6
Re: [PATCH v2 23/23] vmw_pvscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
Hi Alexander,
This looks fine to me.
Thanks!
Arvind
----- Original Message -----
From: "Alexander Gordeev" <[email protected]>
To: [email protected]
Cc: "Alexander Gordeev" <[email protected]>, "Arvind Kumar" <[email protected]>, [email protected], [email protected], [email protected]
Sent: Monday, February 24, 2014 12:02:23 AM
Subject: [PATCH v2 23/23] vmw_pvscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
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.
--- drivers/scsi/vmw_pvscsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/scsi/vmw_pvscsi.c +1 -1
@@ -1078,7 +1078,7 @@ static int pvscsi_setup_msix(const struct pvscsi_adapter *adapter,struct msix_entry entry = {0 ,PVSCSI_VECTOR_COMPLETION };int ret; - ret =pci_enable_msix (adapter->dev, &entry,1 ); + ret =pci_enable_msix_exact (adapter->dev, &entry,1 );if (ret)return ret;
Signature · 1 line
1.7.7.6
Quoted 3 lines · Alexander Gordeev
This series is against James Bottomley's SCSI tree [1], but it needs commit f7fc32c ("PCI/MSI: Add
pci_enable_msi_exact()andpci_enable_msix_exact()") from from Bjorn Helgaas's PCI tree [2]:
The prerequisite commit 3ce4e86 is in 3.14-rc4 now.
Signature · 3 lines
Regards, Alexander Gordeev [email protected]
Bjorn Helgaas
maintainerQuoted 17 lines · Alexander Gordeev
Hello!
This series is against James Bottomley's SCSI tree [1], but it needs commit f7fc32c ("PCI/MSI: Add
pci_enable_msi_exact()andpci_enable_msix_exact()") from from Bjorn Helgaas's PCI tree [2]:1.
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitfor-next
2.git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.gitpci/msiRecently
pci_enable_msix_exact()function has been accepted to the mainline. That is a variation ofpci_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 postedpci_enable_msix_range()usages.
Quoted 6 lines
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
Quoted 61 lines
Alexander Gordeev (23):
be2iscsi: Usepci_enable_msix_exact()instead ofpci_enable_msix()
bfa: Do not callpci_enable_msix()after it failed once
bfa: Cleanupbfad_setup_intr()function
bfa: Usepci_enable_msix_exact()instead ofpci_enable_msix()
csiostor: Remove superfluous call topci_disable_msix()
csiostor: Usepci_enable_msix_range()instead ofpci_enable_msix()
fnic: Usepci_enable_msix_exact()instead ofpci_enable_msix()
hpsa: Fallback to MSI rather than to INTx if MSI-X failed
hpsa: Usepci_enable_msix_exact()instead ofpci_enable_msix()
isci: Usepci_enable_msix_exact()instead ofpci_enable_msix()
lpfc: Remove superfluous call topci_disable_msix()
lpfc: Usepci_enable_msix_range()instead ofpci_enable_msix()
megaraid: Fail resume if MSI-X re-initialization failed
megaraid: Usepci_enable_msix_range()instead ofpci_enable_msix()
mpt2sas: Usepci_enable_msix_exact()instead ofpci_enable_msix()
mpt3sas: Usepci_enable_msix_exact()instead ofpci_enable_msix()
pm8001: Fix invalid return whenrequest_irq()failed
pm8001: Usepci_enable_msix_exact()instead ofpci_enable_msix()
pmcraid: Get rid of a redundant assignment
pmcraid: Usepci_enable_msix_range()instead ofpci_enable_msix()
qla2xxx: Usepci_enable_msix_range()instead ofpci_enable_msix()
qla4xxx: Usepci_enable_msix_exact()instead ofpci_enable_msix()
vmw_pvscsi: Usepci_enable_msix_exact()instead ofpci_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(-)Signature · 7 lines
1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Quoted 31 lines · Bjorn Helgaas
Quoted 17 lines · Alexander Gordeev
Hello!
This series is against James Bottomley's SCSI tree [1], but it needs commit f7fc32c ("PCI/MSI: Add
pci_enable_msi_exact()andpci_enable_msix_exact()") from from Bjorn Helgaas's PCI tree [2]:1.
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitfor-next
2.git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.gitpci/msiRecently
pci_enable_msix_exact()function has been accepted to the mainline. That is a variation ofpci_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 postedpci_enable_msix_range()usages.Quoted 6 lines
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.
Quoted 5 lines
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.
Sure, any that haven't been applied ... I think we already have some updates for drivers which do MSIX changes, but for those you'll see the conflict with scsi.git and you can just drop the patch for that driver.
James
Quoted 11 lines · Bjorn Helgaas
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.
Hi Bjorn,
It has shifted to v3.16, right?
Quoted 1 line
Bjorn
Signature · 3 lines
Regards, Alexander Gordeev [email protected]
Bjorn Helgaas
maintainerQuoted 13 lines · Alexander Gordeev
Quoted 11 lines · Bjorn Helgaas
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.
Quoted 3 lines
Hi Bjorn,
It has shifted to v3.16, right?
Yep, sorry, I meant to get to these, but was too busy, so they'll probably go in v3.16.
Bjorn