SOURCES: linux-2.4-ide-update.patch - AMD/NFORCE IDE backports fro...

qboosh qboosh at pld-linux.org
Thu Aug 17 13:44:56 CEST 2006 

Author: qboosh                       Date: Thu Aug 17 11:44:56 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- AMD/NFORCE IDE backports from 2.6.18-rc4 (including NFORCE-MCP61/MCP65 SATA support)

---- Files affected:
SOURCES:
   linux-2.4-ide-update.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.4-ide-update.patch
diff -u SOURCES/linux-2.4-ide-update.patch:1.1 SOURCES/linux-2.4-ide-update.patch:1.2
--- SOURCES/linux-2.4-ide-update.patch:1.1	Thu Aug 17 12:37:35 2006
+++ SOURCES/linux-2.4-ide-update.patch	Thu Aug 17 13:44:51 2006
@@ -1,6 +1,27 @@
 --- linux-2.4.33/include/linux/pci_ids.h.orig	2006-08-17 11:02:44.215971000 +0200
 +++ linux-2.4.33/include/linux/pci_ids.h	2006-08-17 12:11:45.195971000 +0200
-@@ -1939,6 +1939,7 @@
+@@ -469,6 +469,8 @@
+ #define PCI_DEVICE_ID_AMD_8111_AUDIO	0x746d
+ #define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
+ 
++#define PCI_DEVICE_ID_AMD_CS5536_IDE	0x209A
++
+ #define PCI_VENDOR_ID_TRIDENT		0x1023
+ #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000
+ #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX	0x2001
+@@ -1052,6 +1054,11 @@
+ #define PCI_DEVICE_ID_NVIDIA_NVENET_15		0x0373
+ #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA	0x037E
+ #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2	0x037F
++#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA	0x03E7
++#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE	0x03EC
++#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2	0x03F6
++#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3	0x03F7
++#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE	0x0448
+ 
+ #define PCI_VENDOR_ID_IMS		0x10e0
+ #define PCI_DEVICE_ID_IMS_8849		0x8849
+@@ -1939,6 +1946,7 @@
  #define PCI_DEVICE_ID_INTEL_82801CA_11	0x248b
  #define PCI_DEVICE_ID_INTEL_82801CA_12	0x248c
  #define PCI_DEVICE_ID_INTEL_82801DB_0	0x24c0
@@ -8,7 +29,7 @@
  #define PCI_DEVICE_ID_INTEL_82801DB_2	0x24c2
  #define PCI_DEVICE_ID_INTEL_82801DB_3	0x24c3
  #define PCI_DEVICE_ID_INTEL_82801DB_4	0x24c4
-@@ -1975,8 +1976,21 @@
+@@ -1975,8 +1983,21 @@
  #define PCI_DEVICE_ID_INTEL_ESB_13	0x25ae
  #define PCI_DEVICE_ID_INTEL_ICH6_0	0x2640
  #define PCI_DEVICE_ID_INTEL_ICH6_1	0x2641
@@ -210,3 +231,136 @@
  	},{
  		.vendor		= 0,
  		.device		= 0,
+--- linux-2.4.33/include/linux/pci_ids.h.orig	2006-08-17 13:01:02.115971000 +0200
++++ linux-2.4.33/include/linux/pci_ids.h	2006-08-17 13:31:36.175971000 +0200
+--- linux-2.4.33/drivers/ide/pci/amd74xx.c.orig	2004-11-17 12:54:21.000000000 +0100
++++ linux-2.4.33/drivers/ide/pci/amd74xx.c	2006-08-17 13:32:05.035971000 +0200
+@@ -71,6 +71,11 @@
+ 	{ 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 },
++	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,	0x50, AMD_UDMA_133 },
++	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,	0x50, AMD_UDMA_133 },
++	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,	0x50, AMD_UDMA_133 },
++	{ PCI_DEVICE_ID_AMD_CS5536_IDE,			0x40, AMD_UDMA_133 },
+ 	{ 0 }
+ };
+ 
+@@ -341,10 +346,8 @@
+ 			break;
+ 
+ 		case AMD_UDMA_66:
+-			pci_read_config_dword(dev, AMD_UDMA_TIMING, &u);
+-			for (i = 24; i >= 0; i -= 8)
+-				if ((u >> i) & 4)
+-					amd_80w |= (1 << (1 - (i >> 4)));
++			/* no host side cable detection */
++			amd_80w = 0x3;
+ 			break;
+ 	}
+ 
+@@ -380,8 +383,6 @@
+ 	if (amd_clock < 20000 || amd_clock > 50000) {
+ 		printk(KERN_WARNING "%s: User given PCI clock speed impossible (%d), using 33 MHz instead.\n",
+ 			amd_chipset->name, amd_clock);
+-		printk(KERN_WARNING "%s: Use ide0=ata66 if you want to assume 80-wire cable\n",
+-			amd_chipset->name);
+ 		amd_clock = 33333;
+ 	}
+ 
+@@ -473,6 +474,11 @@
+ #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 },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 },
++	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE,		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19 },
+ 	{ 0, },
+ };
+ 
+--- linux-2.4.33/drivers/ide/pci/amd74xx.h.orig	2006-08-17 13:14:23.685971000 +0200
++++ linux-2.4.33/drivers/ide/pci/amd74xx.h	2006-08-17 13:32:20.955971000 +0200
+@@ -197,6 +197,61 @@
+ 		.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,
++	},
++	{	/* 16 */
++		.vendor		= PCI_VENDOR_ID_NVIDIA,
++		.device		= PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,
++		.name		= "NFORCE-MCP55",
++		.init_chipset	= init_chipset_amd74xx,
++		.init_hwif	= init_hwif_amd74xx,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
++		.bootable	= ON_BOARD,
++	},
++	{	/* 17 */
++		.vendor		= PCI_VENDOR_ID_NVIDIA,
++		.device		= PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,
++		.name		= "NFORCE-MCP61",
++		.init_chipset	= init_chipset_amd74xx,
++		.init_hwif	= init_hwif_amd74xx,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
++		.bootable	= ON_BOARD,
++	},
++	{	/* 18 */
++		.vendor		= PCI_VENDOR_ID_NVIDIA,
++		.device		= PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,
++		.name		= "NFORCE-MCP65",
++		.init_chipset	= init_chipset_amd74xx,
++		.init_hwif	= init_hwif_amd74xx,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
++		.bootable	= ON_BOARD,
++	},
++	{	/* 19 */
++		.vendor		= PCI_VENDOR_ID_AMD,
++		.device		= PCI_DEVICE_ID_AMD_CS5536_IDE,
++		.name		= "AMD5536",
++		.init_chipset	= init_chipset_amd74xx,
++		.init_hwif	= init_hwif_amd74xx,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
++		.bootable	= ON_BOARD,
++	},
+ 	{
+ 		.vendor		= 0,
+ 		.device		= 0,
+--- linux-2.4.33/drivers/scsi/sata_nv.c.orig	2006-08-11 06:18:20.000000000 +0200
++++ linux-2.4.33/drivers/scsi/sata_nv.c	2006-08-17 13:36:47.165971000 +0200
+@@ -160,6 +160,16 @@
+ 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
+ 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,
+ 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA,
++		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2,
++		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3,
++		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
++	{ PCI_VENDOR_ID_NVIDIA, 0x045c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, /* MCP65 */
++	{ PCI_VENDOR_ID_NVIDIA, 0x045d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, /* MCP65 */
++	{ PCI_VENDOR_ID_NVIDIA, 0x045e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, /* MCP65 */
++	{ PCI_VENDOR_ID_NVIDIA, 0x045f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, /* MCP65 */
+ 	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
+ 		PCI_ANY_ID, PCI_ANY_ID,
+ 		PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.4-ide-update.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list