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

Commit 3de0a70b authored by Mike Miller's avatar Mike Miller Committed by Linus Torvalds
Browse files

[PATCH] cciss: pci id fix 



This patch fixes a PCI ID I got wrong before.  It also adds support for
another new SAS controller due out this summer.  I didn't have a marketing
name prior to my last submission.  Also modifies the copyright date range.

Signed-off-by: default avatarMike Miller <mike.miller@hp.com>
Acked-by: default avatarJeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 21c121cc

Documentation/cciss.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ This driver is known to work with the following cards: 
	* SA P600

	* SA P600

	* SA P800

	* SA P800

	* SA E400

	* SA E400

	* SA E300





If nodes are not already created in the /dev/cciss directory, run as root:

If nodes are not already created in the /dev/cciss directory, run as root:

drivers/block/cciss.c

+6 −3
Original line number Original line Diff line number Diff line 
/*

/*

 *    Disk Array driver for HP SA 5xxx and 6xxx Controllers

 *    Disk Array driver for HP SA 5xxx and 6xxx Controllers

 *    Copyright 2000, 2002 Hewlett-Packard Development Company, L.P.

 *    Copyright 2000, 2005 Hewlett-Packard Development Company, L.P.

 *

 *

 *    This program is free software; you can redistribute it and/or modify

 *    This program is free software; you can redistribute it and/or modify

 *    it under the terms of the GNU General Public License as published by

 *    it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ 
MODULE_AUTHOR("Hewlett-Packard Company");

MODULE_AUTHOR("Hewlett-Packard Company");

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

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

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

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

			" SA6i P600 P800 E400");

			" SA6i P600 P800 E400 E300");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");





#include "cciss_cmd.h"

#include "cciss_cmd.h"
@@ -85,8 +85,10 @@ static const struct pci_device_id cciss_pci_device_id[] = { 
		0x103C, 0x3225, 0, 0, 0},

		0x103C, 0x3225, 0, 0, 0},

	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSB,

	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSB,

		0x103c, 0x3223, 0, 0, 0},

		0x103c, 0x3223, 0, 0, 0},

	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSB,

	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,

		0x103c, 0x3231, 0, 0, 0},

		0x103c, 0x3231, 0, 0, 0},

	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,

		0x103c, 0x3233, 0, 0, 0},

	{0,}

	{0,}

};

};

MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);

MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
@@ -110,6 +112,7 @@ static struct board_type products[] = { 
	{ 0x3225103C, "Smart Array P600", &SA5_access},

	{ 0x3225103C, "Smart Array P600", &SA5_access},

	{ 0x3223103C, "Smart Array P800", &SA5_access},

	{ 0x3223103C, "Smart Array P800", &SA5_access},

	{ 0x3231103C, "Smart Array E400", &SA5_access},

	{ 0x3231103C, "Smart Array E400", &SA5_access},

	{ 0x3233103C, "Smart Array E300", &SA5_access},

};

};





/* How long to wait (in millesconds) for board to go into simple mode */

/* How long to wait (in millesconds) for board to go into simple mode */

include/linux/pci_ids.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -712,8 +712,9 @@ 
#define PCI_DEVICE_ID_HP_DIVA_AUX	0x1290

#define PCI_DEVICE_ID_HP_DIVA_AUX	0x1290

#define PCI_DEVICE_ID_HP_DIVA_RMP3	0x1301

#define PCI_DEVICE_ID_HP_DIVA_RMP3	0x1301

#define PCI_DEVICE_ID_HP_CISSA		0x3220

#define PCI_DEVICE_ID_HP_CISSA		0x3220

#define PCI_DEVICE_ID_HP_CISSB		0x3230

#define PCI_DEVICE_ID_HP_CISSB		0x3222

#define PCI_DEVICE_ID_HP_ZX2_IOC	0x4031

#define PCI_DEVICE_ID_HP_ZX2_IOC	0x4031

#define PCI_DEVICE_ID_HP_CISSC		0x3230





#define PCI_VENDOR_ID_PCTECH		0x1042

#define PCI_VENDOR_ID_PCTECH		0x1042

#define PCI_DEVICE_ID_PCTECH_RZ1000	0x1000

#define PCI_DEVICE_ID_PCTECH_RZ1000	0x1000