update some devinfo entries

PATCH In review Mike Christie 1 participant 2 messages Aug 15, 2006 SCSI

lore

Share & tools

lore

Mike Christie

author

2006-08-15 22:00 UTC #0 lore raw

PATCH 1/1 update some devinfo entries

The RHEL4 kernel contains some devinfo entries that upstream does not so I thought I should try and update upstream.

Most of them are new entries or pretty straight forward, except this one:

- {"HITACHI", "OPEN-E", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},
+ {"HITACHI", "OPEN-", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},

In RHEL we used to have OPEN-V, OPEN-L and OPEN-V and those used BLIST_SPARSELUN | BLIST_LARGELUN. We consolidated those to just OPEN-.

Upstream has "OPEN-E" with
BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN

So I am not sure if consolidating that one into OPEN- is ok since I am not adding BLIST_ATTACH_PQ3 for all OPEN-.

I do not have any of this HW. I have only compile tested the patch. It was built over scsi-rc-fixes.

Signed-off-by Mike Christie <[email protected]>

drivers/scsi/scsi_devinfo.c +8 -3

index 3d0429b..54a3f3d 100644
@@ -141,7 +141,9 @@ static struct {
 	{"COMPAQ", "MSA1000", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD},
 	{"COMPAQ", "MSA1000 VOLUME", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD},
 	{"COMPAQ", "HSV110", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
-	{"DDN", "SAN DataDirector", "*", BLIST_SPARSELUN},
+	{"DDN", "SAN DataDirector", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+	{"DDN", "S2A 8400", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+	{"DDN", "S2A 8500", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
 	{"DEC", "HSG80", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
 	{"DELL", "PV660F", NULL, BLIST_SPARSELUN},
 	{"DELL", "PV660F   PSEUDO", NULL, BLIST_SPARSELUN},

@@ -150,6 +152,7 @@ static struct {
 	{"DELL", "PERCRAID", NULL, BLIST_FORCELUN},
 	{"DGC", "RAID", NULL, BLIST_SPARSELUN},	/* Dell PV 650F, storage on LUN 0 */
 	{"DGC", "DISK", NULL, BLIST_SPARSELUN},	/* Dell PV 650F, no storage on LUN 0 */
+	{"EMC",  "Invista", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
 	{"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_FORCELUN},
 	{"EMULEX", "MD21/S2     ESDI", NULL, BLIST_SINGLELUN},
 	{"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN},

@@ -160,9 +163,9 @@ static struct {
 	{"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},
+	{"HITACHI", "OPEN-", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},
 	{"HP", "A6189A", NULL, BLIST_SPARSELUN | BLIST_LARGELUN},	/* HP VA7400 */
-	{"HP", "OPEN-", "*", BLIST_REPORTLUN2}, /* HP XP Arrays */
+	{"HP", "OPEN-", "*", BLIST_REPORTLUN2 | BLIST_SPARSELUN | BLIST_LARGELUN}, /* HP XP Arrays */
 	{"HP", "NetRAID-4M", NULL, BLIST_FORCELUN},
 	{"HP", "HSV100", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
 	{"HP", "C1557A", NULL, BLIST_FORCELUN},

@@ -188,6 +191,7 @@ static struct {
 	{"NAKAMICH", "MJ-4.8S", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
 	{"NAKAMICH", "MJ-5.16S", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
 	{"NEC", "PD-1 ODX654P", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
+	{"NEC", "iStorage", NULL, BLIST_REPORTLUN2},
 	{"NRC", "MBR-7", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
 	{"NRC", "MBR-7.4", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
 	{"PIONEER", "CD-ROM DRM-600", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},

@@ -210,6 +214,7 @@ static struct {
 	{"SUN", "T300", "*", BLIST_SPARSELUN},
 	{"SUN", "T4", "*", BLIST_SPARSELUN},
 	{"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN},
+	{"Tornado-", "F4", "*", BLIST_NOREPORTLUN},
 	{"TOSHIBA", "CDROM", NULL, BLIST_ISROM},
 	{"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},
 	{"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36},

Mike Christie

author

2006-08-15 22:43 UTC #1 lore raw

Quoted 14 lines · Mike Christie

The RHEL4 kernel contains some devinfo entries that upstream does not so I thought I should try and update upstream.
Most of them are new entries or pretty straight forward, except this one:
drivers/scsi/scsi_devinfo.c +1 -1
-       {"HITACHI", "OPEN-E", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},
+       {"HITACHI", "OPEN-", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},
In RHEL we used to have OPEN-V, OPEN-L and OPEN-V and those used BLIST_SPARSELUN | BLIST_LARGELUN. We consolidated those to just OPEN-.

Quoted 6 lines

Upstream has "OPEN-E" with
BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN
So I am not sure if consolidating that one into OPEN- is ok since I am not adding BLIST_ATTACH_PQ3 for all OPEN-.

Ooops, I meant that I am now adding BLIST_ATTACH_PQ3 for all devices matching OPEN-.