Commit 16b047c9 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge branch '6.14/scsi-queue' into 6.14/scsi-fixes 



Pull outstanding fixes bound for this release into 6.14/scsi-fixes.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 2014c95a 8c09f612

drivers/scsi/scsi_lib_test.c

+7 −0
Original line number Diff line number Diff line
@@ -67,6 +67,13 @@ static void scsi_lib_test_multiple_sense(struct kunit *test) 
	};

	int i;



	/* Success */

	sc.result = 0;

	KUNIT_EXPECT_EQ(test, 0, scsi_check_passthrough(&sc, &failures));

	KUNIT_EXPECT_EQ(test, 0, scsi_check_passthrough(&sc, NULL));

	/* Command failed but caller did not pass in a failures array */

	scsi_build_sense(&sc, 0, ILLEGAL_REQUEST, 0x91, 0x36);

	KUNIT_EXPECT_EQ(test, 0, scsi_check_passthrough(&sc, NULL));

	/* Match end of array */

	scsi_build_sense(&sc, 0, ILLEGAL_REQUEST, 0x91, 0x36);

	KUNIT_EXPECT_EQ(test, -EAGAIN, scsi_check_passthrough(&sc, &failures));

drivers/target/target_core_stat.c

+2 −2
Original line number Diff line number Diff line
@@ -117,9 +117,9 @@ static ssize_t target_stat_tgt_status_show(struct config_item *item, 
		char *page)

{

	if (to_stat_tgt_dev(item)->export_count)

		return snprintf(page, PAGE_SIZE, "activated");

		return snprintf(page, PAGE_SIZE, "activated\n");

	else

		return snprintf(page, PAGE_SIZE, "deactivated");

		return snprintf(page, PAGE_SIZE, "deactivated\n");

}



static ssize_t target_stat_tgt_non_access_lus_show(struct config_item *item,

drivers/ufs/core/ufshcd.c

+1 −19
Original line number Diff line number Diff line
@@ -5976,24 +5976,6 @@ static void ufshcd_bkops_exception_event_handler(struct ufs_hba *hba) 
				__func__, err);

}



static void ufshcd_temp_exception_event_handler(struct ufs_hba *hba, u16 status)

{

	u32 value;



	if (ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR,

				QUERY_ATTR_IDN_CASE_ROUGH_TEMP, 0, 0, &value))

		return;



	dev_info(hba->dev, "exception Tcase %d\n", value - 80);



	ufs_hwmon_notify_event(hba, status & MASK_EE_URGENT_TEMP);



	/*

	 * A placeholder for the platform vendors to add whatever additional

	 * steps required

	 */

}



static int __ufshcd_wb_toggle(struct ufs_hba *hba, bool set, enum flag_idn idn)

{

	u8 index;
@@ -6214,7 +6196,7 @@ static void ufshcd_exception_event_handler(struct work_struct *work) 
		ufshcd_bkops_exception_event_handler(hba);



	if (status & hba->ee_drv_mask & MASK_EE_URGENT_TEMP)

		ufshcd_temp_exception_event_handler(hba, status);

		ufs_hwmon_notify_event(hba, status & MASK_EE_URGENT_TEMP);



	ufs_debugfs_exception_event(hba, status);

}

include/ufs/ufs.h

+2 −2
Original line number Diff line number Diff line
@@ -385,8 +385,8 @@ enum { 


/* Possible values for dExtendedUFSFeaturesSupport */

enum {

	UFS_DEV_LOW_TEMP_NOTIF		= BIT(4),

	UFS_DEV_HIGH_TEMP_NOTIF		= BIT(5),

	UFS_DEV_HIGH_TEMP_NOTIF		= BIT(4),

	UFS_DEV_LOW_TEMP_NOTIF		= BIT(5),

	UFS_DEV_EXT_TEMP_NOTIF		= BIT(6),

	UFS_DEV_HPB_SUPPORT		= BIT(7),

	UFS_DEV_WRITE_BOOSTER_SUP	= BIT(8),