Commit 8e3b6345 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging 



Pull in the fixes branch to resolve conflict in UFS core.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 128faa18 54c814c8

drivers/scsi/sd_zbc.c

+1 −2
Original line number Diff line number Diff line
@@ -188,8 +188,7 @@ static void *sd_zbc_alloc_report_buffer(struct scsi_disk *sdkp, 
	bufsize = min_t(size_t, bufsize, queue_max_segments(q) << PAGE_SHIFT);



	while (bufsize >= SECTOR_SIZE) {

		buf = __vmalloc(bufsize,

				GFP_KERNEL | __GFP_ZERO | __GFP_NORETRY);

		buf = kvzalloc(bufsize, GFP_KERNEL | __GFP_NORETRY);

		if (buf) {

			*buflen = bufsize;

			return buf;

drivers/ufs/core/ufshcd.c

+8 −2
Original line number Diff line number Diff line
@@ -8623,6 +8623,14 @@ static int ufshcd_add_lus(struct ufs_hba *hba) 
		ufshcd_init_clk_scaling_sysfs(hba);

	}



	/*

	 * The RTC update code accesses the hba->ufs_device_wlun->sdev_gendev

	 * pointer and hence must only be started after the WLUN pointer has

	 * been initialized by ufshcd_scsi_add_wlus().

	 */

	schedule_delayed_work(&hba->ufs_rtc_update_work,

			      msecs_to_jiffies(UFS_RTC_UPDATE_INTERVAL_MS));



	ufs_bsg_probe(hba);

	scsi_scan_host(hba->host);
@@ -8717,8 +8725,6 @@ static int ufshcd_post_device_init(struct ufs_hba *hba) 
	ufshcd_force_reset_auto_bkops(hba);



	ufshcd_set_timestamp_attr(hba);

	schedule_delayed_work(&hba->ufs_rtc_update_work,

			      msecs_to_jiffies(UFS_RTC_UPDATE_INTERVAL_MS));



	if (!hba->max_pwr_info.is_valid)

		return 0;