PATCH: Update the AMD driver to support the AMD CS5536. Also add enablebit support
This brings it back into line with the drivers/ide code. The full 5536 PCI identifiers are included. Trim to preference obviously
Signed-off-by Alan Cox <[email protected]>
drivers/scsi/pata_amd.c +22 -2
@@ -30,7 +30,7 @@#include <linux/libata.h> #define DRV_NAME "pata_amd" -#define DRV_VERSION "0.1" +#define DRV_VERSION "0.1.2"/** * timing_setup - shared timing computation and load
@@ -147,6 +147,17 @@static void amd_phy_reset (struct ata_port *ap) { +struct pci_dev *pdev =to_pci_dev (ap->host_set->dev); +static struct pci_bits amd_enable_bits[] = { + {0x40 ,0x02 ,0x02 }, + {0x40 ,0x01 ,0x01 } + }; + +if (!pci_test_config_bits (pdev, &amd_enable_bits[ap->hard_port_no])) { +ata_port_disable (ap); +printk (KERN_INFO "ata%u: port disabled. ignoring.\n" , ap->id); +return ; + } ap->cbl =amd_cable_detect (ap);ata_bus_reset (ap);ata_port_probe (ap);
@@ -471,7 +482,7 @@static int amd_init_one (struct pci_dev *pdev,const struct pci_device_id *id) { -static struct ata_port_info info[9 ] = { +static struct ata_port_info info[10 ] = { {/* 0: AMD 7401 */ .sht = &amd_sht, .host_flags =ATA_FLAG_SLAVE_POSS |ATA_FLAG_SRST ,
@@ -543,6 +554,14 @@ .mwdma_mask = 0x07, .udma_mask = 0x7f, /* UDMA 133, no swdma */ .port_ops = &nv133_port_ops + }, + {/* 9: AMD CS5536 (Geode companion) */ + .sht = &amd_sht, + .host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, + .pio_mask = 0x1f, + .mwdma_mask = 0x07, + .udma_mask = 0x3f, /* UDMA 100 */ + .port_ops = &amd100_port_ops } };static struct ata_port_info *port_info[2 ];
@@ -590,6 +609,7 @@ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 }, { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 }, { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 }, + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 }, { 0, }, };
include/linux/pci_ids.h +8 -0
@@ -490,6 +490,14 @@#define PCI_DEVICE_ID_AMD_8111_AUDIO 0x746d#define PCI_DEVICE_ID_AMD_8151_0 0x7454#define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 +#define PCI_DEVICE_ID_AMD_CS5536_ISA 0x2090 +#define PCI_DEVICE_ID_AMD_CS5536_FLASH 0x2091 +#define PCI_DEVICE_ID_AMD_CS5536_AUDIO 0x2093 +#define PCI_DEVICE_ID_AMD_CS5536_OHC 0x2094 +#define PCI_DEVICE_ID_AMD_CS5536_EHC 0x2095 +#define PCI_DEVICE_ID_AMD_CS5536_UDC 0x2096 +#define PCI_DEVICE_ID_AMD_CS5536_UOC 0x2097 +#define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A#define PCI_VENDOR_ID_TRIDENT 0x1023#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
Jeff Garzik
Appliedapplied