xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: ufs: Configure clock in .hce_enable_notify() in Cadence UFS

Browse Source 
Configure CDNS_UFS_REG_HCLKDIV in .hce_enable_notify() instead of
.setup_clock() because if UFSHCD resets the controller ip because of phy or
device related errors then CDNS_UFS_REG_HCLKDIV is reset to default value
and .setup_clock() is not called later in the sequence whereas
.hce_enable_notify will be called everytime controller is reenabled.

Signed-off-by: Anil Varughese <aniljoy@cadence.com>
Reviewed-by: Vignesh Raghavendra <vigneshr@ti.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Anil Varughese
2019-08-02 12:21:12 +01:00
committed by Martin K. Petersen
parent dccc96abfb
commit cb8b3359eb
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/scsi/ufs/cdns-pltfrm.c
View File

@@ -62,17 +62,16 @@ static int cdns_ufs_set_hclkdiv(struct ufs_hba *hba)
} }
/** /**
* Sets clocks used by the controller * Called before and after HCE enable bit is set.
* @hba: host controller instance * @hba: host controller instance
* @on: if true, enable clocks, otherwise disable
* @status: notify stage (pre, post change) * @status: notify stage (pre, post change)
* *
* Return zero for success and non-zero for failure * Return zero for success and non-zero for failure
*/ */
static int cdns_ufs_setup_clocks(struct ufs_hba *hba, bool on, static int cdns_ufs_hce_enable_notify(struct ufs_hba *hba,
enum ufs_notify_change_status status) enum ufs_notify_change_status status)
{ {
if ((!on) || (status == PRE_CHANGE)) if (status != PRE_CHANGE)
return 0; return 0;
return cdns_ufs_set_hclkdiv(hba); return cdns_ufs_set_hclkdiv(hba);
@@ -114,13 +113,13 @@ static int cdns_ufs_m31_16nm_phy_initialization(struct ufs_hba *hba)
static const struct ufs_hba_variant_ops cdns_ufs_pltfm_hba_vops = { static const struct ufs_hba_variant_ops cdns_ufs_pltfm_hba_vops = {
.name = "cdns-ufs-pltfm", .name = "cdns-ufs-pltfm",
.setup_clocks = cdns_ufs_setup_clocks, .hce_enable_notify = cdns_ufs_hce_enable_notify,
}; };
static const struct ufs_hba_variant_ops cdns_ufs_m31_16nm_pltfm_hba_vops = { static const struct ufs_hba_variant_ops cdns_ufs_m31_16nm_pltfm_hba_vops = {
.name = "cdns-ufs-pltfm", .name = "cdns-ufs-pltfm",
.init = cdns_ufs_init, .init = cdns_ufs_init,
.setup_clocks = cdns_ufs_setup_clocks, .hce_enable_notify = cdns_ufs_hce_enable_notify,
.phy_initialization = cdns_ufs_m31_16nm_phy_initialization, .phy_initialization = cdns_ufs_m31_16nm_phy_initialization,
}; };