From: Jeff Garzik <jeff@garzik.org>
To: Andrew Chew <achew@nvidia.com>
Cc: linux-kernel@vger.kernel.org,
"linux-ide@vger.kernel.org" <linux-ide@vger.kernel.org>
Subject: Re: [PATCH] Add MCP65 support for ahci driver
Date: Thu, 22 Jun 2006 23:04:19 -0400 [thread overview]
Message-ID: <449B5A33.2070701@garzik.org> (raw)
In-Reply-To: <1150962004.5109.9.camel@achew-linux>
[-- Attachment #1: Type: text/plain, Size: 1961 bytes --]
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
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 1576 bytes --]
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 */
};
parent reply other threads:[~2006-06-23 3:04 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <1150962004.5109.9.camel@achew-linux>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=449B5A33.2070701@garzik.org \
--to=jeff@garzik.org \
--cc=achew@nvidia.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).