Skip to content

Commit f4362da

Browse files
bvanasscheopsiff
authored andcommitted
scsi: ufs: core: Start the RTC update work later
commit 54c814c upstream. The RTC update work involves runtime resuming the UFS controller. Hence, only start the RTC update work after runtime power management in the UFS driver has been fully initialized. This patch fixes the following kernel crash: Internal error: Oops: 0000000096000006 [#1] PREEMPT SMP Workqueue: events ufshcd_rtc_work Call trace: _raw_spin_lock_irqsave+0x34/0x8c (P) pm_runtime_get_if_active+0x24/0x9c (L) pm_runtime_get_if_active+0x24/0x9c ufshcd_rtc_work+0x138/0x1b4 process_one_work+0x148/0x288 worker_thread+0x2cc/0x3d4 kthread+0x110/0x114 ret_from_fork+0x10/0x20 Reported-by: Neil Armstrong <neil.armstrong@linaro.org> Closes: https://lore.kernel.org/linux-scsi/0c0bc528-fdc2-4106-bc99-f23ae377f6f5@linaro.org/ Fixes: 6bf999e ("scsi: ufs: core: Add UFS RTC support") Cc: Bean Huo <beanhuo@micron.com> Cc: stable@vger.kernel.org Signed-off-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/20241031212632.2799127-1-bvanassche@acm.org Reviewed-by: Peter Wang <peter.wang@mediatek.com> Reviewed-by: Bean Huo <beanhuo@micron.com> Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-HDK Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 6e34b9d)
1 parent e7645e4 commit f4362da

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

drivers/ufs/core/ufshcd.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8675,6 +8675,14 @@ static int ufshcd_add_lus(struct ufs_hba *hba)
86758675
ufshcd_init_clk_scaling_sysfs(hba);
86768676
}
86778677

8678+
/*
8679+
* The RTC update code accesses the hba->ufs_device_wlun->sdev_gendev
8680+
* pointer and hence must only be started after the WLUN pointer has
8681+
* been initialized by ufshcd_scsi_add_wlus().
8682+
*/
8683+
schedule_delayed_work(&hba->ufs_rtc_update_work,
8684+
msecs_to_jiffies(UFS_RTC_UPDATE_INTERVAL_MS));
8685+
86788686
ufs_bsg_probe(hba);
86798687
scsi_scan_host(hba->host);
86808688

@@ -8834,8 +8842,6 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params)
88348842
ufshcd_force_reset_auto_bkops(hba);
88358843

88368844
ufshcd_set_timestamp_attr(hba);
8837-
schedule_delayed_work(&hba->ufs_rtc_update_work,
8838-
msecs_to_jiffies(UFS_RTC_UPDATE_INTERVAL_MS));
88398845

88408846
/* Gear up to HS gear if supported */
88418847
if (hba->max_pwr_info.is_valid) {

0 commit comments

Comments
 (0)