From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA187C352A4 for ; Tue, 11 Feb 2020 03:13:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC5BD20838 for ; Tue, 11 Feb 2020 03:13:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="bDgHpH2x" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727600AbgBKDNO (ORCPT ); Mon, 10 Feb 2020 22:13:14 -0500 Received: from mail25.static.mailgun.info ([104.130.122.25]:57483 "EHLO mail25.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727922AbgBKDNM (ORCPT ); Mon, 10 Feb 2020 22:13:12 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1581390791; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=AND7XwSXzJGt8CrcLQOdPfGVMrVlOvO3/HajyxYZp6I=; b=bDgHpH2xF7Fp6ijF4t42oIkaWfPSDJNxR00dzB++omDuN3zMAZauO171v14O1q4FcdYR9rbc SMne1gSIpQ5xNJP9ZbGyNIIUWW6Yqib6sPR+3wvHbLsfQ/lQ09IYCZQmCy7Ro5FDtO+gVtZA 1U/3pSiqxyAQLxsKcAL/zKDsn4w= X-Mailgun-Sending-Ip: 104.130.122.25 X-Mailgun-Sid: WyI1MzIzYiIsICJsaW51eC1hcm0tbXNtQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e421bc3.7f0b932d31f0-smtp-out-n02; Tue, 11 Feb 2020 03:13:07 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 9B5D0C4479C; Tue, 11 Feb 2020 03:13:06 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: cang) by smtp.codeaurora.org (Postfix) with ESMTPSA id 756AEC43383; Tue, 11 Feb 2020 03:13:05 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 11 Feb 2020 11:13:05 +0800 From: Can Guo To: hongwus@codeaurora.org Cc: asutoshd@codeaurora.org, nguyenb@codeaurora.org, rnayak@codeaurora.org, linux-scsi@vger.kernel.org, kernel-team@android.com, saravanak@google.com, salyzyn@google.com, Andy Gross , Bjorn Andersson , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v9 3/7] scsi: ufs-qcom: Adjust bus bandwidth voting and unvoting In-Reply-To: References: <1581388671-18078-1-git-send-email-cang@codeaurora.org> <1581388671-18078-4-git-send-email-cang@codeaurora.org> Message-ID: X-Sender: cang@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2020-02-11 11:09, hongwus@codeaurora.org wrote: > Hi Can, > > > On 2020-02-11 10:37, Can Guo wrote: >> 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. >> >> Signed-off-by: Can Guo >> Reviewed-by: Asutosh Das >> --- >> drivers/scsi/ufs/ufs-qcom.c | 78 >> ++++++++++++++++++++++++++++++--------------- >> 1 file changed, 53 insertions(+), 25 deletions(-) >> >> diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c >> index c69c29a1c..ded08fb 100644 >> --- a/drivers/scsi/ufs/ufs-qcom.c >> +++ b/drivers/scsi/ufs/ufs-qcom.c >> @@ -38,7 +38,6 @@ enum { >> >> 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 int ufs_qcom_set_dme_vs_core_clk_ctrl_clear_div(struct ufs_hba >> *hba, >> u32 clk_cycles); >> @@ -674,7 +673,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; >> >> @@ -705,7 +704,7 @@ static int ufs_qcom_update_bus_bw_vote(struct >> ufs_qcom_host *host) >> >> vote = ufs_qcom_get_bus_vote(host, mode); >> if (vote >= 0) >> - err = ufs_qcom_set_bus_vote(host, vote); >> + err = __ufs_qcom_set_bus_vote(host, vote); >> else >> err = vote; >> >> @@ -716,6 +715,35 @@ static int ufs_qcom_update_bus_bw_vote(struct >> ufs_qcom_host *host) >> 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 >> show_ufs_to_mem_max_bus_bw(struct device *dev, struct >> device_attribute *attr, >> char *buf) >> @@ -792,7 +820,7 @@ static int ufs_qcom_update_bus_bw_vote(struct >> ufs_qcom_host *host) >> 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; >> } >> @@ -1030,8 +1058,7 @@ static int ufs_qcom_setup_clocks(struct ufs_hba >> *hba, bool on, >> enum ufs_notify_change_status status) >> { >> struct ufs_qcom_host *host = ufshcd_get_variant(hba); >> - int err; >> - int vote = 0; >> + int err = 0; >> >> /* >> * In case ufs_qcom_init() is not yet done, simply ignore. >> @@ -1041,28 +1068,28 @@ static int ufs_qcom_setup_clocks(struct >> ufs_hba *hba, bool on, >> if (!host) >> return 0; >> >> - if (on && (status == POST_CHANGE)) { >> - /* enable the device ref clock for HS mode*/ >> - if (ufshcd_is_hs_mode(&hba->pwr_info)) >> - ufs_qcom_dev_ref_clk_ctrl(host, true); >> - vote = host->bus_vote.saved_vote; >> - if (vote == host->bus_vote.min_bw_vote) >> - ufs_qcom_update_bus_bw_vote(host); >> - >> - } 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); >> + switch(status) { >> + case PRE_CHANGE: >> + if (on) { >> + err = ufs_qcom_set_bus_vote(hba, true); >> + } else { >> + if (!ufs_qcom_is_link_active(hba)) { >> + /* disable device ref_clk */ >> + ufs_qcom_dev_ref_clk_ctrl(host, false); >> + } >> } >> - >> - vote = host->bus_vote.min_bw_vote; >> + break; >> + 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; >> } >> >> @@ -1238,6 +1265,7 @@ static int ufs_qcom_init(struct ufs_hba *hba) >> ufs_qcom_set_caps(hba); >> ufs_qcom_advertise_quirks(hba); >> >> + ufs_qcom_set_bus_vote(hba, true); >> ufs_qcom_setup_clocks(hba, true, POST_CHANGE); >> >> if (hba->dev->id < MAX_UFS_QCOM_HOSTS) > > > Please add space after switch. > + switch(status) { > + case PRE_CHANGE > > > Reviewed-by: Hongwu Su Thanks. Can Guo.