Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3315758pxu; Sat, 19 Dec 2020 21:45:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxqwUmGvdapOudQmuCzdut9rmfRXgB2cZPyX4uumDVbfteSQ17AOSoLlhRQ/KQ1faZHe6t1 X-Received: by 2002:a17:906:c45a:: with SMTP id ck26mr10815858ejb.200.1608443132480; Sat, 19 Dec 2020 21:45:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608443132; cv=none; d=google.com; s=arc-20160816; b=qLOk+e4K5QaGA1/GwDJqNaZOC50UqZRswx7mqBt8Z9HHu9aQZqP+USo12cRpCp3URL uAtNixaMnZY9r3OIj+Os+r/zbT8ccvFcF9Ps7CGbXoRmAl+lZWRc5kh+VwGg2wflEb2+ vRxYcW70KC+69w0iFsow8Lay00Y+B6iS/mO1x8wstxYwfVSvCThy0Etgk+dUWLHvsgPY RSYX8xjoJWzwhiTickJ3nqJQ5hYz5hda05lA531zOFQT5J1trCTAN0Mq7/tzL4j4bDl1 0bGrXu0DF/+GfDYVGLwLafPkxDI0usPG6i8//e2I6Z1aA2Hyz/kWao64UVOMkO8YtaIr jdlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:ironport-sdr; bh=xOZD/3fjGSNQMnjxPJftqNfRLfYgW/Eezst1fed0vDw=; b=fv2aCYGRenXgEZjdbVLoB5Nap7VxjKiM2yOZUbFIPDl426zwi8dgDRk3+0GAksESIE IR4e3of9YyYDoxfLgt4H19J611R9rd+wrCC/fN6NWVx6x+1U0rssF4JcGSbM5b4DiUAe wJ7UJYQkUR1XpqKKKqhUyr/aJMMEbRqMg7EkPGuuLT79Ty3UcTb4SdG4AyPeL64mNYcw n6be4PC78indNAWT8E7JQ1wkyClI2vh2KS2BcCjAt5mzP1IyiMjEBmcyV6Jtijfg72fL OSUSRVU5C/0OG3s5qFC6TQSnYqjU6zgtVWjbUdQgWENkVPkgIfeU3fS/kxsJozzKT0nG xmmA== 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 eb5si9683738edb.393.2020.12.19.21.45.09; Sat, 19 Dec 2020 21:45:32 -0800 (PST) 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 S1727041AbgLTFnq (ORCPT + 99 others); Sun, 20 Dec 2020 00:43:46 -0500 Received: from labrats.qualcomm.com ([199.106.110.90]:23395 "EHLO labrats.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726099AbgLTFnq (ORCPT ); Sun, 20 Dec 2020 00:43:46 -0500 IronPort-SDR: RCN3T0Uid7HhfOQilNLdImPJtMoutoSW4oODCDaA5dqXhd0Tz4MrYGo7jkjVNMakN7bfiij6xk LbxmgqkqKOivwQUCiHtyIIN/QmInTYGuM9SuwLTww42V5WaGPOVW2/jtEkJ6ukbXnXOYC1KEDP EYbfDMIsu/WHPWmnpK8nEbyMIX4vyCzZdpVYKMSb2LxV2rxiTCo3RZERiR/7NtlkbxYLH3DK4v 6B8jmu23ViY2FrcS+Kf6O4MjJT6HW7scwx+0Tl/yyEivgMFROS4Ij9Gsl8TqbmWZdmFxWNHEVy jDo= X-IronPort-AV: E=Sophos;i="5.78,434,1599548400"; d="scan'208";a="47599281" Received: from unknown (HELO ironmsg04-sd.qualcomm.com) ([10.53.140.144]) by labrats.qualcomm.com with ESMTP; 19 Dec 2020 21:43:06 -0800 X-QCInternal: smtphost Received: from stor-presley.qualcomm.com ([192.168.140.85]) by ironmsg04-sd.qualcomm.com with ESMTP; 19 Dec 2020 21:43:05 -0800 Received: by stor-presley.qualcomm.com (Postfix, from userid 359480) id 1FB79212A8; Sat, 19 Dec 2020 21:43:05 -0800 (PST) From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, hongwus@codeaurora.org, rnayak@codeaurora.org, linux-scsi@vger.kernel.org, kernel-team@android.com, saravanak@google.com, salyzyn@google.com, cang@codeaurora.org Cc: Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , Matthias Brugger , Stanley Chu , Bean Huo , Bart Van Assche , linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support) Subject: [PATCH v6 3/3] scsi: ufs: Revert "Make sure clk scaling happens only when HBA is runtime ACTIVE" Date: Sat, 19 Dec 2020 21:42:47 -0800 Message-Id: <1608442968-38560-4-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1608442968-38560-1-git-send-email-cang@codeaurora.org> References: <1608442968-38560-1-git-send-email-cang@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 73cc291c27024 ("Make sure clk scaling happens only when HBA is runtime ACTIVE") is no longer needed since commit f7a42540928a8 ("scsi: ufs: Protect some contexts from unexpected clock scaling") is a more mature fix to protect UFS LLD stability from clock scaling invoked through sysfs nodes by users. Reviewed-by: Stanley Chu Signed-off-by: Can Guo --- drivers/scsi/ufs/ufshcd.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 2dee21e..7229a1b 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1300,15 +1300,8 @@ static int ufshcd_devfreq_target(struct device *dev, } spin_unlock_irqrestore(hba->host->host_lock, irq_flags); - pm_runtime_get_noresume(hba->dev); - if (!pm_runtime_active(hba->dev)) { - pm_runtime_put_noidle(hba->dev); - ret = -EAGAIN; - goto out; - } start = ktime_get(); ret = ufshcd_devfreq_scale(hba, scale_up); - pm_runtime_put(hba->dev); trace_ufshcd_profile_clk_scaling(dev_name(hba->dev), (scale_up ? "up" : "down"), -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.