[PATCH v2 0/2] pm80xx mpi_uninit_check() fixes

[PATCH v2 0/2] pm80xx mpi_uninit_check() fixes

[Igor Pylypiv]

Changes from v1:
 - Added missing semicolons
 - Removed redundant parentheses

This patch series changes the wait time handling in mpi_uninit_check() to
make it similar to mpi_init_check().

In commit e90e236250e9 ("scsi: pm80xx: Increase timeout for pm80xx
mpi_uninit_check") the wait time for the inbound doorbell was increased
in the mpi_init_check() instead of the mpi_uninit_check().

Note:
SPC[/V]_DOORBELL_CLEAR_TIMEOUT defines could not be used in the first
commit in this series because the values were decreased in
commit d71023af4bec0 ("scsi: pm80xx: Do not busy wait in MPI init check").

Igor Pylypiv (2):
  scsi: pm80xx: Increase timeout for pm80xx mpi_uninit_check()
  scsi: pm80xx: Remove busy wait from mpi_uninit_check()

 drivers/scsi/pm8001/pm80xx_hwi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

-- 
2.31.1.295.g9ea45b61b8-goog

[PATCH v2 1/2] scsi: pm80xx: Increase timeout for pm80xx mpi_uninit_check()

[Igor Pylypiv]

The mpi_uninit_check() takes longer for inbound doorbell register to be
cleared. Increased the timeout substantially so that the driver does not
fail to load.

Previously, the inbound doorbell wait time was mistakenly increased in
the mpi_init_check() instead of the mpi_uninit_check(). It is okay to
leave the mpi_init_check() wait time as is as these are timeout values
and if there is a failure, waiting longer is not an issue.

Fixes: e90e236250e9 ("scsi: pm80xx: Increase timeout for pm80xx
mpi_uninit_check")
Reviewed-by: Vishakha Channapattan <vishakhavc@google.com>
Signed-off-by: Igor Pylypiv <ipylypiv@google.com>
---
 drivers/scsi/pm8001/pm80xx_hwi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index 84315560e8e1..c6b0834e3806 100644
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -1502,9 +1502,9 @@ static int mpi_uninit_check(struct pm8001_hba_info *pm8001_ha)
 
 	/* wait until Inbound DoorBell Clear Register toggled */
 	if (IS_SPCV_12G(pm8001_ha->pdev)) {
-		max_wait_count = 4 * 1000 * 1000;/* 4 sec */
+		max_wait_count = 30 * 1000 * 1000; /* 30 sec */
 	} else {
-		max_wait_count = 2 * 1000 * 1000;/* 2 sec */
+		max_wait_count = 15 * 1000 * 1000; /* 15 sec */
 	}
 	do {
 		udelay(1);
-- 
2.31.1.295.g9ea45b61b8-goog

[PATCH v2 2/2] scsi: pm80xx: Remove busy wait from mpi_uninit_check()

[Igor Pylypiv]

mpi_uninit_check() is not being called in an ATOMIC context.
The only caller of mpi_uninit_check() is pm80xx_chip_soft_rst().

Callers of pm80xx_chip_soft_rst():
 - pm8001_ioctl_soft_reset()
 - pm8001_pci_probe()
 - pm8001_pci_remove()
 - pm8001_pci_suspend()
 - pm8001_pci_resume()

There was a similar fix for mpi_init_check() in commit d71023af4bec0
("scsi: pm80xx: Do not busy wait in MPI init check").

Reviewed-by: Vishakha Channapattan <vishakhavc@google.com>
Signed-off-by: Igor Pylypiv <ipylypiv@google.com>
---
 drivers/scsi/pm8001/pm80xx_hwi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index c6b0834e3806..9fade2ed9396 100644
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -1502,12 +1502,12 @@ static int mpi_uninit_check(struct pm8001_hba_info *pm8001_ha)
 
 	/* wait until Inbound DoorBell Clear Register toggled */
 	if (IS_SPCV_12G(pm8001_ha->pdev)) {
-		max_wait_count = 30 * 1000 * 1000; /* 30 sec */
+		max_wait_count = SPCV_DOORBELL_CLEAR_TIMEOUT;
 	} else {
-		max_wait_count = 15 * 1000 * 1000; /* 15 sec */
+		max_wait_count = SPC_DOORBELL_CLEAR_TIMEOUT;
 	}
 	do {
-		udelay(1);
+		msleep(FW_READY_INTERVAL);
 		value = pm8001_cr32(pm8001_ha, 0, MSGU_IBDB_SET);
 		value &= SPCv_MSGU_CFG_TABLE_RESET;
 	} while ((value != 0) && (--max_wait_count));
@@ -1519,9 +1519,9 @@ static int mpi_uninit_check(struct pm8001_hba_info *pm8001_ha)
 
 	/* check the MPI-State for termination in progress */
 	/* wait until Inbound DoorBell Clear Register toggled */
-	max_wait_count = 2 * 1000 * 1000;	/* 2 sec for spcv/ve */
+	max_wait_count = 100; /* 2 sec for spcv/ve */
 	do {
-		udelay(1);
+		msleep(FW_READY_INTERVAL);
 		gst_len_mpistate =
 			pm8001_mr32(pm8001_ha->general_stat_tbl_addr,
 			GST_GSTLEN_MPIS_OFFSET);
-- 
2.31.1.295.g9ea45b61b8-goog

Re: [PATCH v2 0/2] pm80xx mpi_uninit_check() fixes

[Martin K. Petersen]

On Tue, 6 Apr 2021 11:05:32 -0700, Igor Pylypiv wrote:

> Changes from v1:
>  - Added missing semicolons
>  - Removed redundant parentheses
> 
> This patch series changes the wait time handling in mpi_uninit_check() to
> make it similar to mpi_init_check().
> 
> [...]

Applied to 5.13/scsi-queue, thanks!

[1/2] scsi: pm80xx: Increase timeout for pm80xx mpi_uninit_check()
      https://git.kernel.org/mkp/scsi/c/3f744a14f331
[2/2] scsi: pm80xx: Remove busy wait from mpi_uninit_check()
      https://git.kernel.org/mkp/scsi/c/6f305bf699fe

-- 
Martin K. Petersen	Oracle Linux Engineering