Skip to content

Commit d32533d

Browse files
Kiwoong Kimmartinkpetersen
authored andcommitted
scsi: ufs: core: Poll HCS.UCRDY before issuing a UIC command
With auto hibern8 enabled, UIC could be busy processing a hibern8 operation and the HCI would reports UIC not ready for a short while through HCS.UCRDY. The UFS driver doesn't currently handle this situation. The UFSHCI spec specifies UCRDY like this: whether the host controller is ready to process UIC COMMAND The 'ready' could be seen as many different meanings. If the meaning includes not processing any request from HCI, processing a hibern8 operation can be 'not ready'. In this situation, the driver needs to wait until the operations is completed. Signed-off-by: Kiwoong Kim <[email protected]> Link: https://lore.kernel.org/r/550484ffb66300bdcec63d3e304dfd55cb432f1f.1693790060.git.kwmad.kim@samsung.com Reviewed-by: Adrian Hunter <[email protected]> Reviewed-by: Chanwoo Lee <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 2d3f59c commit d32533d

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/ufs/core/ufshcd.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <linux/module.h>
2323
#include <linux/regulator/consumer.h>
2424
#include <linux/sched/clock.h>
25+
#include <linux/iopoll.h>
2526
#include <scsi/scsi_cmnd.h>
2627
#include <scsi/scsi_dbg.h>
2728
#include <scsi/scsi_driver.h>
@@ -2299,7 +2300,11 @@ static inline int ufshcd_hba_capabilities(struct ufs_hba *hba)
22992300
*/
23002301
static inline bool ufshcd_ready_for_uic_cmd(struct ufs_hba *hba)
23012302
{
2302-
return ufshcd_readl(hba, REG_CONTROLLER_STATUS) & UIC_COMMAND_READY;
2303+
u32 val;
2304+
int ret = read_poll_timeout(ufshcd_readl, val, val & UIC_COMMAND_READY,
2305+
500, UIC_CMD_TIMEOUT * 1000, false, hba,
2306+
REG_CONTROLLER_STATUS);
2307+
return ret == 0 ? true : false;
23032308
}
23042309

23052310
/**

0 commit comments

Comments
 (0)