| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 11 Jun 2021 08:53:46 +0800
From: Can Guo <cang@...eaurora.org>
To: Adrian Hunter <adrian.hunter@...el.com>
Cc: asutoshd@...eaurora.org, nguyenb@...eaurora.org,
hongwus@...eaurora.org, ziqichen@...eaurora.org,
linux-scsi@...r.kernel.org, kernel-team@...roid.com,
Alim Akhtar <alim.akhtar@...sung.com>,
Avri Altman <avri.altman@....com>,
"James E.J. Bottomley" <jejb@...ux.ibm.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
Stanley Chu <stanley.chu@...iatek.com>,
Bean Huo <beanhuo@...ron.com>,
Jaegeuk Kim <jaegeuk@...nel.org>,
Kiwoong Kim <kwmad.kim@...sung.com>,
Satya Tangirala <satyat@...gle.com>,
Bart Van Assche <bvanassche@....org>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3 1/9] scsi: ufs: Differentiate status between hba pm ops
and wl pm ops
Hi Adrian,
On 2021-06-10 19:15, Adrian Hunter wrote:
> On 10/06/21 7:43 am, Can Guo wrote:
>> Put pm_op_in_progress and is_sys_suspend flags back to ufshcd hba pm
>> ops,
>> add two new flags, namely wl_pm_op_in_progress and
>> is_wl_sys_suspended, to
>> track the UFS device W-LU pm ops. This helps us differentiate the
>> status of
>> hba and wl pm ops when we need to do troubleshooting.
>
> Really you have 2 changes here:
> 1. Renaming to pm_op_in_progress / is_sys_suspend to
> wl_pm_op_in_progress / is_wl_sys_suspended
> 2. Introducing flags for the status of hba
>
> So it should really be 2 patches.
Sure I will make it 2 in next version.
>
> That would show up things like:
> - did you intend not to change hba->is_sys_suspended in
> ufs_qcom_resume() ?
I missed it - shall change it in next version.
Thanks,
Can Guo.
>
>>
>> Signed-off-by: Can Guo <cang@...eaurora.org>
>> ---
>> drivers/scsi/ufs/ufshcd.c | 42
>> ++++++++++++++++++++++++++++--------------
>> drivers/scsi/ufs/ufshcd.h | 4 +++-
>> 2 files changed, 31 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
>> index 25fe18a..47b2a9a 100644
>> --- a/drivers/scsi/ufs/ufshcd.c
>> +++ b/drivers/scsi/ufs/ufshcd.c
>> @@ -549,7 +549,9 @@ static void ufshcd_print_host_state(struct ufs_hba
>> *hba)
>> hba->saved_err, hba->saved_uic_err);
>> dev_err(hba->dev, "Device power mode=%d, UIC link state=%d\n",
>> hba->curr_dev_pwr_mode, hba->uic_link_state);
>> - dev_err(hba->dev, "PM in progress=%d, sys. suspended=%d\n",
>> + dev_err(hba->dev, "wl_pm_op_in_progress=%d,
>> is_wl_sys_suspended=%d\n",
>> + hba->wl_pm_op_in_progress, hba->is_wl_sys_suspended);
>> + dev_err(hba->dev, "pm_op_in_progress=%d, is_sys_suspended=%d\n",
>> hba->pm_op_in_progress, hba->is_sys_suspended);
>> dev_err(hba->dev, "Auto BKOPS=%d, Host self-block=%d\n",
>> hba->auto_bkops_enabled, hba->host->host_self_blocked);
>> @@ -1999,7 +2001,7 @@ static void ufshcd_clk_scaling_start_busy(struct
>> ufs_hba *hba)
>> if (!hba->clk_scaling.active_reqs++)
>> queue_resume_work = true;
>>
>> - if (!hba->clk_scaling.is_enabled || hba->pm_op_in_progress) {
>> + if (!hba->clk_scaling.is_enabled || hba->wl_pm_op_in_progress) {
>> spin_unlock_irqrestore(hba->host->host_lock, flags);
>> return;
>> }
>> @@ -2734,7 +2736,7 @@ static int ufshcd_queuecommand(struct Scsi_Host
>> *host, struct scsi_cmnd *cmd)
>> * err handler blocked for too long. So, just fail the scsi cmd
>> * sent from PM ops, err handler can recover PM error anyways.
>> */
>> - if (hba->pm_op_in_progress) {
>> + if (hba->wl_pm_op_in_progress) {
>> hba->force_reset = true;
>> set_host_byte(cmd, DID_BAD_TARGET);
>> cmd->scsi_done(cmd);
>> @@ -2767,7 +2769,7 @@ static int ufshcd_queuecommand(struct Scsi_Host
>> *host, struct scsi_cmnd *cmd)
>> (hba->clk_gating.state != CLKS_ON));
>>
>> if (unlikely(test_bit(tag, &hba->outstanding_reqs))) {
>> - if (hba->pm_op_in_progress)
>> + if (hba->wl_pm_op_in_progress)
>> set_host_byte(cmd, DID_BAD_TARGET);
>> else
>> err = SCSI_MLQUEUE_HOST_BUSY;
>> @@ -5116,7 +5118,7 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba,
>> struct ufshcd_lrb *lrbp)
>> * solution could be to abort the system suspend if
>> * UFS device needs urgent BKOPs.
>> */
>> - if (!hba->pm_op_in_progress &&
>> + if (!hba->wl_pm_op_in_progress &&
>> !ufshcd_eh_in_progress(hba) &&
>> ufshcd_is_exception_event(lrbp->ucd_rsp_ptr))
>> /* Flushed in suspend */
>> @@ -5916,7 +5918,7 @@ static void ufshcd_err_handling_prepare(struct
>> ufs_hba *hba)
>> {
>> ufshcd_rpm_get_sync(hba);
>> if (pm_runtime_status_suspended(&hba->sdev_ufs_device->sdev_gendev)
>> ||
>> - hba->is_sys_suspended) {
>> + hba->is_wl_sys_suspended) {
>> enum ufs_pm_op pm_op;
>>
>> /*
>> @@ -5933,7 +5935,7 @@ static void ufshcd_err_handling_prepare(struct
>> ufs_hba *hba)
>> if (!ufshcd_is_clkgating_allowed(hba))
>> ufshcd_setup_clocks(hba, true);
>> ufshcd_release(hba);
>> - pm_op = hba->is_sys_suspended ? UFS_SYSTEM_PM : UFS_RUNTIME_PM;
>> + pm_op = hba->is_wl_sys_suspended ? UFS_SYSTEM_PM : UFS_RUNTIME_PM;
>> ufshcd_vops_resume(hba, pm_op);
>> } else {
>> ufshcd_hold(hba, false);
>> @@ -5976,7 +5978,7 @@ static void ufshcd_recover_pm_error(struct
>> ufs_hba *hba)
>> struct request_queue *q;
>> int ret;
>>
>> - hba->is_sys_suspended = false;
>> + hba->is_wl_sys_suspended = false;
>> /*
>> * Set RPM status of wlun device to RPM_ACTIVE,
>> * this also clears its runtime error.
>> @@ -8784,7 +8786,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba
>> *hba, enum ufs_pm_op pm_op)
>> enum ufs_dev_pwr_mode req_dev_pwr_mode;
>> enum uic_link_state req_link_state;
>>
>> - hba->pm_op_in_progress = true;
>> + hba->wl_pm_op_in_progress = true;
>> if (pm_op != UFS_SHUTDOWN_PM) {
>> pm_lvl = pm_op == UFS_RUNTIME_PM ?
>> hba->rpm_lvl : hba->spm_lvl;
>> @@ -8919,7 +8921,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba
>> *hba, enum ufs_pm_op pm_op)
>> hba->clk_gating.is_suspended = false;
>> ufshcd_release(hba);
>> }
>> - hba->pm_op_in_progress = false;
>> + hba->wl_pm_op_in_progress = false;
>> return ret;
>> }
>>
>> @@ -8928,7 +8930,7 @@ static int __ufshcd_wl_resume(struct ufs_hba
>> *hba, enum ufs_pm_op pm_op)
>> int ret;
>> enum uic_link_state old_link_state = hba->uic_link_state;
>>
>> - hba->pm_op_in_progress = true;
>> + hba->wl_pm_op_in_progress = true;
>>
>> /*
>> * Call vendor specific resume callback. As these callbacks may
>> access
>> @@ -9006,7 +9008,7 @@ static int __ufshcd_wl_resume(struct ufs_hba
>> *hba, enum ufs_pm_op pm_op)
>> ufshcd_update_evt_hist(hba, UFS_EVT_WL_RES_ERR, (u32)ret);
>> hba->clk_gating.is_suspended = false;
>> ufshcd_release(hba);
>> - hba->pm_op_in_progress = false;
>> + hba->wl_pm_op_in_progress = false;
>> return ret;
>> }
>>
>> @@ -9072,7 +9074,7 @@ static int ufshcd_wl_suspend(struct device *dev)
>>
>> out:
>> if (!ret)
>> - hba->is_sys_suspended = true;
>> + hba->is_wl_sys_suspended = true;
>> trace_ufshcd_wl_suspend(dev_name(dev), ret,
>> ktime_to_us(ktime_sub(ktime_get(), start)),
>> hba->curr_dev_pwr_mode, hba->uic_link_state);
>> @@ -9100,7 +9102,7 @@ static int ufshcd_wl_resume(struct device *dev)
>> ktime_to_us(ktime_sub(ktime_get(), start)),
>> hba->curr_dev_pwr_mode, hba->uic_link_state);
>> if (!ret)
>> - hba->is_sys_suspended = false;
>> + hba->is_wl_sys_suspended = false;
>> up(&hba->host_sem);
>> return ret;
>> }
>> @@ -9141,6 +9143,8 @@ static int ufshcd_suspend(struct ufs_hba *hba)
>>
>> if (!hba->is_powered)
>> return 0;
>> +
>> + hba->pm_op_in_progress = true;
>> /*
>> * Disable the host irq as host controller as there won't be any
>> * host controller transaction expected till resume.
>> @@ -9160,6 +9164,7 @@ static int ufshcd_suspend(struct ufs_hba *hba)
>> ufshcd_vreg_set_lpm(hba);
>> /* Put the host controller in low power mode if possible */
>> ufshcd_hba_vreg_set_lpm(hba);
>> + hba->pm_op_in_progress = false;
>> return ret;
>> }
>>
>> @@ -9179,6 +9184,7 @@ static int ufshcd_resume(struct ufs_hba *hba)
>> if (!hba->is_powered)
>> return 0;
>>
>> + hba->pm_op_in_progress = true;
>> ufshcd_hba_vreg_set_hpm(hba);
>> ret = ufshcd_vreg_set_hpm(hba);
>> if (ret)
>> @@ -9198,6 +9204,7 @@ static int ufshcd_resume(struct ufs_hba *hba)
>> out:
>> if (ret)
>> ufshcd_update_evt_hist(hba, UFS_EVT_RESUME_ERR, (u32)ret);
>> + hba->pm_op_in_progress = false;
>> return ret;
>> }
>>
>> @@ -9222,6 +9229,10 @@ int ufshcd_system_suspend(struct ufs_hba *hba)
>> trace_ufshcd_system_suspend(dev_name(hba->dev), ret,
>> ktime_to_us(ktime_sub(ktime_get(), start)),
>> hba->curr_dev_pwr_mode, hba->uic_link_state);
>> +
>> + if (!ret)
>> + hba->is_sys_suspended = true;
>> +
>> return ret;
>> }
>> EXPORT_SYMBOL(ufshcd_system_suspend);
>> @@ -9248,6 +9259,9 @@ int ufshcd_system_resume(struct ufs_hba *hba)
>> ktime_to_us(ktime_sub(ktime_get(), start)),
>> hba->curr_dev_pwr_mode, hba->uic_link_state);
>>
>> + if (!ret)
>> + hba->is_sys_suspended = false;
>> +
>> return ret;
>> }
>> EXPORT_SYMBOL(ufshcd_system_resume);
>> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
>> index c98d540..eaebb4e 100644
>> --- a/drivers/scsi/ufs/ufshcd.h
>> +++ b/drivers/scsi/ufs/ufshcd.h
>> @@ -752,7 +752,8 @@ struct ufs_hba {
>> enum ufs_pm_level spm_lvl;
>> struct device_attribute rpm_lvl_attr;
>> struct device_attribute spm_lvl_attr;
>> - int pm_op_in_progress;
>> + bool pm_op_in_progress;
>> + bool wl_pm_op_in_progress;
>>
>> /* Auto-Hibernate Idle Timer register value */
>> u32 ahit;
>> @@ -839,6 +840,7 @@ struct ufs_hba {
>> struct devfreq *devfreq;
>> struct ufs_clk_scaling clk_scaling;
>> bool is_sys_suspended;
>> + bool is_wl_sys_suspended;
>>
>> enum bkops_status urgent_bkops_lvl;
>> bool is_urgent_bkops_lvl_checked;
>>
Powered by blists - more mailing lists