4 files changed, 10 insertions, 1 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index a5a0bdeba857..50536cd6b3f2 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -928,7 +928,9 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
 
         sdev->eh_timeout = SCSI_DEFAULT_EH_TIMEOUT;
 
-        if (*bflags & BLIST_SKIP_VPD_PAGES)
+        if (*bflags & BLIST_TRY_VPD_PAGES)
+                sdev->try_vpd_pages = 1;
+        else if (*bflags & BLIST_SKIP_VPD_PAGES)
                 sdev->skip_vpd_pages = 1;
 
         transport_configure_device(&sdev->sdev_gendev);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 377a5206017e..4d72831eafe5 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2726,6 +2726,11 @@ static void sd_read_write_same(struct scsi_disk *sdkp, unsigned char *buffer)
 
 static int sd_try_extended_inquiry(struct scsi_device *sdp)
 {
+        /* Attempt VPD inquiry if the device blacklist explicitly calls
+         * for it.
+         */
+        if (sdp->try_vpd_pages)
+                return 1;
         /*
          * Although VPD inquiries can go to SCSI-2 type devices,
          * some USB ones crash on receiving them, and the pages
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index b895784e2313..1a0d1842962e 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -154,6 +154,7 @@ struct scsi_device {
         unsigned skip_ms_page_8:1;      /* do not use MODE SENSE page 0x08 */
         unsigned skip_ms_page_3f:1;     /* do not use MODE SENSE page 0x3f */
         unsigned skip_vpd_pages:1;      /* do not read VPD pages */
+        unsigned try_vpd_pages:1;       /* attempt to read VPD pages */
         unsigned use_192_bytes_for_3f:1; /* ask for 192 bytes from page 0x3f */
         unsigned no_start_on_add:1;     /* do not issue start on add */
         unsigned allow_restart:1; /* issue START_UNIT in error handler */
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index 8670c04e199e..1fdd6fc5492b 100644
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@ -34,4 +34,5 @@
 #define BLIST_SKIP_VPD_PAGES    0x4000000 /* Ignore SBC-3 VPD pages */
 #define BLIST_SCSI3LUN          0x8000000 /* Scan more than 256 LUNs
                                              for sequential scan */
+#define BLIST_TRY_VPD_PAGES     0x10000000 /* Attempt to read VPD pages */
 #endif