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>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 59e7b19a971b304dfd42998cf25c55f3317ed8d8..e97a7c29454870c5680607f6dbf12a111bc2e366 100644 (file)
--- 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