android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FROMLIST: scsi: ufs: Simplify power management during async scan

Browse Source 
ufshcd_init() calls pm_runtime_get_sync() before it calls
async_schedule(). ufshcd_async_scan() calls pm_runtime_put_sync()
directly or indirectly from ufshcd_add_lus(). Simplify
ufshcd_async_scan() by always calling pm_runtime_put_sync() from
ufshcd_async_scan().

Cc: stable@vger.kernel.org
Change-Id: I4b6ede95360c665594963fff0962742728064fb0
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Bug: 310401362
Link: https://lore.kernel.org/linux-scsi/20231218225229.2542156-2-bvanassche@acm.org/
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Bart Van Assche 2023-12-18 14:52:14 -08:00 committed by Treehugger Robot
parent febcf1429f
commit 28154afe74
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ufs/core/ufshcd.c
View File

@ -8683,7 +8683,6 @@ static int ufshcd_add_lus(struct ufs_hba *hba)
ufs_bsg_probe(hba); ufs_bsg_probe(hba);
ufshpb_init(hba); ufshpb_init(hba);
scsi_scan_host(hba->host); scsi_scan_host(hba->host);
pm_runtime_put_sync(hba->dev);
out: out:
return ret; return ret;
@ -8916,16 +8915,16 @@ static void ufshcd_async_scan(void *data, async_cookie_t cookie)
/* Probe and add UFS logical units */ /* Probe and add UFS logical units */
ret = ufshcd_add_lus(hba); ret = ufshcd_add_lus(hba);
out: out:
pm_runtime_put_sync(hba->dev);
/* /*
* If we failed to initialize the device or the device is not * If we failed to initialize the device or the device is not
* present, turn off the power/clocks etc. * present, turn off the power/clocks etc.
*/ */
if (ret) { if (ret)
pm_runtime_put_sync(hba->dev);
ufshcd_hba_exit(hba); ufshcd_hba_exit(hba);
} }
}
static enum scsi_timeout_action ufshcd_eh_timed_out(struct scsi_cmnd *scmd) static enum scsi_timeout_action ufshcd_eh_timed_out(struct scsi_cmnd *scmd)
{ {