Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Wed, 4 Dec 2002 18:33:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Wed, 4 Dec 2002 18:33:19 -0500 Received: from ztxmail03.ztx.compaq.com ([161.114.1.207]:44560 "EHLO ztxmail03.ztx.compaq.com") by vger.kernel.org with ESMTP id convert rfc822-to-8bit; Wed, 4 Dec 2002 18:33:18 -0500 X-MimeOLE: Produced By Microsoft Exchange V6.0.6249.0 content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT Subject: [PATCH] 2.4.20 resending cciss patch 01 - adds support for the SA641, SA642 and SA6400 controllers. Date: Wed, 4 Dec 2002 17:40:45 -0600 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH] 2.4.20 resending cciss patch 01 - adds support for the SA641, SA642 and SA6400 controllers. Thread-Index: AcKb48rIqn3VeHF2TYG9m/4OigiIRQ== From: "White, Charles" To: "Marcelo Tosatti" , "Jens Axboe" Cc: X-OriginalArrivalTime: 04 Dec 2002 23:40:45.0799 (UTC) FILETIME=[910EE770:01C29BEE] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2625 Lines: 72 I thought changing pci_ids.h should be a separate patch.. But there is the patch again with the #ifdef CISSC removed, and pci_ids.h included. The following patch adds support for the SA641, SA642 and SA6400 controllers to the cciss driver in the 2.2.20 tree. diff -urN linux-2.4.20.orig/Documentation/cciss.txt linux-2.4.20.cciss_p01/Documentation/cciss.txt --- linux-2.4.20.orig/Documentation/cciss.txt Fri Aug 2 20:39:42 2002 +++ linux-2.4.20.cciss_p01/Documentation/cciss.txt Wed Dec 4 15:05:43 2002 @@ -9,6 +9,9 @@ * SA 5i * SA 532 * SA 5312 + * SA 641 + * SA 642 + * SA 6400 If nodes are not already created in the /dev/cciss directory diff -urN linux-2.4.20.orig/drivers/block/cciss.c linux-2.4.20.cciss_p01/drivers/block/cciss.c --- linux-2.4.20.orig/drivers/block/cciss.c Thu Nov 28 18:53:12 2002 +++ linux-2.4.20.cciss_p01/drivers/block/cciss.c Wed Dec 4 17:32:22 2002 @@ -66,6 +66,12 @@ 0x0E11, 0x4082, 0, 0, 0}, { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, 0x0E11, 0x4083, 0, 0, 0}, + { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, + 0x0E11, 0x409A, 0, 0, 0}, + { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, + 0x0E11, 0x409B, 0, 0, 0}, + { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, + 0x0E11, 0x409C, 0, 0, 0}, {0,} }; MODULE_DEVICE_TABLE(pci, cciss_pci_device_id); @@ -81,6 +87,9 @@ { 0x40800E11, "Smart Array 5i", &SA5B_access}, { 0x40820E11, "Smart Array 532", &SA5B_access}, { 0x40830E11, "Smart Array 5312", &SA5B_access}, + { 0x409A0E11, "Smart Array 641", &SA5_access}, + { 0x409B0E11, "Smart Array 642", &SA5_access}, + { 0x409C0E11, "Smart Array 6400", &SA5_access}, }; /* How long to wait (in millesconds) for board to go into simple mode */ diff -urN linux-2.4.20.orig/include/linux/pci_ids.h linux-2.4.20.cciss_p01/include/linux/pci_ids.h --- linux-2.4.20.orig/include/linux/pci_ids.h Thu Nov 28 18:53:15 2002 +++ linux-2.4.20.cciss_p01/include/linux/pci_ids.h Wed Dec 4 17:32:55 2002 @@ -143,6 +143,7 @@ #define PCI_DEVICE_ID_COMPAQ_NETEL100I 0xb011 #define PCI_DEVICE_ID_COMPAQ_CISS 0xb060 #define PCI_DEVICE_ID_COMPAQ_CISSB 0xb178 +#define PCI_DEVICE_ID_COMPAQ_CISSC 0x0046 #define PCI_DEVICE_ID_COMPAQ_THUNDER 0xf130 #define PCI_DEVICE_ID_COMPAQ_NETFLEX3B 0xf150 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/