| From 8d5243fed049a68b887d9c6a9db821dc82ba96c2 Mon Sep 17 00:00:00 2001 |
| From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com> |
| Date: Fri, 28 Aug 2015 06:38:35 -0400 |
| Subject: [PATCH 09/17] aacraid: Change interrupt mode to MSI for Series 6 |
| |
| This change always sets MSI interrupt mode for series-6 controller. |
| |
| Reviewed-by: Tomas Henzl <thenzl@redhat.com> |
| Reviewed-by: Murthy Bhat <Murthy.Bhat@pmcs.com> |
| Reviewed-by: Karthikeya Sunkesula <Karthikeya.Sunkesula@pmcs.com> |
| Signed-off-by: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com> |
| Signed-off-by: Joel Stanley <joel@jms.id.au> |
| --- |
| drivers/scsi/aacraid/aachba.c | 2 +- |
| drivers/scsi/aacraid/src.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c |
| index fe59b00..05f2a02 100644 |
| --- a/drivers/scsi/aacraid/aachba.c |
| +++ b/drivers/scsi/aacraid/aachba.c |
| @@ -259,7 +259,7 @@ MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the" |
| " 0=off, 1=on"); |
| module_param_named(msi, aac_msi, int, S_IRUGO|S_IWUSR); |
| MODULE_PARM_DESC(msi, "IRQ handling." |
| - " 0=PIC(default), 1=MSI, 2=MSI-X(unsupported, uses MSI)"); |
| + " 0=PIC(default), 1=MSI, 2=MSI-X)"); |
| module_param(startup_timeout, int, S_IRUGO|S_IWUSR); |
| MODULE_PARM_DESC(startup_timeout, "The duration of time in seconds to wait for" |
| " adapter to have it's kernel up and\n" |
| diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c |
| index b147341..eb07b3d 100644 |
| --- a/drivers/scsi/aacraid/src.c |
| +++ b/drivers/scsi/aacraid/src.c |
| @@ -742,7 +742,7 @@ int aac_src_init(struct aac_dev *dev) |
| if (dev->comm_interface != AAC_COMM_MESSAGE_TYPE1) |
| goto error_iounmap; |
| |
| - dev->msi = aac_msi && !pci_enable_msi(dev->pdev); |
| + dev->msi = !pci_enable_msi(dev->pdev); |
| |
| dev->aac_msix[0].vector_no = 0; |
| dev->aac_msix[0].dev = dev; |
| -- |
| 2.5.0 |
| |