Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-23 16:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

scsi: isci: switch to pci_alloc_irq_vectors

Browse Source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Christoph Hellwig 2016-11-30 17:21:01 +01:00 committed by Martin K. Petersen
parent 9dadfb973f
commit e3cb0e47b9
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/scsi/isci/host.h
View File

@ -295,7 +295,6 @@ enum sci_controller_states {
#define SCI_MAX_MSIX_INT (SCI_NUM_MSI_X_INT*SCI_MAX_CONTROLLERS) #define SCI_MAX_MSIX_INT (SCI_NUM_MSI_X_INT*SCI_MAX_CONTROLLERS)
struct isci_pci_info { struct isci_pci_info {
struct msix_entry msix_entries[SCI_MAX_MSIX_INT];
struct isci_host *hosts[SCI_MAX_CONTROLLERS]; struct isci_host *hosts[SCI_MAX_CONTROLLERS];
struct isci_orom *orom; struct isci_orom *orom;
}; };

23
drivers/scsi/isci/init.c
View File

@ -350,16 +350,12 @@ static int isci_setup_interrupts(struct pci_dev *pdev)
*/ */
num_msix = num_controllers(pdev) * SCI_NUM_MSI_X_INT; num_msix = num_controllers(pdev) * SCI_NUM_MSI_X_INT;
for (i = 0; i < num_msix; i++) err = pci_alloc_irq_vectors(pdev, num_msix, num_msix, PCI_IRQ_MSIX);
pci_info->msix_entries[i].entry = i; if (err < 0)
err = pci_enable_msix_exact(pdev, pci_info->msix_entries, num_msix);
if (err)
goto intx; goto intx;
for (i = 0; i < num_msix; i++) { for (i = 0; i < num_msix; i++) {
int id = i / SCI_NUM_MSI_X_INT; int id = i / SCI_NUM_MSI_X_INT;
struct msix_entry *msix = &pci_info->msix_entries[i];
irq_handler_t isr; irq_handler_t isr;
ihost = pci_info->hosts[id]; ihost = pci_info->hosts[id];
@ -369,8 +365,8 @@ static int isci_setup_interrupts(struct pci_dev *pdev)
else else
isr = isci_msix_isr; isr = isci_msix_isr;
err = devm_request_irq(&pdev->dev, msix->vector, isr, 0, err = devm_request_irq(&pdev->dev, pci_irq_vector(pdev, i),
DRV_NAME"-msix", ihost); isr, 0, DRV_NAME"-msix", ihost);
if (!err) if (!err)
continue; continue;
@ -378,18 +374,19 @@ static int isci_setup_interrupts(struct pci_dev *pdev)
while (i--) { while (i--) {
id = i / SCI_NUM_MSI_X_INT; id = i / SCI_NUM_MSI_X_INT;
ihost = pci_info->hosts[id]; ihost = pci_info->hosts[id];
msix = &pci_info->msix_entries[i]; devm_free_irq(&pdev->dev, pci_irq_vector(pdev, i),
devm_free_irq(&pdev->dev, msix->vector, ihost); ihost);
} }
pci_disable_msix(pdev); pci_free_irq_vectors(pdev);
goto intx; goto intx;
} }
return 0; return 0;
intx: intx:
for_each_isci_host(i, ihost, pdev) { for_each_isci_host(i, ihost, pdev) {
err = devm_request_irq(&pdev->dev, pdev->irq, isci_intx_isr, err = devm_request_irq(&pdev->dev, pci_irq_vector(pdev, 0),
IRQF_SHARED, DRV_NAME"-intx", ihost); isci_intx_isr, IRQF_SHARED, DRV_NAME"-intx",
ihost);
if (err) if (err)
break; break;
} }