The patch titled
areca-raid-linux-scsi-driver update5
has been removed from the -mm tree. Its filename is
areca-raid-linux-scsi-driver-update5.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Erich Chen <erich@xxxxxxxxxxxx>
1- modify ARCMSR_MAX_XFER_SECTORS 4096 into 512
2- add new SAS RAID Adapter device id
Signed-off-by: Erich Chen <erich@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/arcmsr/arcmsr.h | 2
drivers/scsi/arcmsr/arcmsr_hba.c | 80 ++++++++---------------------
include/linux/pci_ids.h | 4 +
3 files changed, 28 insertions(+), 58 deletions(-)
diff -puN drivers/scsi/arcmsr/arcmsr.h~areca-raid-linux-scsi-driver-update5 drivers/scsi/arcmsr/arcmsr.h
--- devel/drivers/scsi/arcmsr/arcmsr.h~areca-raid-linux-scsi-driver-update5 2006-04-06 18:03:04.000000000 -0700
+++ devel-akpm/drivers/scsi/arcmsr/arcmsr.h 2006-04-06 18:03:04.000000000 -0700
@@ -48,7 +48,7 @@
#define ARCMSR_MAX_FREECCB_NUM 288
#define ARCMSR_DRIVER_VERSION "Driver Version 1.20.00.13"
#define ARCMSR_SCSI_INITIATOR_ID 255
-#define ARCMSR_MAX_XFER_SECTORS 4096
+#define ARCMSR_MAX_XFER_SECTORS 512
#define ARCMSR_MAX_TARGETID 17
#define ARCMSR_MAX_TARGETLUN 8
#define ARCMSR_MAX_CMD_PERLUN ARCMSR_MAX_OUTSTANDING_CMD
diff -puN drivers/scsi/arcmsr/arcmsr_hba.c~areca-raid-linux-scsi-driver-update5 drivers/scsi/arcmsr/arcmsr_hba.c
--- devel/drivers/scsi/arcmsr/arcmsr_hba.c~areca-raid-linux-scsi-driver-update5 2006-04-06 18:03:04.000000000 -0700
+++ devel-akpm/drivers/scsi/arcmsr/arcmsr_hba.c 2006-04-06 18:03:04.000000000 -0700
@@ -133,6 +133,10 @@ static struct pci_device_id arcmsr_devic
{PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1260)},
{PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1270)},
{PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1280)},
+ {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1380)},
+ {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1381)},
+ {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1680)},
+ {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1681)},
{0, 0}, /* Terminating entry */
};
MODULE_DEVICE_TABLE(pci, arcmsr_device_id_table);
@@ -1357,80 +1361,42 @@ static const char *arcmsr_info(struct Sc
pACB = (struct AdapterControlBlock *) host->hostdata;
device_id = pACB->pdev->device;
switch(device_id) {
- case PCI_DEVICE_ID_ARECA_1110: {
+ case PCI_DEVICE_ID_ARECA_1110:
+ case PCI_DEVICE_ID_ARECA_1210:{
sprintf(buf,
- "ARECA ARC1110 PCI-X 4 PORTS SATA RAID CONTROLLER "
+ "ARECA SATA HOST ADAPTER RAID CONTROLLER "
"\n %s"
, ARCMSR_DRIVER_VERSION);
break;
}
- case PCI_DEVICE_ID_ARECA_1120: {
+ case PCI_DEVICE_ID_ARECA_1120:
+ case PCI_DEVICE_ID_ARECA_1130:
+ case PCI_DEVICE_ID_ARECA_1160:
+ case PCI_DEVICE_ID_ARECA_1170:
+ case PCI_DEVICE_ID_ARECA_1220:
+ case PCI_DEVICE_ID_ARECA_1230:
+ case PCI_DEVICE_ID_ARECA_1260:
+ case PCI_DEVICE_ID_ARECA_1270:
+ case PCI_DEVICE_ID_ARECA_1280: {
sprintf(buf,
- "ARECA ARC1120 PCI-X 8 PORTS SATA RAID CONTROLLER "
+ "ARECA SATA HOST ADAPTER RAID CONTROLLER "
"(RAID6-ENGINE Inside)\n %s"
, ARCMSR_DRIVER_VERSION);
break;
}
- case PCI_DEVICE_ID_ARECA_1130: {
+ case PCI_DEVICE_ID_ARECA_1380:
+ case PCI_DEVICE_ID_ARECA_1381:
+ case PCI_DEVICE_ID_ARECA_1680:
+ case PCI_DEVICE_ID_ARECA_1681: {
sprintf(buf,
- "ARECA ARC1130 PCI-X 12 PORTS SATA RAID CONTROLLER "
+ "ARECA SAS HOST ADAPTER RAID CONTROLLER "
"(RAID6-ENGINE Inside)\n %s"
, ARCMSR_DRIVER_VERSION);
break;
}
- case PCI_DEVICE_ID_ARECA_1160: {
- sprintf(buf,
- "ARECA ARC1160 PCI-X 16 PORTS SATA RAID CONTROLLER "
- "(RAID6-ENGINE Inside)\n %s"
- , ARCMSR_DRIVER_VERSION);
- break;
- }
- case PCI_DEVICE_ID_ARECA_1170: {
- sprintf(buf,
- "ARECA ARC1170 PCI-X 24 PORTS SATA RAID CONTROLLER "
- "(RAID6-ENGINE Inside)\n %s"
- , ARCMSR_DRIVER_VERSION);
- break;
- }
- case PCI_DEVICE_ID_ARECA_1210: {
- sprintf(buf,
- "ARECA ARC1210 PCI-EXPRESS 4 PORTS SATA RAID CONTROLLER "
- "\n %s"
- , ARCMSR_DRIVER_VERSION);
- break;
- }
- case PCI_DEVICE_ID_ARECA_1220: {
- sprintf(buf,
- "ARECA ARC1220 PCI-EXPRESS 8 PORTS SATA RAID CONTROLLER "
- "(RAID6-ENGINE Inside)\n %s"
- , ARCMSR_DRIVER_VERSION);
- break;
- }
- case PCI_DEVICE_ID_ARECA_1230: {
- sprintf(buf,
- "ARECA ARC1230 PCI-EXPRESS 12 PORTS SATA RAID CONTROLLER "
- "(RAID6-ENGINE Inside)\n %s"
- , ARCMSR_DRIVER_VERSION);
- break;
- }
- case PCI_DEVICE_ID_ARECA_1260: {
- sprintf(buf,
- "ARECA ARC1260 PCI-EXPRESS 16 PORTS SATA RAID CONTROLLER "
- "(RAID6-ENGINE Inside)\n %s"
- , ARCMSR_DRIVER_VERSION);
- break;
- }
- case PCI_DEVICE_ID_ARECA_1270: {
- sprintf(buf,
- "ARECA ARC1270 PCI-EXPRESS 24 PORTS SATA RAID CONTROLLER "
- "(RAID6-ENGINE Inside)\n %s"
- , ARCMSR_DRIVER_VERSION);
- break;
- }
- case PCI_DEVICE_ID_ARECA_1280:
default: {
sprintf(buf,
- "ARECA X-TYPE SATA RAID CONTROLLER "
+ "ARECA X-TYPE HOST ADAPTER RAID CONTROLLER "
"(RAID6-ENGINE Inside)\n %s"
, ARCMSR_DRIVER_VERSION);
break;
diff -puN include/linux/pci_ids.h~areca-raid-linux-scsi-driver-update5 include/linux/pci_ids.h
--- devel/include/linux/pci_ids.h~areca-raid-linux-scsi-driver-update5 2006-04-06 18:03:04.000000000 -0700
+++ devel-akpm/include/linux/pci_ids.h 2006-04-06 18:03:04.000000000 -0700
@@ -1981,6 +1981,10 @@
#define PCI_DEVICE_ID_ARECA_1260 0x1260
#define PCI_DEVICE_ID_ARECA_1270 0x1270
#define PCI_DEVICE_ID_ARECA_1280 0x1280
+#define PCI_DEVICE_ID_ARECA_1380 0x1380
+#define PCI_DEVICE_ID_ARECA_1381 0x1381
+#define PCI_DEVICE_ID_ARECA_1680 0x1680
+#define PCI_DEVICE_ID_ARECA_1681 0x1681
#define PCI_VENDOR_ID_S2IO 0x17d5
#define PCI_DEVICE_ID_S2IO_WIN 0x5731
_
Patches currently in -mm which might be from erich@xxxxxxxxxxxx are
areca-raid-linux-scsi-driver.patch
areca-raid-linux-scsi-driver-update5.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
