From: Lee Duncan <lduncan@suse.com>

Date: Wed, 28 Sep 2022 11:13:50 -0700

Subject: [PATCH] scsi: core: Add BLIST_NO_VPD_SIZE for some VDASD

References: bsc#1012628

Patch-mainline: 6.2.8

Git-commit: 4b1a2c2a8e0ddcb89c5f6c5003bd9b53142f69e3

[ Upstream commit 4b1a2c2a8e0ddcb89c5f6c5003bd9b53142f69e3 ]

Some storage, such as AIX VDASD (virtual storage) and IBM 2076 (front

end), fail as a result of commit c92a6b5d6335 ("scsi: core: Query VPD

size before getting full page").

That commit changed getting SCSI VPD pages so that we now read just

enough of the page to get the actual page size, then read the whole

page in a second read. The problem is that the above mentioned

hardware returns zero for the page size, because of a firmware

error. In such cases, until the firmware is fixed, this new blacklist

flag says to revert to the original method of reading the VPD pages,

i.e. try to read a whole buffer's worth on the first try.

[mkp: reworked somewhat]

Fixes: c92a6b5d6335 ("scsi: core: Query VPD size before getting full page")

Reported-by: Martin Wilck <mwilck@suse.com>

Suggested-by: Hannes Reinecke <hare@suse.de>

Signed-off-by: Lee Duncan <lduncan@suse.com>

Link: https://lore.kernel.org/r/20220928181350.9948-1-leeman.duncan@gmail.com

Tested-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/scsi/scsi.c         | 3 +++

 drivers/scsi/scsi_devinfo.c | 3 ++-

 drivers/scsi/scsi_scan.c    | 3 +++

 include/scsi/scsi_device.h  | 2 ++

 include/scsi/scsi_devinfo.h | 6 +++---

 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c

index 9feb0323..dff1d692 100644

--- a/drivers/scsi/scsi.c

+++ b/drivers/scsi/scsi.c

@@ -326,6 +326,9 @@ static int scsi_get_vpd_size(struct scsi_device *sdev, u8 page)

 	unsigned char vpd_header[SCSI_VPD_HEADER_SIZE] __aligned(4);

 	int result;

+	if (sdev->no_vpd_size)

+		return SCSI_DEFAULT_VPD_LEN;

+

 	/*

 	 * Fetch the VPD page header to find out how big the page

 	 * is. This is done to prevent problems on legacy devices

diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c

index c7080454..bc9d2804 100644

--- a/drivers/scsi/scsi_devinfo.c

+++ b/drivers/scsi/scsi_devinfo.c

@@ -134,7 +134,7 @@ static struct {

 	{"3PARdata", "VV", NULL, BLIST_REPORTLUN2},

 	{"ADAPTEC", "AACRAID", NULL, BLIST_FORCELUN},

 	{"ADAPTEC", "Adaptec 5400S", NULL, BLIST_FORCELUN},

-	{"AIX", "VDASD", NULL, BLIST_TRY_VPD_PAGES},

+	{"AIX", "VDASD", NULL, BLIST_TRY_VPD_PAGES | BLIST_NO_VPD_SIZE},

 	{"AFT PRO", "-IX CF", "0.0>", BLIST_FORCELUN},

 	{"BELKIN", "USB 2 HS-CF", "1.95",  BLIST_FORCELUN | BLIST_INQUIRY_36},

 	{"BROWNIE", "1200U3P", NULL, BLIST_NOREPORTLUN},

@@ -188,6 +188,7 @@ static struct {

 	{"HPE", "OPEN-", "*", BLIST_REPORTLUN2 | BLIST_TRY_VPD_PAGES},

 	{"IBM", "AuSaV1S2", NULL, BLIST_FORCELUN},

 	{"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN},

+	{"IBM", "2076", NULL, BLIST_NO_VPD_SIZE},

 	{"IBM", "2105", NULL, BLIST_RETRY_HWERROR},

 	{"iomega", "jaz 1GB", "J.86", BLIST_NOTQ | BLIST_NOLUN},

 	{"IOMEGA", "ZIP", NULL, BLIST_NOTQ | BLIST_NOLUN},

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c

index f9b18fdc..6042a558 100644

--- a/drivers/scsi/scsi_scan.c

+++ b/drivers/scsi/scsi_scan.c

@@ -1055,6 +1055,9 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,

 	else if (*bflags & BLIST_SKIP_VPD_PAGES)

 		sdev->skip_vpd_pages = 1;

+	if (*bflags & BLIST_NO_VPD_SIZE)

+		sdev->no_vpd_size = 1;

+

 	transport_configure_device(&sdev->sdev_gendev);

 	if (sdev->host->hostt->slave_configure) {

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h

index 3642b8e3..15169d75 100644

--- a/include/scsi/scsi_device.h

+++ b/include/scsi/scsi_device.h

@@ -145,6 +145,7 @@ struct scsi_device {

 	const char * model;		/* ... after scan; point to static string */

 	const char * rev;		/* ... "nullnullnullnull" before scan */

+#define SCSI_DEFAULT_VPD_LEN	255	/* default SCSI VPD page size (max) */

 	struct scsi_vpd __rcu *vpd_pg0;

 	struct scsi_vpd __rcu *vpd_pg83;

 	struct scsi_vpd __rcu *vpd_pg80;

@@ -215,6 +216,7 @@ struct scsi_device {

 					 * creation time */

 	unsigned ignore_media_change:1; /* Ignore MEDIA CHANGE on resume */

 	unsigned silence_suspend:1;	/* Do not print runtime PM related messages */

+	unsigned no_vpd_size:1;		/* No VPD size reported in header */

 	unsigned int queue_stopped;	/* request queue is quiesced */

 	bool offline_already;		/* Device offline message logged */

diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h

index 5d14adae..6b548dc2 100644

--- a/include/scsi/scsi_devinfo.h

+++ b/include/scsi/scsi_devinfo.h

@@ -32,7 +32,8 @@

 #define BLIST_IGN_MEDIA_CHANGE	((__force blist_flags_t)(1ULL << 11))

 /* do not do automatic start on add */

 #define BLIST_NOSTARTONADD	((__force blist_flags_t)(1ULL << 12))

-#define __BLIST_UNUSED_13	((__force blist_flags_t)(1ULL << 13))

+/* do not ask for VPD page size first on some broken targets */

+#define BLIST_NO_VPD_SIZE	((__force blist_flags_t)(1ULL << 13))

 #define __BLIST_UNUSED_14	((__force blist_flags_t)(1ULL << 14))

 #define __BLIST_UNUSED_15	((__force blist_flags_t)(1ULL << 15))

 #define __BLIST_UNUSED_16	((__force blist_flags_t)(1ULL << 16))

@@ -74,8 +75,7 @@

 #define __BLIST_HIGH_UNUSED (~(__BLIST_LAST_USED | \

 			       (__force blist_flags_t) \

 			       ((__force __u64)__BLIST_LAST_USED - 1ULL)))

-#define __BLIST_UNUSED_MASK (__BLIST_UNUSED_13 | \

-			     __BLIST_UNUSED_14 | \

+#define __BLIST_UNUSED_MASK (__BLIST_UNUSED_14 | \

 			     __BLIST_UNUSED_15 | \

 			     __BLIST_UNUSED_16 | \

 			     __BLIST_UNUSED_24 | \

-- 

2.35.3