Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45f61ca7 authored by Stanley Chu's avatar Stanley Chu Committed by Todd Kjos
Browse files

UPSTREAM: scsi: ufs-mediatek: Fix incorrect time to wait link status 

Fix incorrect calculation of "ms" based waiting time in function
ufs_mtk_setup_clocks().

Link: https://lore.kernel.org/r/20200809055702.20140-1-stanley.chu@mediatek.com


Fixes: 9006e3986f66 ("scsi: ufs-mediatek: Do not gate clocks if auto-hibern8 is not entered yet")
Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

Bug: 166747994
(cherry picked from commit 215d326702516366a8dfa9624b67ba0761c22b86)
Change-Id: I705ec82183efd898629e6a77952bc5e0c4fdceb1
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
parent 0c9580fc

drivers/scsi/ufs/ufs-mediatek.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ int ufs_mtk_wait_link_state(struct ufs_hba *hba, u32 state, 
	ktime_t timeout, time_checked;

	u32 val;



	timeout = ktime_add_us(ktime_get(), ms_to_ktime(max_wait_ms));

	timeout = ktime_add_ms(ktime_get(), max_wait_ms);

	do {

		time_checked = ktime_get();

		ufshcd_writel(hba, 0x20, REG_UFS_DEBUG_SEL);