Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <7e8c58cf-64c1-8426-bf22-97d3df85ed38@acm.org>
Date:   Fri, 29 Jul 2022 13:11:59 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH v1] scsi: ufs: Fix ufshcd_scale_clks decision in recovery
 flow
Content-Language: en-US
To:     Stanley Chu <stanley.chu@mediatek.com>, linux-scsi@vger.kernel.org,
        linux-kernel@vger.kernel.org, martin.petersen@oracle.com,
        avri.altman@wdc.com, alim.akhtar@samsung.com, jejb@linux.ibm.com
Cc:     peter.wang@mediatek.com, chun-hung.wu@mediatek.com,
        alice.chao@mediatek.com, powen.kao@mediatek.com,
        mason.zhang@mediatek.com, qilin.tan@mediatek.com,
        lin.gui@mediatek.com, eddie.huang@mediatek.com,
        tun-yu.yu@mediatek.com, cc.chou@mediatek.com,
        chaotian.jing@mediatek.com, jiajie.hao@mediatek.com
References: <20220729075519.4665-1-stanley.chu@mediatek.com>
From:   Bart Van Assche <bvanassche@acm.org>
In-Reply-To: <20220729075519.4665-1-stanley.chu@mediatek.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 7/29/22 00:55, Stanley Chu wrote:
> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> index 581d88af07ab..dc57a7988023 100644
> --- a/drivers/ufs/core/ufshcd.c
> +++ b/drivers/ufs/core/ufshcd.c
> @@ -1574,8 +1574,6 @@ static ssize_t ufshcd_clkscale_enable_store(struct device *dev,
>   	ufshcd_rpm_get_sync(hba);
>   	ufshcd_hold(hba, false);
>   
> -	hba->clk_scaling.is_enabled = value;
> -
>   	if (value) {
>   		ufshcd_resume_clkscaling(hba);
>   	} else {
> @@ -1586,6 +1584,8 @@ static ssize_t ufshcd_clkscale_enable_store(struct device *dev,
>   					__func__, err);
>   	}
>   
> +	hba->clk_scaling.is_enabled = value;
> +
>   	ufshcd_release(hba);
>   	ufshcd_rpm_put_sync(hba);
>   out:
> @@ -7259,7 +7259,8 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba)
>   	hba->silence_err_logs = false;
>   
>   	/* scale up clocks to max frequency before full reinitialization */
> -	ufshcd_scale_clks(hba, true);
> +	if (ufshcd_is_clkscaling_supported(hba) && hba->clk_scaling.is_enabled)
> +		ufshcd_scale_clks(hba, true);
>   
>   	err = ufshcd_hba_enable(hba);

I see a race condition between the hba->clk_scaling.is_enabled check in 
ufshcd_host_reset_and_restore() and the code that sets 
ufshcd_clkscale_enable_store(). Shouldn't the code in 
ufshcd_host_reset_and_restore() that scales up the clocks be serialized 
against ufshcd_clkscale_enable_store()?

Thanks,

Bart.