Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp807581pxx; Tue, 27 Oct 2020 00:19:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3IqaQBHjnaLlnkhBG+Xsp044W4HyqzaJMaX9+vn5P6O0NUX9YM+XSvdv+0IuHxD7EI7NL X-Received: by 2002:a17:906:370e:: with SMTP id d14mr1084333ejc.259.1603783180366; Tue, 27 Oct 2020 00:19:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603783180; cv=none; d=google.com; s=arc-20160816; b=EAWJWOj9BRQjF+/nYLAdzIqjqumFeHwBA7sq2IQcKC/ggXxffyQ+sr4RjuRLUV9m+d TXGpP2FI4W2pEidZstchqyuwXmNvtjwD9g4VadTkwuD4yG1mi2oj0jkMC+QIbxssN1OT v5DcGvXNL52MyjVpNiwyUWHk99kBXs23KD7FWSMofaX3yfqR9Befbuw6X2myk0pJHhzE GYUD7r/ULLmYrWhADqgjiMAae3YvVJ9MAWk4GaS3X/hsCzxci2uWYXr9sNfW537qikLC 0lgBffdDCo5OxRbARDpoHCCTB4piPcF99+ZK20faXVMGwKGRKr3iHZKbfKl6BCr0pV/v 8z7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WCcEWnf28IFKzgrDgNESUXoXE0v6Jr3kb3TmRyyxyvk=; b=c2OE0LOGVQLVHY3aaYt1Swwh4z/J39AeRZbvd7rPPVDLNJZO6vBzoDefHniC/qpN34 ddBZtrSG9To0EjgJIsfyEFyu73TuCwLy86+mZhp3HGD825BZN42xpHImeoEqff3uG1ID 8q4Ar9cVquPCZZ0NI9AUIEGqKwQca/1b4gdJZBsQ/GVE1uP48Tilh9uKeiugtlA1uiyz kOF9kZD+FljPCnq1nw0+nJGkF+I/1LgaKHtDyo//1Lwy3/EHa0+u9v2iqR+vciVO8hVq NDOfJqH16Rpk9E5fvZ43K3Kmqb+8U7MRsTFpcmxEauJcIF5+qwew7GyYoihNoiHsk8Bf SWeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QalBONmO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga30si391513ejc.174.2020.10.27.00.19.18; Tue, 27 Oct 2020 00:19:40 -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; dkim=pass header.i=@kernel.org header.s=default header.b=QalBONmO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728949AbgJZTvg (ORCPT + 99 others); Mon, 26 Oct 2020 15:51:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:47680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728866AbgJZTve (ORCPT ); Mon, 26 Oct 2020 15:51:34 -0400 Received: from localhost (unknown [104.132.1.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D18F521655; Mon, 26 Oct 2020 19:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603741894; bh=xTNw6+WS4QruCfRu7I59YvY2zjaDS2nJzRs7S5LxRMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QalBONmOfrWvb1o7TEOiZjNdcDoj92PpWFnGLczmkdjyLvTc9jj7DcfPzUhph67Pe bStdx8VAiYQSLiwcZUktbSb4DIaLGQlnFS8MPJuqITsVqPut7vLfiru+VLk652KZAp 8wHq8K11i1xgRMxT8IwhTGaAHvhIFDI3tNlWNYkY= From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, kernel-team@android.com Cc: cang@codeaurora.org, alim.akhtar@samsung.com, avri.altman@wdc.com, bvanassche@acm.org, Jaegeuk Kim , Asutosh Das Subject: [PATCH v4 5/5] scsi: ufs: fix clkgating on/off correctly Date: Mon, 26 Oct 2020 12:51:24 -0700 Message-Id: <20201026195124.363096-6-jaegeuk@kernel.org> X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog In-Reply-To: <20201026195124.363096-1-jaegeuk@kernel.org> References: <20201026195124.363096-1-jaegeuk@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The below call stack prevents clk_gating at every IO completion. We can remove the condition, ufshcd_any_tag_in_use(), since clkgating_work will check it again. ufshcd_complete_requests(struct ufs_hba *hba) ufshcd_transfer_req_compl() __ufshcd_transfer_req_compl() __ufshcd_release(hba) if (ufshcd_any_tag_in_use() == 1) return; ufshcd_tmc_handler(hba); blk_mq_tagset_busy_iter(); Note that, this still requires a work to deal with a potential racy condition when user sets clkgating.delay_ms to very small value. That can cause preventing clkgating by the check of ufshcd_any_tag_in_use() in gate_work. Fixes: 7252a3603015 ("scsi: ufs: Avoid busy-waiting by eliminating tag conflicts") Signed-off-by: Jaegeuk Kim Reviewed-by: Asutosh Das --- drivers/scsi/ufs/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index b8a54d09e750..86c8dee01ca9 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1746,7 +1746,7 @@ static void __ufshcd_release(struct ufs_hba *hba) if (hba->clk_gating.active_reqs || hba->clk_gating.is_suspended || hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL || - ufshcd_any_tag_in_use(hba) || hba->outstanding_tasks || + hba->outstanding_tasks || hba->active_uic_cmd || hba->uic_async_done || hba->clk_gating.state == CLKS_OFF) return; -- 2.29.0.rc1.297.gfa9743e501-goog