Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5a9ef25b14d39b8413364df12cb8d9bb7a673a32

Authored by Wayne Boyer
Committed by James Bottomley
1 parent 951948a397
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] ipr: add MSI support 

Enable MSI if available/supported.

Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

Showing 2 changed files with 9 additions and 2 deletions Side-by-side Diff

... ... @@ -7147,6 +7147,7 @@
7147 7147  
7148 7148 ENTER;
7149 7149 free_irq(pdev->irq, ioa_cfg);
  7150 + pci_disable_msi(pdev);
7150 7151 iounmap(ioa_cfg->hdw_dma_regs);
7151 7152 pci_release_regions(pdev);
7152 7153 ipr_free_mem(ioa_cfg);
... ... @@ -7432,6 +7433,11 @@
7432 7433 goto out;
7433 7434 }
7434 7435  
  7436 + if (!(rc = pci_enable_msi(pdev)))
  7437 + dev_info(&pdev->dev, "MSI enabled\n");
  7438 + else if (ipr_debug)
  7439 + dev_info(&pdev->dev, "Cannot enable MSI\n");
  7440 +
7435 7441 dev_info(&pdev->dev, "Found IOA with IRQ: %d\n", pdev->irq);
7436 7442  
7437 7443 host = scsi_host_alloc(&driver_template, sizeof(*ioa_cfg));
... ... @@ -7574,6 +7580,7 @@
7574 7580 out_scsi_host_put:
7575 7581 scsi_host_put(host);
7576 7582 out_disable:
  7583 + pci_disable_msi(pdev);
7577 7584 pci_disable_device(pdev);
7578 7585 goto out;
7579 7586 }
... ... @@ -37,8 +37,8 @@
37 37 /*
38 38 * Literals
39 39 */
40   -#define IPR_DRIVER_VERSION "2.4.1"
41   -#define IPR_DRIVER_DATE "(April 24, 2007)"
  40 +#define IPR_DRIVER_VERSION "2.4.2"
  41 +#define IPR_DRIVER_DATE "(January 21, 2009)"
42 42  
43 43 /*
44 44 * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding