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
[EMAIL PROTECTED] 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 <linux/libata.h>
#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 [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
