Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24aac480 authored by Mike Miller's avatar Mike Miller Committed by Linus Torvalds
Browse files

cciss: add new hardware support 



Add support for the next generation of HP Smart Array SAS/SATA
controllers.  Shipping date is late Fall 2008.

Bump the driver version to 3.6.20 to reflect the new hardware support from
patch 1 of this set.

Signed-off-by: default avatarMike Miller <mike.miller@hp.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8cdbc2b9

Documentation/cciss.txt

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ This driver is known to work with the following cards: 
	* SA E200

	* SA E200i

	* SA E500

	* SA P212

	* SA P410

	* SA P410i

	* SA P411

	* SA P812



Detecting drive failures:

-------------------------

drivers/block/cciss.c

+16 −5
Original line number Diff line number Diff line
@@ -53,15 +53,16 @@ 
#include <linux/scatterlist.h>



#define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))

#define DRIVER_NAME "HP CISS Driver (v 3.6.14)"

#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,14)

#define DRIVER_NAME "HP CISS Driver (v 3.6.20)"

#define DRIVER_VERSION CCISS_DRIVER_VERSION(3, 6, 20)



/* Embedded module documentation macros - see modules.h */

MODULE_AUTHOR("Hewlett-Packard Company");

MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 3.6.14");

MODULE_DESCRIPTION("Driver for HP Smart Array Controllers");

MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"

			" SA6i P600 P800 P400 P400i E200 E200i E500");

MODULE_VERSION("3.6.14");

			" SA6i P600 P800 P400 P400i E200 E200i E500 P700m"

			" Smart Array G2 Series SAS/SATA Controllers");

MODULE_VERSION("3.6.20");

MODULE_LICENSE("GPL");



#include "cciss_cmd.h"
@@ -90,6 +91,11 @@ static const struct pci_device_id cciss_pci_device_id[] = { 
	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3215},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3237},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x323D},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3241},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3243},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3245},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3247},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3249},

	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,

		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},

	{0,}
@@ -123,6 +129,11 @@ static struct board_type products[] = { 
	{0x3215103C, "Smart Array E200i", &SA5_access, 120},

	{0x3237103C, "Smart Array E500", &SA5_access, 512},

	{0x323D103C, "Smart Array P700m", &SA5_access, 512},

	{0x3241103C, "Smart Array P212", &SA5_access, 384},

	{0x3243103C, "Smart Array P410", &SA5_access, 384},

	{0x3245103C, "Smart Array P410i", &SA5_access, 384},

	{0x3247103C, "Smart Array P411", &SA5_access, 384},

	{0x3249103C, "Smart Array P812", &SA5_access, 384},

	{0xFFFF103C, "Unknown Smart Array", &SA5_access, 120},

};

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -716,6 +716,7 @@ 
#define PCI_DEVICE_ID_HP_CISSA		0x3220

#define PCI_DEVICE_ID_HP_CISSC		0x3230

#define PCI_DEVICE_ID_HP_CISSD		0x3238

#define PCI_DEVICE_ID_HP_CISSE		0x323a

#define PCI_DEVICE_ID_HP_ZX2_IOC	0x4031



#define PCI_VENDOR_ID_PCTECH		0x1042