From patchwork Wed Jan 20 10:04:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Can Guo X-Patchwork-Id: 12031847 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=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 3F93AC433DB for ; Wed, 20 Jan 2021 10:06:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D5DCE22227 for ; Wed, 20 Jan 2021 10:06:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5DCE22227 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=C6A1KmayPvFitNTDHIUzvTiQypHlW/2/qduc1xAIRTQ=; b=mAdJOEWVsHYjC5MP8ppJAAeHSE asjJg8td1WGN6Z8RUMlfPct/ma75f0DYn70x04e6xBaTmiQLHcGWd+d98sa6Ip2ajadvM8bfJ7IL2 /IgzKhvtHiJ9jBaSq0ZFMX0GGeRu9BhK0av+6yWTnwpjmhbRmlIGfLWwLV07W/SUxqYF73i1RIV0C k2qgiQEHcnp8tiQld9Mo/1juz80FWtrUJWkaHU+7b7MZEWwuU7rMZhukgPStJym4CNNn4ghj4AqC/ jr5r2ACdOtCi50eWKed/V0RTYMzzWtIGoyTMjIuf/cK/P993aR72HeR+NehewTPSvMlxhwkGBIHrf nkPIcrrg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2AMY-0006G9-Lh; Wed, 20 Jan 2021 10:05:18 +0000 Received: from labrats.qualcomm.com ([199.106.110.90]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2AMQ-0006EH-S8; Wed, 20 Jan 2021 10:05:12 +0000 IronPort-SDR: EbGbKVeIKXSlMEUYF/JLiVqv4VFBXgv1eIrzdW9r91PwqJxM2oZiiaxNtsh2cEIEVWX0Gb/qWu T1gQlRZYuIsR8AvTis08Oa9xhdPI7LUES+hp4YgTzB7z9T7lZZy4MmORp4hf6EfjVGagNhA0op bf6J9cbzvw+mnKbwYIbg6FhGLoRtHChNVcKdUcMDrNHjYdz0LP6xdavXI+7RjTok2nmnuzYmPK zgWgsfukK1T9GCIAyKPUYAaENYurn7/LkE7m5Gr65VyXoWSTjrxSOQUbz6n4C87A6swVwUplb9 Clc= X-IronPort-AV: E=Sophos;i="5.79,360,1602572400"; d="scan'208";a="47682880" Received: from unknown (HELO ironmsg01-sd.qualcomm.com) ([10.53.140.141]) by labrats.qualcomm.com with ESMTP; 20 Jan 2021 02:05:10 -0800 X-QCInternal: smtphost Received: from stor-presley.qualcomm.com ([192.168.140.85]) by ironmsg01-sd.qualcomm.com with ESMTP; 20 Jan 2021 02:05:10 -0800 Received: by stor-presley.qualcomm.com (Postfix, from userid 359480) id 6FCCD21941; Wed, 20 Jan 2021 02:05:10 -0800 (PST) From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, hongwus@codeaurora.org, linux-scsi@vger.kernel.org, kernel-team@android.com, cang@codeaurora.org Subject: [PATCH v11 3/3] scsi: ufs: Revert "Make sure clk scaling happens only when HBA is runtime ACTIVE" Date: Wed, 20 Jan 2021 02:04:23 -0800 Message-Id: <1611137065-14266-4-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1611137065-14266-1-git-send-email-cang@codeaurora.org> References: <1611137065-14266-1-git-send-email-cang@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_050511_126654_F870184D X-CRM114-Status: UNSURE ( 9.23 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Martin K. Petersen" , "James E.J. Bottomley" , open list , Avri Altman , "moderated list:ARM/Mediatek SoC support" , Alim Akhtar , Matthias Brugger , Stanley Chu , "moderated list:ARM/Mediatek SoC support" , Bean Huo MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 73cc291c27024 ("Make sure clk scaling happens only when HBA is runtime ACTIVE") is no longer needed since commit 8bd22d3c50e6f ("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 750cf0d..e2517d5 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1335,15 +1335,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"),