Skip to content

Commit 6e34b9d

Browse files
bvanasschegregkh
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>
1 parent 9aa1f0d commit 6e34b9d

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/ufs/core/ufshcd.c

+8-2
Original file line numberDiff line numberDiff line change
@@ -8678,6 +8678,14 @@ static int ufshcd_add_lus(struct ufs_hba *hba)
86788678
ufshcd_init_clk_scaling_sysfs(hba);
86798679
}
86808680

8681+
/*
8682+
* The RTC update code accesses the hba->ufs_device_wlun->sdev_gendev
8683+
* pointer and hence must only be started after the WLUN pointer has
8684+
* been initialized by ufshcd_scsi_add_wlus().
8685+
*/
8686+
schedule_delayed_work(&hba->ufs_rtc_update_work,
8687+
msecs_to_jiffies(UFS_RTC_UPDATE_INTERVAL_MS));
8688+
86818689
ufs_bsg_probe(hba);
86828690
scsi_scan_host(hba->host);
86838691

@@ -8837,8 +8845,6 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params)
88378845
ufshcd_force_reset_auto_bkops(hba);
88388846

88398847
ufshcd_set_timestamp_attr(hba);
8840-
schedule_delayed_work(&hba->ufs_rtc_update_work,
8841-
msecs_to_jiffies(UFS_RTC_UPDATE_INTERVAL_MS));
88428848

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

0 commit comments

Comments
 (0)