From patchwork Tue Oct 20 19:52:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaegeuk Kim X-Patchwork-Id: 11847825 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0CF1314B4 for ; Tue, 20 Oct 2020 19:53:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E41DB2225F for ; Tue, 20 Oct 2020 19:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603223605; bh=I/5zhu7CSgLKe64X3gIBe6yKmHH9Ni835TIlNbPmgm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C97+3KdGzva0Tktd4/wu7U1frLao2vh0c0HfeJI81VECzFLQg6k2hBDB9AFxYOA73 dnT16hhIa3NWQBK4LSTbL893b5oaKslTFTZJ/Up7lSq3LMEHoqPhPLRFFNjVKqSUgH uzIYq/ttPvU+PiFw4keg3lgEJZhfOs/fPHgRH418= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438403AbgJTTxH (ORCPT ); Tue, 20 Oct 2020 15:53:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:48138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391578AbgJTTxG (ORCPT ); Tue, 20 Oct 2020 15:53:06 -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 C575E2225F; Tue, 20 Oct 2020 19:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603223585; bh=I/5zhu7CSgLKe64X3gIBe6yKmHH9Ni835TIlNbPmgm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RcTyxC3z0QxItcmA47VNebgBdPPTru1IIklYsa1cErNv18+CgXBI6XATtRSIPt4CD sLnvqGfS0JvPfQPkWXajzUZGCOzp6lwrtFJJLA+9Lpx64Ki4fTG7AEfTOtwHv7q78n 3dFGMwI8oEvdtoh0K2sUIZHgT3DlicSfO3lqgFgo= From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Jaegeuk Kim , Alim Akhtar , Avri Altman , Can Guo Subject: [PATCH v2 1/5] scsi: ufs: atomic update for clkgating_enable Date: Tue, 20 Oct 2020 12:52:54 -0700 Message-Id: <20201020195258.2005605-2-jaegeuk@kernel.org> X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog In-Reply-To: <20201020195258.2005605-1-jaegeuk@kernel.org> References: <20201020195258.2005605-1-jaegeuk@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Jaegeuk Kim When giving a stress test which enables/disables clkgating, we hit device timeout sometimes. This patch avoids subtle racy condition to address it. Cc: Alim Akhtar Cc: Avri Altman Cc: Can Guo Signed-off-by: Jaegeuk Kim Reviewed-by: Can Guo --- drivers/scsi/ufs/ufshcd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index b8f573a02713..7344353a9167 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1807,19 +1807,19 @@ static ssize_t ufshcd_clkgate_enable_store(struct device *dev, return -EINVAL; value = !!value; + + spin_lock_irqsave(hba->host->host_lock, flags); if (value == hba->clk_gating.is_enabled) goto out; - if (value) { - ufshcd_release(hba); - } else { - spin_lock_irqsave(hba->host->host_lock, flags); + if (value) + __ufshcd_release(hba); + else hba->clk_gating.active_reqs++; - spin_unlock_irqrestore(hba->host->host_lock, flags); - } hba->clk_gating.is_enabled = value; out: + spin_unlock_irqrestore(hba->host->host_lock, flags); return count; }