Re: [PATCH] Add MCP65 support for ahci driver

[Jeff Garzik <jeff@garzik.org>]

Andrew Chew wrote:
> diff -uprN -X linux-2.6.16.19/Documentation/dontdiff linux-2.6.16.19.original/drivers/scsi/ahci.c linux-2.6.16.19/drivers/scsi/ahci.c
> --- linux-2.6.16.19.original/drivers/scsi/ahci.c	2006-05-30 17:31:44.000000000 -0700
> +++ linux-2.6.16.19/drivers/scsi/ahci.c	2006-06-05 17:17:57.000000000 -0700
> @@ -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 */
>  };
>  
> diff -uprN -X linux-2.6.16.19/Documentation/dontdiff linux-2.6.16.19.original/include/linux/pci_ids.h linux-2.6.16.19/include/linux/pci_ids.h
> --- linux-2.6.16.19.original/include/linux/pci_ids.h	2006-05-30 17:31:44.000000000 -0700
> +++ linux-2.6.16.19/include/linux/pci_ids.h	2006-06-05 17:14:47.000000000 -0700
> @@ -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_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

Thanks.  I wound up committing the attached patch rather than yours...

	Jeff


diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index e261b37..82ecdef 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -285,6 +285,7 @@ static const struct ata_port_info ahci_p
 };
 
 static const struct pci_device_id ahci_pci_tbl[] = {
+	/* Intel */
 	{ PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci }, /* ICH6 */
 	{ PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
@@ -315,16 +316,33 @@ static const struct pci_device_id ahci_p
 	  board_ahci }, /* ICH8M */
 	{ PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci }, /* ICH8M */
+
+	/* JMicron */
 	{ 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci }, /* JMicron JMB360 */
 	{ 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci }, /* JMicron JMB363 */
+
+	/* ATI */
 	{ PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci }, /* ATI SB600 non-raid */
 	{ PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci }, /* ATI SB600 raid */
+
+	/* VIA */
 	{ PCI_VENDOR_ID_VIA, 0x3349, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci_vt8251 }, /* VIA VT8251 */
+
+	/* NVIDIA */
+	{ PCI_VENDOR_ID_NVIDIA, 0x044c, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci },		/* MCP65 */
+	{ PCI_VENDOR_ID_NVIDIA, 0x044d, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci },		/* MCP65 */
+	{ PCI_VENDOR_ID_NVIDIA, 0x044e, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci },		/* MCP65 */
+	{ PCI_VENDOR_ID_NVIDIA, 0x044f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci },		/* MCP65 */
+
 	{ }	/* terminate list */
 };