From bb105230c43f4407e8311ad3115fbe0c7ab2d606 Mon Sep 17 00:00:00 2001 From: "Alice.Chao" Date: Fri, 28 May 2021 11:36:22 +0800 Subject: [PATCH] FROMGIT: scsi: ufs: ufs-mediatek: Disable HCI before HW reset MediaTek ufshci needs to be disabled before HW reset to avoid potential issues. Bug: 191731858 Change-Id: Ie8c9789ef05105923ca2039d38da3b1a1db0932d (cherry picked from commit f9c602f3bd9c79c06ccd7621744472a64e93fd49 git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next) Link: https://lore.kernel.org/r/20210528033624.12170-3-alice.chao@mediatek.com Reviewed-by: Stanley Chu Signed-off-by: Alice.Chao Signed-off-by: Martin K. Petersen Signed-off-by: Stanley Chu --- drivers/scsi/ufs/ufs-mediatek.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c index 082c88628499..26ffbdd7bac8 100644 --- a/drivers/scsi/ufs/ufs-mediatek.c +++ b/drivers/scsi/ufs/ufs-mediatek.c @@ -853,6 +853,9 @@ static int ufs_mtk_device_reset(struct ufs_hba *hba) { struct arm_smccc_res res; + /* disable hba before device reset */ + ufshcd_hba_stop(hba); + ufs_mtk_device_reset_ctrl(0, res); /*