summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/hpsa.c
diff options
context:
space:
mode:
authorJustin Lindley <justin.lindley@hp.com>2014-05-29 10:52:47 -0500
committerChristoph Hellwig <hch@lst.de>2014-06-02 09:54:52 +0200
commit00701a96f81f4e1b7279f5e05fe02274bbe29e59 (patch)
tree172c50a24391d93c71812d93879da504dea40e38 /drivers/scsi/hpsa.c
parent9233fb10f35ab523f788e635ff07c355bb31bbdd (diff)
downloadblackbird-op-linux-00701a96f81f4e1b7279f5e05fe02274bbe29e59.tar.gz
blackbird-op-linux-00701a96f81f4e1b7279f5e05fe02274bbe29e59.zip
hpsa: change doorbell reset delay to ten seconds
After 3.22 firmware, PMC firmware guys tell us the previous 5 second delay after a reset now needs to be 10 secs to avoid a PCIe error due to the driver looking at the controller too soon after the reset. Signed-off-by: Justin Lindley <justin.lindley@hp.com> Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Reviewed-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/hpsa.c')
-rw-r--r--drivers/scsi/hpsa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 59e7b19a971b..e97a7c294548 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5838,12 +5838,12 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev,
dev_info(&pdev->dev, "using doorbell to reset controller\n");
writel(use_doorbell, vaddr + SA5_DOORBELL);
- /* PMC hardware guys tell us we need a 5 second delay after
+ /* PMC hardware guys tell us we need a 10 second delay after
* doorbell reset and before any attempt to talk to the board
* at all to ensure that this actually works and doesn't fall
* over in some weird corner cases.
*/
- msleep(5000);
+ msleep(10000);
} else { /* Try to do it the PCI power state way */
/* Quoting from the Open CISS Specification: "The Power
OpenPOWER on IntegriCloud