renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 01:34:00 +08:00
Code

scsi: ufs-qcom: Adjust bus bandwidth voting and unvoting

Browse Source 
The bus bandwidth voting is required to be done before the bus clocks are
enabled, and the unvoting is required to be done only after the bus clocks
are disabled.

Link: https://lore.kernel.org/r/1581392451-28743-4-git-send-email-cang@codeaurora.org
Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
Reviewed-by: Hongwu Su <hongwus@codeaurora.org>
Signed-off-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Can Guo 2020-02-10 19:40:46 -08:00 committed by Martin K. Petersen
parent 90d88f47e8
commit 8240dd97ce
1 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
drivers/scsi/ufs/ufs-qcom.c
View File

@ -38,7 +38,6 @@ enum {
static struct ufs_qcom_host *ufs_qcom_hosts[MAX_UFS_QCOM_HOSTS]; static struct ufs_qcom_host *ufs_qcom_hosts[MAX_UFS_QCOM_HOSTS];
static int ufs_qcom_set_bus_vote(struct ufs_qcom_host *host, int vote);
static void ufs_qcom_get_default_testbus_cfg(struct ufs_qcom_host *host); static void ufs_qcom_get_default_testbus_cfg(struct ufs_qcom_host *host);
static int ufs_qcom_set_dme_vs_core_clk_ctrl_clear_div(struct ufs_hba *hba, static int ufs_qcom_set_dme_vs_core_clk_ctrl_clear_div(struct ufs_hba *hba,
u32 clk_cycles); u32 clk_cycles);
@ -672,7 +671,7 @@ static void ufs_qcom_get_speed_mode(struct ufs_pa_layer_attr *p, char *result)
} }
} }
static int ufs_qcom_set_bus_vote(struct ufs_qcom_host *host, int vote) static int __ufs_qcom_set_bus_vote(struct ufs_qcom_host *host, int vote)
{ {
int err = 0; int err = 0;
@ -703,7 +702,7 @@ static int ufs_qcom_update_bus_bw_vote(struct ufs_qcom_host *host)
vote = ufs_qcom_get_bus_vote(host, mode); vote = ufs_qcom_get_bus_vote(host, mode);
if (vote >= 0) if (vote >= 0)
err = ufs_qcom_set_bus_vote(host, vote); err = __ufs_qcom_set_bus_vote(host, vote);
else else
err = vote; err = vote;
@ -714,6 +713,35 @@ static int ufs_qcom_update_bus_bw_vote(struct ufs_qcom_host *host)
return err; return err;
} }
static int ufs_qcom_set_bus_vote(struct ufs_hba *hba, bool on)
{
struct ufs_qcom_host *host = ufshcd_get_variant(hba);
int vote, err;
/*
* In case ufs_qcom_init() is not yet done, simply ignore.
* This ufs_qcom_set_bus_vote() shall be called from
* ufs_qcom_init() after init is done.
*/
if (!host)
return 0;
if (on) {
vote = host->bus_vote.saved_vote;
if (vote == host->bus_vote.min_bw_vote)
ufs_qcom_update_bus_bw_vote(host);
} else {
vote = host->bus_vote.min_bw_vote;
}
err = __ufs_qcom_set_bus_vote(host, vote);
if (err)
dev_err(hba->dev, "%s: set bus vote failed %d\n",
__func__, err);
return err;
}
static ssize_t static ssize_t
show_ufs_to_mem_max_bus_bw(struct device *dev, struct device_attribute *attr, show_ufs_to_mem_max_bus_bw(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
@ -790,7 +818,7 @@ static int ufs_qcom_update_bus_bw_vote(struct ufs_qcom_host *host)
return 0; return 0;
} }
static int ufs_qcom_set_bus_vote(struct ufs_qcom_host *host, int vote) static int ufs_qcom_set_bus_vote(struct ufs_hba *host, bool on)
{ {
return 0; return 0;
} }
@ -1042,8 +1070,7 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on,
enum ufs_notify_change_status status) enum ufs_notify_change_status status)
{ {
struct ufs_qcom_host *host = ufshcd_get_variant(hba); struct ufs_qcom_host *host = ufshcd_get_variant(hba);
int err; int err = 0;
int vote = 0;
/* /*
* In case ufs_qcom_init() is not yet done, simply ignore. * In case ufs_qcom_init() is not yet done, simply ignore.
@ -1053,28 +1080,28 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on,
if (!host) if (!host)
return 0; return 0;
if (on && (status == POST_CHANGE)) { switch (status) {
/* enable the device ref clock for HS mode*/ case PRE_CHANGE:
if (ufshcd_is_hs_mode(&hba->pwr_info)) if (on) {
ufs_qcom_dev_ref_clk_ctrl(host, true); err = ufs_qcom_set_bus_vote(hba, true);
vote = host->bus_vote.saved_vote; } else {
if (vote == host->bus_vote.min_bw_vote) if (!ufs_qcom_is_link_active(hba)) {
ufs_qcom_update_bus_bw_vote(host); /* disable device ref_clk */
ufs_qcom_dev_ref_clk_ctrl(host, false);
} else if (!on && (status == PRE_CHANGE)) { }
if (!ufs_qcom_is_link_active(hba)) {
/* disable device ref_clk */
ufs_qcom_dev_ref_clk_ctrl(host, false);
} }
break;
vote = host->bus_vote.min_bw_vote; case POST_CHANGE:
if (on) {
/* enable the device ref clock for HS mode*/
if (ufshcd_is_hs_mode(&hba->pwr_info))
ufs_qcom_dev_ref_clk_ctrl(host, true);
} else {
err = ufs_qcom_set_bus_vote(hba, false);
}
break;
} }
err = ufs_qcom_set_bus_vote(host, vote);
if (err)
dev_err(hba->dev, "%s: set bus vote failed %d\n",
__func__, err);
return err; return err;
} }
@ -1250,6 +1277,7 @@ static int ufs_qcom_init(struct ufs_hba *hba)
ufs_qcom_set_caps(hba); ufs_qcom_set_caps(hba);
ufs_qcom_advertise_quirks(hba); ufs_qcom_advertise_quirks(hba);
ufs_qcom_set_bus_vote(hba, true);
ufs_qcom_setup_clocks(hba, true, POST_CHANGE); ufs_qcom_setup_clocks(hba, true, POST_CHANGE);
if (hba->dev->id < MAX_UFS_QCOM_HOSTS) if (hba->dev->id < MAX_UFS_QCOM_HOSTS)