[3.16.y-ckt stable] Patch "hpsa: turn off interrupts when kdump starts" has been added to staging queue
Luis Henriques
luis.henriques at canonical.com
Tue Apr 21 15:24:25 UTC 2015
This is a note to let you know that I have just added a patch titled
hpsa: turn off interrupts when kdump starts
to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree
which can be found at:
http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.16.y-queue
This patch is scheduled to be released in version 3.16.7-ckt10.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Luis
------
>From 4e8b0819a67fbf615630e76f99db338146002ffc Mon Sep 17 00:00:00 2001
From: Tomas Henzl <thenzl at redhat.com>
Date: Fri, 23 Jan 2015 16:41:20 -0600
Subject: hpsa: turn off interrupts when kdump starts
commit 3b747298786355c6934b0892fc9ae4ca44105192 upstream.
Sometimes when the card is restarted it may cause -
"irq 16: nobody cared (try booting with the "irqpoll" option)"
that is likely caused so, that the card, after the hard reset
finishes, pulls on the irq. Disabling the ints before or after
the hpsa_kdump_hard_reset_controller fixes it.
At this point we can't know in which state the card is,
so using SA5_INTR_OFF + SA5_REPLY_INTR_MASK_OFFSET defines directly,
instead of the function the drivers provides, seems to be apropriate.
Reviewed-by: Scott Teel <scott.teel at pmcs.com>
Signed-off-by: Don Brace <don.brace at pmcs.com>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Cc: Masoud Sharbiani <msharbiani at twopensource.com>
Cc: Vinson Lee <vlee at twopensource.com>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
drivers/scsi/hpsa.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 35996a829046..436ccec10305 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6529,6 +6529,7 @@ static void hpsa_hba_inquiry(struct ctlr_info *h)
static int hpsa_init_reset_devices(struct pci_dev *pdev)
{
int rc, i;
+ void __iomem *vaddr;
if (!reset_devices)
return 0;
@@ -6550,6 +6551,15 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev)
return -ENODEV;
}
pci_set_master(pdev);
+
+ vaddr = pci_ioremap_bar(pdev, 0);
+ if (vaddr == NULL) {
+ rc = -ENOMEM;
+ goto out_disable;
+ }
+ writel(SA5_INTR_OFF, vaddr + SA5_REPLY_INTR_MASK_OFFSET);
+ iounmap(vaddr);
+
/* Reset the controller with a PCI power-cycle or via doorbell */
rc = hpsa_kdump_hard_reset_controller(pdev);
More information about the kernel-team
mailing list