]> git.proxmox.com Git - pve-kernel-jessie.git/blob - 0003-aacraid-change-interrupt-mode.patch
bump version to 4.2.6-31
[pve-kernel-jessie.git] / 0003-aacraid-change-interrupt-mode.patch
1 From 9022d375bd22869ba3e5ad3635f00427cfb934fc Mon Sep 17 00:00:00 2001
2 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
3 Date: Fri, 28 Aug 2015 06:38:35 -0400
4 Subject: aacraid: Change interrupt mode to MSI for Series 6
5
6 This change always sets MSI interrupt mode for series-6 controller.
7
8 Reviewed-by: Tomas Henzl <thenzl@redhat.com>
9 Reviewed-by: Murthy Bhat <Murthy.Bhat@pmcs.com>
10 Reviewed-by: Karthikeya Sunkesula <Karthikeya.Sunkesula@pmcs.com>
11 Signed-off-by: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
12 Signed-off-by: James Bottomley <JBottomley@Odin.com>
13 ---
14 drivers/scsi/aacraid/aachba.c | 2 +-
15 drivers/scsi/aacraid/src.c | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18 diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
19 index fe59b00..05f2a02 100644
20 --- a/drivers/scsi/aacraid/aachba.c
21 +++ b/drivers/scsi/aacraid/aachba.c
22 @@ -259,7 +259,7 @@ MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the"
23 " 0=off, 1=on");
24 module_param_named(msi, aac_msi, int, S_IRUGO|S_IWUSR);
25 MODULE_PARM_DESC(msi, "IRQ handling."
26 - " 0=PIC(default), 1=MSI, 2=MSI-X(unsupported, uses MSI)");
27 + " 0=PIC(default), 1=MSI, 2=MSI-X)");
28 module_param(startup_timeout, int, S_IRUGO|S_IWUSR);
29 MODULE_PARM_DESC(startup_timeout, "The duration of time in seconds to wait for"
30 " adapter to have it's kernel up and\n"
31 diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
32 index b147341..eb07b3d 100644
33 --- a/drivers/scsi/aacraid/src.c
34 +++ b/drivers/scsi/aacraid/src.c
35 @@ -742,7 +742,7 @@ int aac_src_init(struct aac_dev *dev)
36 if (dev->comm_interface != AAC_COMM_MESSAGE_TYPE1)
37 goto error_iounmap;
38
39 - dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
40 + dev->msi = !pci_enable_msi(dev->pdev);
41
42 dev->aac_msix[0].vector_no = 0;
43 dev->aac_msix[0].dev = dev;
44 --
45 cgit v0.11.2
46