aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorTomas Henzl <thenzl@redhat.com>2015-01-23 17:41:20 -0500
committerJames Bottomley <JBottomley@Parallels.com>2015-02-02 12:57:35 -0500
commit3b747298786355c6934b0892fc9ae4ca44105192 (patch)
tree41042f1c5b23114634364961d2f38aa7c53225d4 /drivers/scsi
parent03741d956eaac31264952e0afa181b62713892a5 (diff)
hpsa: turn off interrupts when kdump starts
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@pmcs.com> Signed-off-by: Don Brace <don.brace@pmcs.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/hpsa.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index d97f4555ab0f..9edacff962a3 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6370,6 +6370,7 @@ static void hpsa_hba_inquiry(struct ctlr_info *h)
6370static int hpsa_init_reset_devices(struct pci_dev *pdev) 6370static int hpsa_init_reset_devices(struct pci_dev *pdev)
6371{ 6371{
6372 int rc, i; 6372 int rc, i;
6373 void __iomem *vaddr;
6373 6374
6374 if (!reset_devices) 6375 if (!reset_devices)
6375 return 0; 6376 return 0;
@@ -6393,6 +6394,14 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev)
6393 6394
6394 pci_set_master(pdev); 6395 pci_set_master(pdev);
6395 6396
6397 vaddr = pci_ioremap_bar(pdev, 0);
6398 if (vaddr == NULL) {
6399 rc = -ENOMEM;
6400 goto out_disable;
6401 }
6402 writel(SA5_INTR_OFF, vaddr + SA5_REPLY_INTR_MASK_OFFSET);
6403 iounmap(vaddr);
6404
6396 /* Reset the controller with a PCI power-cycle or via doorbell */ 6405 /* Reset the controller with a PCI power-cycle or via doorbell */
6397 rc = hpsa_kdump_hard_reset_controller(pdev); 6406 rc = hpsa_kdump_hard_reset_controller(pdev);
6398 6407