Skip to content

Commit

Permalink
scsi: pm80xx: Avoid busywait in FW ready check
Browse files Browse the repository at this point in the history
In function check_fw_ready() we busy wait using udelay. The CPU is not
released and we see need_resched failures.

Busy waiting is not necessary since we are in process context and we can
sleep instead. Replace udelay with msleep of 20 ms intervals while waiting
for firmware to become ready.

It has been verified that check_fw_ready is not being used in interrupt
context anywhere, hence it is safe to make this change.

Link: https://lore.kernel.org/r/20201102165528.26510-4-Viswas.G@microchip.com.com
Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: akshatzen <akshatzen@google.com>
Signed-off-by: Viswas G <Viswas.G@microchip.com>
Signed-off-by: Ruksar Devadi <Ruksar.devadi@microchip.com>
Signed-off-by: Radha Ramachandran <radha@google.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  • Loading branch information
akshatzen authored and Martin K. Petersen committed Nov 5, 2020
1 parent 4a2efd4 commit 48cd6b3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
21 changes: 11 additions & 10 deletions drivers/scsi/pm8001/pm80xx_hwi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1042,6 +1042,7 @@ static int mpi_init_check(struct pm8001_hba_info *pm8001_ha)

/**
* check_fw_ready - The LLDD check if the FW is ready, if not, return error.
* This function sleeps hence it must not be used in atomic context.
* @pm8001_ha: our hba card information
*/
static int check_fw_ready(struct pm8001_hba_info *pm8001_ha)
Expand All @@ -1052,16 +1053,16 @@ static int check_fw_ready(struct pm8001_hba_info *pm8001_ha)
int ret = 0;

/* reset / PCIe ready */
max_wait_time = max_wait_count = 100 * 1000; /* 100 milli sec */
max_wait_time = max_wait_count = 5; /* 100 milli sec */
do {
udelay(1);
msleep(FW_READY_INTERVAL);
value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
} while ((value == 0xFFFFFFFF) && (--max_wait_count));

/* check ila status */
max_wait_time = max_wait_count = 1000 * 1000; /* 1000 milli sec */
max_wait_time = max_wait_count = 50; /* 1000 milli sec */
do {
udelay(1);
msleep(FW_READY_INTERVAL);
value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
} while (((value & SCRATCH_PAD_ILA_READY) !=
SCRATCH_PAD_ILA_READY) && (--max_wait_count));
Expand All @@ -1074,9 +1075,9 @@ static int check_fw_ready(struct pm8001_hba_info *pm8001_ha)
}

/* check RAAE status */
max_wait_time = max_wait_count = 1800 * 1000; /* 1800 milli sec */
max_wait_time = max_wait_count = 90; /* 1800 milli sec */
do {
udelay(1);
msleep(FW_READY_INTERVAL);
value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
} while (((value & SCRATCH_PAD_RAAE_READY) !=
SCRATCH_PAD_RAAE_READY) && (--max_wait_count));
Expand All @@ -1089,9 +1090,9 @@ static int check_fw_ready(struct pm8001_hba_info *pm8001_ha)
}

/* check iop0 status */
max_wait_time = max_wait_count = 600 * 1000; /* 600 milli sec */
max_wait_time = max_wait_count = 30; /* 600 milli sec */
do {
udelay(1);
msleep(FW_READY_INTERVAL);
value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
} while (((value & SCRATCH_PAD_IOP0_READY) != SCRATCH_PAD_IOP0_READY) &&
(--max_wait_count));
Expand All @@ -1107,9 +1108,9 @@ static int check_fw_ready(struct pm8001_hba_info *pm8001_ha)
if ((pm8001_ha->chip_id != chip_8008) &&
(pm8001_ha->chip_id != chip_8009)) {
/* 200 milli sec */
max_wait_time = max_wait_count = 200 * 1000;
max_wait_time = max_wait_count = 10;
do {
udelay(1);
msleep(FW_READY_INTERVAL);
value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
} while (((value & SCRATCH_PAD_IOP1_READY) !=
SCRATCH_PAD_IOP1_READY) && (--max_wait_count));
Expand Down
6 changes: 6 additions & 0 deletions drivers/scsi/pm8001/pm80xx_hwi.h
Original file line number Diff line number Diff line change
Expand Up @@ -1639,3 +1639,9 @@ typedef struct SASProtocolTimerConfig SASProtocolTimerConfig_t;

#define MEMBASE_II_SHIFT_REGISTER 0x1010
#endif

/**
* As we know sleep (1~20) ms may result in sleep longer than ~20 ms, hence we
* choose 20 ms interval.
*/
#define FW_READY_INTERVAL 20

0 comments on commit 48cd6b3

Please sign in to comment.