Add MCP65 support for sata_nv driver
PATCH 1/1 Add MCP65 support for sata_nv driver
Splitting up patch and resending.
This patch adds MCP65 SATA controller support to the sata_nv driver.
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 +4 -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_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 20 lines · Andrew Chew
Splitting up patch and resending.
This patch adds MCP65 SATA controller support to the
sata_nvdriver.Signed-off-by Andrew Chew <[email protected]>diff -uprN -X linux-2.6.16.19/Documentation/dontdiff
linux-2.6.16.19.original/drivers/scsi/sata_nv.clinux-2.6.16.19/drivers/scsi/sata_nv.cdrivers/scsi/sata_nv.c +4
-0@@ -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 },
drivers/scsi/sata_nv.c static const struct pci_device_id nv_pci · line 174
Quoted 10 lines
drivers/scsi/sata_nv.c +4
-3+ {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 },
Why do you want to remove the RAID PCI ID? That was not mentioned in the patch description at all.
Jeff
I just committed the abbreviated version of the sata_nv patch (see attached)... that will get things going at least.
Jeff
c57c064994f1544a5ed2e9b319ebd0bc087ea540
drivers/scsi/sata_nv.c +4 -0
@@ -135,6 +135,10 @@ 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_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 }, + { PCI_VENDOR_ID_NVIDIA, 0x045d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, + { PCI_VENDOR_ID_NVIDIA, 0x045e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC }, + { PCI_VENDOR_ID_NVIDIA, 0x045f, 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 },
Quoted 2 lines
Why do you want to remove the RAID PCI ID? That was not mentioned in the patch description at all.
Sorry. NVIDIA's future SATA controllers are going to be AHCI (so for 0104 RAID mode, we want the ahci driver to pick up these controllers. We don't want future chips (chips for which we didn't add the proper device IDs yet into their respective drivers) to be picked up by sata_nv anymore.
What's missing, I realize now, is the 0104 generic entry that should be in the ahci driver. I'll send along a separate patch for that.
-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------
Quoted 10 lines · Andrew Chew
Quoted 1 line
Why do you want to remove the RAID PCI ID? That was not mentioned in the patch description at all.
Sorry. NVIDIA's future SATA controllers are going to be AHCI (so for 0104 RAID mode, we want the ahci driver to pick up these controllers. We don't want future chips (chips for which we didn't add the proper device IDs yet into their respective drivers) to be picked up by
sata_nvanymore.What's missing, I realize now, is the 0104 generic entry that should be in the ahci driver. I'll send along a separate patch for that.
I dropped the RAID-id-removal bit from the patch I forwarded to you, so you'll want to resend that. Perhaps resend it in the same patch as the ahci bit, and include what you said above, in the description.
Jeff