Add MCP65 support for amd74xx, sata_nv, and ahci drivers (and device ids in pci_ids)
PATCH 1/1 Add MCP65 support for amd74xx, sata_nv, and ahci drivers (and device ids in pci_ids)
Adds MCP65 device IDs to the amd74xx IDE driver, the sata_nv SATA driver (for MCP65 SATA in legacy SATA mode), and ahci driver (for MCP65 in AHCI mode). Also added MCP65 device IDs in pci_ids.h.
Signed-off-by Andrew Chew <[email protected]>
drivers/ide/pci/amd74xx.c +5 -2
@@ -74,6 +74,7 @@ static struct amd_ide_chip { { 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_MCP65_IDE, 0x50, AMD_UDMA_133 }, { PCI_DEVICE_ID_AMD_CS5536_IDE, 0x40, AMD_UDMA_100 }, { 0 } };
@@ -492,7 +493,8 @@ static ide_pci_device_t amd74xx_chipsets/* 14 */ DECLARE_NV_DEV ("NFORCE-MCP04" ),/* 15 */ DECLARE_NV_DEV ("NFORCE-MCP51" ),/* 16 */ DECLARE_NV_DEV ("NFORCE-MCP55" ), - /* 17 */ DECLARE_AMD_DEV("AMD5536"), +/* 17 */ DECLARE_NV_DEV ("NFORCE-MCP65" ), + /* 18 */ DECLARE_AMD_DEV("AMD5536"), };static int __devinit amd74xx_probe (struct pci_dev *dev,const struct pci_device_id *id)
@@ -529,7 +531,8 @@ static struct pci_device_id amd74xx_pci_ { 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_AMD, PCI_DEVICE_ID_AMD_CS5536_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, 17 }, + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 }, { 0, }, };MODULE_DEVICE_TABLE (pci, amd74xx_pci_tbl);
drivers/scsi/ahci.c +12 -0
@@ -290,6 +290,18 @@ static const struct pci_device_id ahci_p board_ahci }, /* JMicron JMB360 */ {0x197b ,0x2363 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , board_ahci }, /* JMicron JMB363 */ + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + board_ahci }, /* MCP65 */ + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI2, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + board_ahci }, /* MCP65 */ + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI3, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + board_ahci }, /* MCP65 */ + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI4, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + board_ahci }, /* MCP65 */ { } /* terminate list */ };
drivers/scsi/sata_nv.c +8 -3
@@ -166,12 +166,17 @@ static const struct pci_device_id nv_pci 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_MCP65_SATA, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA2, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA3, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA4, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, { 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 */ };
include/linux/pci_ids.h +9 -0
@@ -1171,6 +1171,15 @@#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100 0x034E#define PCI_DEVICE_ID_NVIDIA_NVENET_14 0x0372#define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE 0x0448 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI 0x044C +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI2 0x044D +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI3 0x044E +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI4 0x044F +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA 0x045C +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA2 0x045D +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA3 0x045E +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA4 0x045F#define PCI_VENDOR_ID_IMS 0x10e0#define PCI_DEVICE_ID_IMS_TT128 0x9128
drivers/ide/pci/amd74xx.c +5 -2
@@ -74,6 +74,7 @@ static struct amd_ide_chip { { 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_MCP65_IDE, 0x50, AMD_UDMA_133 }, { PCI_DEVICE_ID_AMD_CS5536_IDE, 0x40, AMD_UDMA_100 }, { 0 } };
@@ -492,7 +493,8 @@ static ide_pci_device_t amd74xx_chipsets/* 14 */ DECLARE_NV_DEV ("NFORCE-MCP04" ),/* 15 */ DECLARE_NV_DEV ("NFORCE-MCP51" ),/* 16 */ DECLARE_NV_DEV ("NFORCE-MCP55" ), - /* 17 */ DECLARE_AMD_DEV("AMD5536"), +/* 17 */ DECLARE_NV_DEV ("NFORCE-MCP65" ), + /* 18 */ DECLARE_AMD_DEV("AMD5536"), };static int __devinit amd74xx_probe (struct pci_dev *dev,const struct pci_device_id *id)
@@ -529,7 +531,8 @@ static struct pci_device_id amd74xx_pci_ { 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_AMD, PCI_DEVICE_ID_AMD_CS5536_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, 17 }, + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 }, { 0, }, };MODULE_DEVICE_TABLE (pci, amd74xx_pci_tbl);
drivers/scsi/ahci.c +12 -0
@@ -290,6 +290,18 @@ static const struct pci_device_id ahci_p board_ahci }, /* JMicron JMB360 */ {0x197b ,0x2363 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , board_ahci }, /* JMicron JMB363 */ + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + board_ahci }, /* MCP65 */ + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI2, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + board_ahci }, /* MCP65 */ + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI3, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + board_ahci }, /* MCP65 */ + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI4, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + board_ahci }, /* MCP65 */ { } /* terminate list */ };
drivers/scsi/sata_nv.c +8 -3
@@ -166,12 +166,17 @@ static const struct pci_device_id nv_pci 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_MCP65_SATA, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA2, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA3, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA4, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, { 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 */ };
include/linux/pci_ids.h +9 -0
@@ -1171,6 +1171,15 @@#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100 0x034E#define PCI_DEVICE_ID_NVIDIA_NVENET_14 0x0372#define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE 0x0448 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI 0x044C +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI2 0x044D +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI3 0x044E +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_AHCI4 0x044F +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA 0x045C +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA2 0x045D +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA3 0x045E +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SATA4 0x045F#define PCI_VENDOR_ID_IMS 0x10e0#define PCI_DEVICE_ID_IMS_TT128 0x9128
Quoted 5 lines · Andrew Chew
Adds MCP65 device IDs to the amd74xx IDE driver, the
sata_nvSATA driver (for MCP65 SATA in legacy SATA mode), and ahci driver (for MCP65 in AHCI mode). Also added MCP65 device IDs inpci_ids.h.Signed-off-by Andrew Chew <[email protected]>
Please split up your patches into libata and non-libata pieces... I've already applied your MCP61 patch, for example, but drivers/ide still does not have it.
Jeff