Commit 5a9ef25b authored by Wayne Boyer's avatar Wayne Boyer Committed by James Bottomley
Browse files

[SCSI] ipr: add MSI support 



Enable MSI if available/supported.

Signed-off-by: default avatarWayne Boyer <wayneb@linux.vnet.ibm.com>
Acked-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 951948a3

drivers/scsi/ipr.c

+7 −0
Original line number Diff line number Diff line
@@ -7147,6 +7147,7 @@ static void ipr_free_all_resources(struct ipr_ioa_cfg *ioa_cfg) 


	ENTER;

	free_irq(pdev->irq, ioa_cfg);

	pci_disable_msi(pdev);

	iounmap(ioa_cfg->hdw_dma_regs);

	pci_release_regions(pdev);

	ipr_free_mem(ioa_cfg);
@@ -7432,6 +7433,11 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, 
		goto out;

	}



	if (!(rc = pci_enable_msi(pdev)))

		dev_info(&pdev->dev, "MSI enabled\n");

	else if (ipr_debug)

		dev_info(&pdev->dev, "Cannot enable MSI\n");



	dev_info(&pdev->dev, "Found IOA with IRQ: %d\n", pdev->irq);



	host = scsi_host_alloc(&driver_template, sizeof(*ioa_cfg));
@@ -7574,6 +7580,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, 
out_scsi_host_put:

	scsi_host_put(host);

out_disable:

	pci_disable_msi(pdev);

	pci_disable_device(pdev);

	goto out;

}

drivers/scsi/ipr.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
/*

 * Literals

 */

#define IPR_DRIVER_VERSION "2.4.1"

#define IPR_DRIVER_DATE "(April 24, 2007)"

#define IPR_DRIVER_VERSION "2.4.2"

#define IPR_DRIVER_DATE "(January 21, 2009)"



/*

 * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding