4.14-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 65111785acccb836ec75263b03b0e33f21e74f47 ]
Problem: - during the driver initialization, driver will poll fw for KERNEL_UP in a 30 seconds timeout.
- if the firmware is not ready after 30 seconds, driver will not be loaded.
Fix: - change timeout from 30 seconds to 3 minutes.
Reported-by: Feng Li lifeng1519@gmail.com Reviewed-by: Ajish Koshy ajish.koshy@microsemi.com Reviewed-by: Murthy Bhat Murthy.Bhat@microsemi.com Reviewed-by: Dave Carroll david.carroll@microsemi.com Reviewed-by: Kevin Barnett kevin.barnett@microsemi.com Signed-off-by: Mahesh Rajashekhara mahesh.rajashekhara@microsemi.com Signed-off-by: Don Brace don.brace@microsemi.com Signed-off-by: Martin K. Petersen martin.petersen@oracle.com Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/smartpqi/smartpqi_sis.c b/drivers/scsi/smartpqi/smartpqi_sis.c index 5141bd4c9f06..ca7dfb3a520f 100644 --- a/drivers/scsi/smartpqi/smartpqi_sis.c +++ b/drivers/scsi/smartpqi/smartpqi_sis.c @@ -59,7 +59,7 @@
#define SIS_CTRL_KERNEL_UP 0x80 #define SIS_CTRL_KERNEL_PANIC 0x100 -#define SIS_CTRL_READY_TIMEOUT_SECS 30 +#define SIS_CTRL_READY_TIMEOUT_SECS 180 #define SIS_CTRL_READY_RESUME_TIMEOUT_SECS 90 #define SIS_CTRL_READY_POLL_INTERVAL_MSECS 10