Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 841fdffdd382722d33579a6aa1487e8a4e526dbd

Authored by Mike Miller
Committed by Jens Axboe
1 parent 5e216153c3

cciss: new controller support and bump driver version 

Add support for new controllers due out next year.  HP must continue to
support new controllers in older distros.  All vendors require support be
upstream.  These controllers support only 16 commands in simple mode but
can support up to 1024 in performant mode.  See patch 5/6/ We have no
marketing names yet.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

Showing 1 changed file with 14 additions and 6 deletions Side-by-side Diff

drivers/block/cciss.c
Diff comments   View file @ 841fdff
... ... @@ -56,16 +56,14 @@
56 56 #include <linux/kthread.h>
57 57  
58 58 #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
59   -#define DRIVER_NAME "HP CISS Driver (v 3.6.20)"
60   -#define DRIVER_VERSION CCISS_DRIVER_VERSION(3, 6, 20)
  59 +#define DRIVER_NAME "HP CISS Driver (v 3.6.26)"
  60 +#define DRIVER_VERSION CCISS_DRIVER_VERSION(3, 6, 26)
61 61  
62 62 /* Embedded module documentation macros - see modules.h */
63 63 MODULE_AUTHOR("Hewlett-Packard Company");
64 64 MODULE_DESCRIPTION("Driver for HP Smart Array Controllers");
65   -MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
66   - " SA6i P600 P800 P400 P400i E200 E200i E500 P700m"
67   - " Smart Array G2 Series SAS/SATA Controllers");
68   -MODULE_VERSION("3.6.20");
  65 +MODULE_SUPPORTED_DEVICE("HP Smart Array Controllers");
  66 +MODULE_VERSION("3.6.26");
69 67 MODULE_LICENSE("GPL");
70 68  
71 69 static int cciss_allow_hpsa;
... ... @@ -107,6 +105,11 @@
107 105 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249},
108 106 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324A},
109 107 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324B},
  108 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3250},
  109 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3251},
  110 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3252},
  111 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3253},
  112 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3254},
110 113 {0,}
111 114 };
112 115  
... ... @@ -146,6 +149,11 @@
146 149 {0x3249103C, "Smart Array P812", &SA5_access},
147 150 {0x324A103C, "Smart Array P712m", &SA5_access},
148 151 {0x324B103C, "Smart Array P711m", &SA5_access},
  152 + {0x3250103C, "Smart Array", &SA5_access},
  153 + {0x3251103C, "Smart Array", &SA5_access},
  154 + {0x3252103C, "Smart Array", &SA5_access},
  155 + {0x3253103C, "Smart Array", &SA5_access},
  156 + {0x3254103C, "Smart Array", &SA5_access},
149 157 };
150 158  
151 159 /* How long to wait (in milliseconds) for board to go into simple mode */