Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp4008464pxb; Tue, 17 Nov 2020 09:01:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxE/uxsJWWs/z5un2otVxaUbd7Ai1CiYb+4jktVwfiqoqDAsCFFtKgSktJuDYAs6Zg9Qc8l X-Received: by 2002:a37:4a8e:: with SMTP id x136mr509969qka.434.1605632489451; Tue, 17 Nov 2020 09:01:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605632489; cv=none; d=google.com; s=arc-20160816; b=X8y/qLIEHyf6TtM9FEmBayP5Go33aAtDImI9/UbcFLGZSaIVbboJTonkVVNg5k9Egs RHuWl8t0NwNCfskHe4MMdXuJVmLofLAM91bSTkE5sfe58OIWtz0RKBNhs6DbTC42X/Xb ZxWOMb8Jp9X+CE6sfEzDFRQVBW0T4UbM44AZMc+/RdhXWZCY5+P7HWTiCDoIo5qssC+i 8lNrUBGxQZLVBov8luYCtd10HmTykxXnzJivWFIGy5z27MCX9jNZLfUHS7po37VTYZfU ilywE1qky5Bi2N4IL/3mK70c5e+cdvYRUG68xNX1knbLSsMdlqI8Zvs0saSLAQiq+pYv sUuQ== 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=Zf8TJFUZQcDX0u+iritEqxILPjAylFdH2V4bTr/wz5A=; b=mS+b26HwsmpDFSP1dfStKLNdUOkL24pdI4tCQUi/6vHTa4TTaO2hfjsD5BPvJGzhIo qtD7MLjAuBACob86xiBuFIqVIIalu+hfh1BYnGahFE1BQZJyqNYZ0T9z697hbIzBAqot yJT9YfQ4IQF5q+lto8Q3NnTa7UPhEfs59yGjG5VZ7EnvNEzYqayE0LGSwrd9K73zn+hm vzwF2srofA3h4N+FKe9y303B0Fui0WmZ3QSlmzALBarb7j6HlcTVWoKCrhmaNnkvdm/s Vy4pES17+tteU7qgJ510JroBGPJzS0/bbeNgyV8gYfqZAcYYfjbhnvLBlUS3vAwNJU6Z BHPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jtR7vRH4; 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 c15si1743004eja.406.2020.11.17.09.01.04; Tue, 17 Nov 2020 09:01:29 -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; dkim=pass header.i=@kernel.org header.s=default header.b=jtR7vRH4; 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 S1728424AbgKQQ64 (ORCPT + 99 others); Tue, 17 Nov 2020 11:58:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:43946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728330AbgKQQ6u (ORCPT ); Tue, 17 Nov 2020 11:58:50 -0500 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 8C33022447; Tue, 17 Nov 2020 16:58:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605632329; bh=yAU8UigFUw88QZ1cK7/dDlwcVKtoT1tyoU2mTufLqgs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jtR7vRH4O8UZA/nqzpgea2n/fnkpvHftarnSkM2inxhE/loeD2z3Y6XHxxSjUh1iH auWu+ALni3TJjwDsSZrOIpxHxed6VsQk7thQq0lsSpduQuZys8p3NobHcLEg/wmjaO +8WIorTC7SSZXJPfq82xGK0UGwbGOAMA2cO1aA1I= 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, martin.petersen@oracle.com, stanley.chu@mediatek.com, Jaegeuk Kim , Asutosh Das Subject: [PATCH v5 6/7] scsi: ufs: fix clkgating on/off correctly Date: Tue, 17 Nov 2020 08:58:38 -0800 Message-Id: <20201117165839.1643377-7-jaegeuk@kernel.org> X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog In-Reply-To: <20201117165839.1643377-1-jaegeuk@kernel.org> References: <20201117165839.1643377-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 Reviewed-by: Can Guo --- 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.2.299.gdc1121823c-goog