cciss: version update, new hw
Subsystems (3)
PATCH 1/2 cciss: version update, new hw
PATCH 1 of 2
This patch adds support for new hardware and bumps the version to 3.6.10. It seems there were several changes introduced including soft_irq. I decided to bump the major number to reflect these changes. Since we're still supporting older vendor kernels I need some way differenciate between kernel versions <=2.6.10 and newer kernels >=2.6.16.
I hate to send this in -rc6 but it seems like 2.6.18 is having a tough time getting out the gate. Please consider this for inclusion.
Documentation/cciss.txt | 1 + drivers/block/cciss.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-)
--------------------------------------------------------------------------------
Documentation/cciss.txt +1 -0
@@ -20,6 +20,7 @@ This driver is known to work with the fo * SA P400i * SA E200 * SA E200i + * SA E500 If nodes are not already created in the /dev/cciss directory, run as root:
drivers/block/cciss.c +6 -4
@@ -48,14 +48,14 @@#include <linux/completion.h> #define CCISS_DRIVER_VERSION (maj,min,submin) ((maj<<16)|(min<<8)|(submin)) -#define DRIVER_NAME "HP CISS Driver (v 2.6.10)" -#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,10) +#define DRIVER_NAME "HP CISS Driver (v 3.6.10)" +#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,10)/* Embedded module documentation macros - see modules.h */ MODULE_AUTHOR ("Hewlett-Packard Company" ); -MODULE_DESCRIPTION ("Driver for HP Controller SA5xxx SA6xxx version 2.6.10" ); +MODULE_DESCRIPTION ("Driver for HP Controller SA5xxx SA6xxx version 3.6.10" );MODULE_SUPPORTED_DEVICE ("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400" -" SA6i P600 P800 P400 P400i E200 E200i" ); +" SA6i P600 P800 P400 P400i E200 E200i E500" );MODULE_LICENSE ("GPL" );#include "cciss_cmd.h"
@@ -82,6 +82,7 @@ static const struct pci_device_id cciss_ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3213}, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3214}, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215}, + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3233}, {0,} };
@@ -110,6 +111,7 @@ static struct board_type products[] = { {0x3213103C, "Smart Array E200i", &SA5_access}, {0x3214103C, "Smart Array E200i", &SA5_access}, {0x3215103C, "Smart Array E200i", &SA5_access}, + {0x3233103C, "Smart Array E500", &SA5_access}, };/* How long to wait (in milliseconds) for board to go into simple mode */
Quoted 7 lines · On Mon, 11 Sep 2006 16:31:26 -0500 "Mike Miller (OS Dev)"…
This patch adds support for new hardware and bumps the version to 3.6.10. It seems there were several changes introduced including
soft_irq. I decided to bump the major number to reflect these changes. Since we're still supporting older vendor kernels I need some way differenciate between kernel versions <=2.6.10 and newer kernels >=2.6.16.
I hate to send this in -rc6 but it seems like 2.6.18 is having a tough time getting out the gate. Please consider this for inclusion.
Adding a new device ID is a bit of a no-brainer - in fact bumping the version number seems more risky than adding a device ID.
I'd be OK with a 2.6.18 merge, and shall send it into Linus unless Jens nacks it, or gets there first.
Jens Axboe
maintainerQuoted 11 lines · Andrew Morton
Quoted 7 lines · On Mon, 11 Sep 2006 16:31:26 -0500 "Mike Miller (OS Dev)"…
This patch adds support for new hardware and bumps the version to 3.6.10. It seems there were several changes introduced including
soft_irq. I decided to bump the major number to reflect these changes. Since we're still supporting older vendor kernels I need some way differenciate between kernel versions <=2.6.10 and newer kernels >=2.6.16.
I hate to send this in -rc6 but it seems like 2.6.18 is having a tough time getting out the gate. Please consider this for inclusion.
Quoted 5 lines
Adding a new device ID is a bit of a no-brainer - in fact bumping the version number seems more risky than adding a device ID.
I'd be OK with a 2.6.18 merge, and shall send it into Linus unless Jens nacks it, or gets there first.
Do just send it on for 2.6.18, it has my acked-by.
Signature · 1 line
Jens Axboe