2 files changed, 3 insertions, 1 deletions

diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 84c3937ae8fb..6f46b338c991 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -155,6 +155,8 @@ static struct {
         {"HITACHI", "DF400", "*", BLIST_SPARSELUN},
         {"HITACHI", "DF500", "*", BLIST_SPARSELUN},
         {"HITACHI", "DF600", "*", BLIST_SPARSELUN},
+        {"HITACHI", "DISK-SUBSYSTEM", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},
+        {"HITACHI", "OPEN-E", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},
         {"HP", "A6189A", NULL, BLIST_SPARSELUN | BLIST_LARGELUN},       /* HP VA7400 */
         {"HP", "OPEN-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, /* HP XP Arrays */
         {"HP", "NetRAID-4M", NULL, BLIST_FORCELUN},
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 5603dc6eca47..7d31a4b0f802 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -900,7 +900,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
         /*
          * result contains valid SCSI INQUIRY data.
          */
-        if ((result[0] >> 5) == 3) {
+        if (((result[0] >> 5) == 3) && !(bflags & BLIST_ATTACH_PQ3)) {
                 /*
                  * For a Peripheral qualifier 3 (011b), the SCSI
                  * spec says: The device server is not capable of