From linux-kernel-owner+willy=40w.ods.org-S261502AbVDNNrr@vger.kernel.org Thu Apr 14 15:51:12 2005 Return-Path: Received: from vger.kernel.org (vger.kernel.org [12.107.209.244]) by mail.w.ods.org (8.12.9/8.12.1) with ESMTP id j3EDp7ad012965 for ; Thu, 14 Apr 2005 15:51:11 +0200 (CEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261502AbVDNNrr (ORCPT ); Thu, 14 Apr 2005 09:47:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261504AbVDNNrr (ORCPT ); Thu, 14 Apr 2005 09:47:47 -0400 Received: from hqemgate01.nvidia.com ([216.228.112.170]:11315 "EHLO HQEMGATE01.nvidia.com") by vger.kernel.org with ESMTP id S261502AbVDNNrk convert rfc822-to-8bit (ORCPT ); Thu, 14 Apr 2005 09:47:40 -0400 Received: from hqemfe03.nvidia.com (Not Verified[172.16.227.123]) by HQEMGATE01.nvidia.com id ; Thu, 14 Apr 2005 06:48:12 -0700 Received: from hqemmail02.nvidia.com ([172.16.227.143]) by hqemfe03.nvidia.com with Microsoft SMTPSVC(6.0.3790.211); Thu, 14 Apr 2005 06:47:36 -0700 X-MimeOLE: Produced By Microsoft Exchange V6.5.7226.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.30] New NVIDIA device IDs Date: Thu, 14 Apr 2005 06:47:36 -0700 Message-ID: <8E5ACAE05E6B9E44A2903C693A5D4E8A04A47E48@hqemmail02.nvidia.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH] [2.4.30] New NVIDIA device IDs Thread-Index: AcVA+O453gJHIXHcQDesokKXWmF6qA== From: "Andy Currid" To: X-OriginalArrivalTime: 14 Apr 2005 13:47:36.0774 (UTC) FILETIME=[846D2660:01C540F8] Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org Status: RO Content-Length: 4102 Lines: 125 This patch against kernel 2.4.30 adds PCI device IDs for future NVIDIA silicon, and patches the amd74xx IDE and sata_nv SATA drivers to support them. Andy -- Andy Currid, NVIDIA Corporation acurrid@nvidia.com 408 566 6743 -- diff -pur linux-2.4.30/drivers/ide/pci/amd74xx.c patch-2.4.30/drivers/ide/pci/amd74xx.c --- linux-2.4.30/drivers/ide/pci/amd74xx.c 2004-11-17 03:54:21.000000000 -0800 +++ patch-2.4.30/drivers/ide/pci/amd74xx.c 2005-04-14 06:19:49.895983240 -0700 @@ -71,6 +71,7 @@ static struct amd_ide_chip { { PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2, 0x50, AMD_UDMA_133 }, { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE, 0x50, AMD_UDMA_133 }, { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, 0x50, AMD_UDMA_133 }, + { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, 0x50, AMD_UDMA_133 }, { 0 } }; @@ -473,6 +474,7 @@ static struct pci_device_id amd74xx_pci_ #endif { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13 }, { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 }, { 0, }, }; diff -pur linux-2.4.30/drivers/ide/pci/amd74xx.h patch-2.4.30/drivers/ide/pci/amd74xx.h --- linux-2.4.30/drivers/ide/pci/amd74xx.h 2004-11-17 03:54:21.000000000 -0800 +++ patch-2.4.30/drivers/ide/pci/amd74xx.h 2005-04-14 06:22:30.597552888 -0700 @@ -197,6 +197,17 @@ static ide_pci_device_t amd74xx_chipsets .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}}, .bootable = ON_BOARD, }, + { /* 15 */ + .vendor = PCI_VENDOR_ID_NVIDIA, + .device = PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, + .name = "NFORCE-MCP51", + .init_chipset = init_chipset_amd74xx, + .init_hwif = init_hwif_amd74xx, + .channels = 2, + .autodma = AUTODMA, + .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}}, + .bootable = ON_BOARD, + }, { .vendor = 0, .device = 0, diff -pur linux-2.4.30/drivers/scsi/sata_nv.c patch-2.4.30/drivers/scsi/sata_nv.c --- linux-2.4.30/drivers/scsi/sata_nv.c 2005-04-03 18:42:19.000000000 -0700 +++ patch-2.4.30/drivers/scsi/sata_nv.c 2005-04-14 06:23:30.876389112 -0700 @@ -20,6 +20,9 @@ * If you do not delete the provisions above, a recipient may use your * version of this file under either the OSL or the GPL. * + * 0.07 + * - Added support for RAID class code. + * * 0.06 * - Added generic SATA support by using a pci_device_id that filters on * the IDE storage class code. @@ -48,7 +51,7 @@ #include #define DRV_NAME "sata_nv" -#define DRV_VERSION "0.6" +#define DRV_VERSION "0.7" #define NV_PORTS 2 #define NV_PIO_MASK 0x1f @@ -137,6 +140,9 @@ static struct pci_device_id nv_pci_tbl[] { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC }, + { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, + PCI_ANY_ID, PCI_ANY_ID, + PCI_CLASS_STORAGE_RAID<<8, 0xffff00, GENERIC }, { 0, } /* terminate list */ }; diff -pur linux-2.4.30/include/linux/pci_ids.h patch-2.4.30/include/linux/pci_ids.h --- linux-2.4.30/include/linux/pci_ids.h 2005-04-03 18:42:20.000000000 -0700 +++ patch-2.4.30/include/linux/pci_ids.h 2005-04-14 06:16:27.223794096 -0700 @@ -1034,6 +1034,12 @@ #define PCI_DEVICE_ID_NVIDIA_GEFORCE3_1 0x0201 #define PCI_DEVICE_ID_NVIDIA_GEFORCE3_2 0x0202 #define PCI_DEVICE_ID_NVIDIA_QUADRO_DDC 0x0203 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE 0x0265 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA 0x0266 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2 0x0267 +#define PCI_DEVICE_ID_NVIDIA_NVENET_12 0x0268 +#define PCI_DEVICE_ID_NVIDIA_NVENET_13 0x0269 +#define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO 0x026B #define PCI_VENDOR_ID_IMS 0x10e0 #define PCI_DEVICE_ID_IMS_8849 0x8849 - 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/