2006-10-31 08:07:30

by Peer Chen

[permalink] [raw]
Subject: [Patch] SCSI: Add nvidia AHCI controllers of MCP67 support to ahci.c

Add the support for AHCI controllers of MCP67.
The following ahci.c patch is based on kernel 2.6.18.

Signed-off by: Peer Chen <[email protected]>
===================================

--- ahci.c.orig 2006-10-31 13:55:47.000000000 +0800
+++ ahci.c 2006-10-31 13:56:54.000000000 +0800
@@ -349,6 +349,22 @@ static const struct pci_device_id ahci_p
board_ahci }, /* MCP65 */
{ PCI_VENDOR_ID_NVIDIA, 0x044f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* MCP65 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0554, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0555, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0556, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0557, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0558, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0559, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x055a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x055b, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */

{ } /* terminate list */
};
-----------------------------------------------------------------------------------
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.
-----------------------------------------------------------------------------------


2006-10-31 11:07:21

by Peer Chen

[permalink] [raw]
Subject: RE: [Patch] SCSI: Add nvidia AHCI controllers of MCP67 support to ahci.c

Resend the patch.
Signed-off-by: Peer Chen <[email protected]>

============================
--- linux-2.6.18/drivers/scsi/ahci.c.orig 2006-10-31
18:25:18.000000000 +0800
+++ linux-2.6.18/drivers/scsi/ahci.c 2006-10-31 18:25:18.000000000
+0800
@@ -349,6 +349,22 @@ static const struct pci_device_id ahci_p
board_ahci }, /* MCP65 */
{ PCI_VENDOR_ID_NVIDIA, 0x044f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* MCP65 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0554, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0555, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0556, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0557, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0558, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x0559, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x055a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */
+ { PCI_VENDOR_ID_NVIDIA, 0x055b, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* MCP67 */

{ } /* terminate list */
};

===============================
-----------------------------------------------------------------------------------
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.
-----------------------------------------------------------------------------------

2006-10-31 22:56:16

by Andrew Morton

[permalink] [raw]
Subject: Re: [Patch] SCSI: Add nvidia AHCI controllers of MCP67 support to ahci.c

On Tue, 31 Oct 2006 19:06:58 +0800
"Peer Chen" <[email protected]> wrote:

> Resend the patch.

This patch is still wordwrapped, is against a file which doesn't exist any more
(it moved into drivers/ata) and is wrong (ahci.c now uses helper macros in
these tables).

So please

- read http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt really
carefully. All of it.

- Download the most recent kernel from
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/ and regenerate and
retest the patches.

- Send some test patches to yourself or to a colleague, make sure that
they reach the other end in an applyable state.

then resend all of your patches: IDE, ahci, sata and hda_intel.

Thanks.

2006-11-01 01:37:23

by Jeff Garzik

[permalink] [raw]
Subject: Re: [Patch] SCSI: Add nvidia AHCI controllers of MCP67 support to ahci.c

Peer Chen wrote:
> Resend the patch.
> Signed-off-by: Peer Chen <[email protected]>

ACK everything Andrew Morton said: this patch doesn't apply to the
current kernel (2.6.19-rc4-gitX). Please resend.

libata moves fast :)

Also, a related question: does NVIDIA hardware use the PCI class code
for AHCI?

Jeff



2006-11-01 02:08:42

by Jeff Garzik

[permalink] [raw]
Subject: Re: [Patch] SCSI: Add nvidia AHCI controllers of MCP67 support to ahci.c

Peer Chen wrote:
> Yes,we use 0x010601 for AHCI controller. But we also want AHCI driver take care our 'RAID' controller,so Device IDs field in AHCI driver is necessary.

Agreed. Just taking a survey of vendors :) Most vendors similarly use
the RAID class code.

Jeff