Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp747429ybk; Wed, 20 May 2020 10:57:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBjXjjzsq6OLyq/BGTbKcpOCXZTNLcaj1OwnP2wcgYfzurSSfUPxdn2CRUyBb32iGKBoep X-Received: by 2002:aa7:c1c5:: with SMTP id d5mr4353337edp.183.1589997463562; Wed, 20 May 2020 10:57:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589997463; cv=none; d=google.com; s=arc-20160816; b=iqYEAQ/4fJj0xnSBLc3f5cLNaU/qlniefalQLHOyQqMRsTvb6bBETFep0LKRNTpOQz cSV1/Fdg+cyB8/zI1kX2R/fSPtLxoHEcEUpe9YZTQMIBwBnAsijtvM1FsfQJbcmt8mif nHHSxjolXDmxU790gX1LBQyx/1aJ5WEAJA7AioLkLecYu7KNp/4jf1H1w1Q1fR0n8nXh 84CFdcjPeO7lWgsGBeYGe7od6ViojpOnO7PVCDR6zYUqh/szW9FwQW1tpyq0UY5lwwgm OZGocJt1N3QWVXPLtwh8mg9FkaMbZUx036kmPco8QSC/aRgJSIP3yL/gyKEDA0wi/edB QvvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from; bh=kppyzhVneH9o6pDQUsYVgwFm/EM/XFksNLW04/SZ8Dg=; b=ZBborzkGoyuvT3quY4rxjRjhU6T6PE2KoY8Lr0Q9tE8k498dxBlQZUcmKAfOlygTGf aV8eac11R8w/tv+AFpBnHisyIJnf2Y7A1e8lbNnYvcmTfRX6G6uaLyvBqQMh9VMO5L8W IsExieYjtyiW0cfKM/pRtddBSWBrjds26S4yh61V/87l1oiVreZ8T/iJxeGjoS2BxwHO d7Z2rOjf1J9LQmtk1t2oJRz7VJyCRZqNK38ZkKPuZW5H8SixdL7sE5lsbX7L2g7dTxUx z7f+x0fuGc4HZY0ZEkmWWleSLSAggOdPAdO6UnzLqjBFm+/OXfH/gwurzELTxj9PEpDh vW+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a11si1943510edm.600.2020.05.20.10.57.21; Wed, 20 May 2020 10:57:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726944AbgETRxk (ORCPT + 99 others); Wed, 20 May 2020 13:53:40 -0400 Received: from alexa-out-sd-01.qualcomm.com ([199.106.114.38]:49198 "EHLO alexa-out-sd-01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726747AbgETRxj (ORCPT ); Wed, 20 May 2020 13:53:39 -0400 Received: from unknown (HELO ironmsg03-sd.qualcomm.com) ([10.53.140.143]) by alexa-out-sd-01.qualcomm.com with ESMTP; 20 May 2020 10:53:39 -0700 Received: from asutoshd-linux1.qualcomm.com ([10.46.160.39]) by ironmsg03-sd.qualcomm.com with ESMTP; 20 May 2020 10:53:38 -0700 Received: by asutoshd-linux1.qualcomm.com (Postfix, from userid 92687) id 779F120B90; Wed, 20 May 2020 10:53:38 -0700 (PDT) From: Asutosh Das To: cang@codeaurora.org, martin.petersen@oracle.com, PedroM.Sousa@synopsys.com, linux-scsi@vger.kernel.org Cc: Asutosh Das , linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 2/2] scsi: ufs-qcom: enter and exit hibern8 during clock scaling Date: Wed, 20 May 2020 10:53:17 -0700 Message-Id: <9b67c25eb7c0bf80075b36660aebdb3788207353.1589997078.git.asutoshd@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <186237103353b5a79c3496e619fca894dbc78600.1589997078.git.asutoshd@codeaurora.org> References: <186237103353b5a79c3496e619fca894dbc78600.1589997078.git.asutoshd@codeaurora.org> In-Reply-To: <186237103353b5a79c3496e619fca894dbc78600.1589997078.git.asutoshd@codeaurora.org> References: <186237103353b5a79c3496e619fca894dbc78600.1589997078.git.asutoshd@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Qualcomm controller needs to be in hibern8 before scaling clocks. This change puts the controller in hibern8 state before scaling and brings it out after scaling of clocks. Signed-off-by: Asutosh Das --- drivers/scsi/ufs/ufs-qcom.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index 00ce8d6..3a4ed64 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -1418,18 +1418,27 @@ static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba, int err = 0; if (status == PRE_CHANGE) { + err = ufshcd_uic_hibern8_enter(hba); + if (err) + return err; if (scale_up) err = ufs_qcom_clk_scale_up_pre_change(hba); else err = ufs_qcom_clk_scale_down_pre_change(hba); + if (err) + ufshcd_uic_hibern8_exit(hba); + } else { if (scale_up) err = ufs_qcom_clk_scale_up_post_change(hba); else err = ufs_qcom_clk_scale_down_post_change(hba); - if (err || !dev_req_params) + + if (err || !dev_req_params) { + ufshcd_uic_hibern8_exit(hba); goto out; + } ufs_qcom_cfg_timers(hba, dev_req_params->gear_rx, @@ -1437,6 +1446,7 @@ static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba, dev_req_params->hs_rate, false); ufs_qcom_update_bus_bw_vote(host); + err = ufshcd_uic_hibern8_exit(hba); } out: -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.