From fdb63698043dbdb1db889e1c0ebaba49c8c0fa66 Mon Sep 17 00:00:00 2001 From: Tomas Henzl Date: Tue, 14 Feb 2012 18:07:59 +0100 Subject: [PATCH] --- yaml --- r: 292975 b: refs/heads/master c: 5a4f934e65620130d033725e85b7fdff4ac2ffbd h: refs/heads/master i: 292973: 04f59030789e2d280c0dda66d5ccde836af26428 292971: 939023a8631179c0a58f76be6d8250ebb761407c 292967: 9a4b6c8858d29ade9cd6a0f71d2709f8dc38fbb6 292959: 76be26cfd8e5168de754327ef8d89965f6d5c45d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 59450fce49cb..6b684fd83472 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47ac56db133cb0b6cf3c8b156db854c158fb9dae +refs/heads/master: 5a4f934e65620130d033725e85b7fdff4ac2ffbd diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c index 5019bea323ce..500e20dd56ec 100644 --- a/trunk/drivers/scsi/hpsa.c +++ b/trunk/drivers/scsi/hpsa.c @@ -298,11 +298,23 @@ static u32 unresettable_controller[] = { 0x40800E11, /* Smart Array 5i */ 0x409C0E11, /* Smart Array 6400 */ 0x409D0E11, /* Smart Array 6400 EM */ + 0x40700E11, /* Smart Array 5300 */ + 0x40820E11, /* Smart Array 532 */ + 0x40830E11, /* Smart Array 5312 */ + 0x409A0E11, /* Smart Array 641 */ + 0x409B0E11, /* Smart Array 642 */ + 0x40910E11, /* Smart Array 6i */ }; /* List of controllers which cannot even be soft reset */ static u32 soft_unresettable_controller[] = { 0x40800E11, /* Smart Array 5i */ + 0x40700E11, /* Smart Array 5300 */ + 0x40820E11, /* Smart Array 532 */ + 0x40830E11, /* Smart Array 5312 */ + 0x409A0E11, /* Smart Array 641 */ + 0x409B0E11, /* Smart Array 642 */ + 0x40910E11, /* Smart Array 6i */ /* Exclude 640x boards. These are two pci devices in one slot * which share a battery backed cache module. One controls the * cache, the other accesses the cache through the one that controls