Update hardware table for new HP arrays

References: 442133

Signed-off-by: Vijayakumar Balasubramanian <vijaykumar@hp.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 52bced9..1d31006 100644 (file)
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -122,7 +122,7 @@ static struct hwentry default_hw[] = {
                .pgfailback    = FAILBACK_UNDEF,
                .rr_weight     = RR_WEIGHT_NONE,
                .no_path_retry = 12,
-               .minio         = DEFAULT_MINIO,
+               .minio         = 100,
                .checker_name  = HP_SW,
                .prio_name     = PRIO_HP_SW,
        },
@@ -138,26 +138,11 @@ static struct hwentry default_hw[] = {
                .pgfailback    = -FAILBACK_IMMEDIATE,
                .rr_weight     = RR_WEIGHT_NONE,
                .no_path_retry = 12,
-               .minio         = DEFAULT_MINIO,
+               .minio         = 100,
                .checker_name  = TUR,
                .prio_name     = PRIO_ALUA,
        },
        {
-               .vendor        = "HP",
-               .product       = "MSA2000s*",
-               .getuid        = "/sbin/cciss_id %n",
-               .features      = DEFAULT_FEATURES,
-               .hwhandler     = DEFAULT_HWHANDLER,
-               .selector      = DEFAULT_SELECTOR,
-               .pgpolicy      = GROUP_BY_PRIO,
-               .pgfailback    = -FAILBACK_IMMEDIATE,
-               .rr_weight     = RR_WEIGHT_NONE,
-               .no_path_retry = 12,
-               .minio         = DEFAULT_MINIO,
-               .checker_name  = TUR,
-               .prio_name     = DEFAULT_PRIO,
-       },
-       {
                /* EVA 3000/5000 with new firmware, EVA 4000/6000/8000 */
                .vendor        = "(COMPAQ|HP)",
                .product       = "HSV1[01]1|HSV2[01]0|HSV300",
@@ -169,14 +154,14 @@ static struct hwentry default_hw[] = {
                .pgfailback    = -FAILBACK_IMMEDIATE,
                .rr_weight     = RR_WEIGHT_NONE,
                .no_path_retry = 12,
-               .minio         = DEFAULT_MINIO,
+               .minio         = 100,
                .checker_name  = TUR,
                .prio_name     = PRIO_ALUA,
        },
        {
-               /* HP MSA2000 product family */
+               /* HP MSA2000 product family with old firmware */
                .vendor        = "HP",
-               .product       = "MSA2[02]12*",
+               .product       = "MSA2[02]12fc|MSA2012i",
                .getuid        = DEFAULT_GETUID,
                .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
@@ -184,12 +169,46 @@ static struct hwentry default_hw[] = {
                .pgpolicy      = MULTIBUS,
                .pgfailback    = -FAILBACK_IMMEDIATE,
                .rr_weight     = RR_WEIGHT_NONE,
-               .no_path_retry = 12,
-               .minio         = DEFAULT_MINIO,
+               .no_path_retry = 18,
+               .minio         = 100,
                .checker_name  = TUR,
                .prio_name     = DEFAULT_PRIO,
        },
        {
+                /* HP MSA2000 product family with new firmware */
+                .vendor        = "HP",
+                .product       = "MSA2012sa|MSA23(12|24)(fc|i|sa)",
+                .getuid        = DEFAULT_GETUID,
+                .features      = DEFAULT_FEATURES,
+                .hwhandler     = DEFAULT_HWHANDLER,
+                .selector      = DEFAULT_SELECTOR,
+                .pgpolicy      = GROUP_BY_PRIO,
+                .pgfailback    = -FAILBACK_IMMEDIATE,
+                .rr_weight     = RR_WEIGHT_NONE,
+                .no_path_retry = 18,
+                .minio         = 100,
+                .checker_name  = TUR,
+                .prio_name     = PRIO_ALUA,
+        },
+
+        {
+                /* HP SVSP */
+                .vendor        = "HP",
+                .product       = "HSVX700",
+                .getuid        = DEFAULT_GETUID,
+                .features      = DEFAULT_FEATURES,
+                .hwhandler     = "1 alua",
+                .selector      = DEFAULT_SELECTOR,
+                .pgpolicy      = GROUP_BY_PRIO,
+                .pgfailback    = -FAILBACK_IMMEDIATE,
+                .rr_weight     = RR_WEIGHT_NONE,
+                .no_path_retry = 12,
+                .minio         = 100,
+                .checker_name  = TUR,
+                .prio_name     = PRIO_ALUA,
+        },
+
+       {
                /* HP Smart Array */
                .vendor        = "HP",
                .product       = "LOGICAL VOLUME.*",
@@ -294,7 +313,7 @@ static struct hwentry default_hw[] = {
                .vendor        = "(HITACHI|HP)",
                .product       = "OPEN-.*",
                .getuid        = DEFAULT_GETUID,
-               .features      = "1 queue_if_no_path",
+               .features      = DEFAULT_FEATURES,
                .hwhandler     = DEFAULT_HWHANDLER,
                .selector      = DEFAULT_SELECTOR,
                .pgpolicy      = MULTIBUS,