* [PATCH] Add MCP65 support for sata_nv driver
@ 2006-06-22 7:38 Andrew Chew
2006-06-23 3:07 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: Andrew Chew @ 2006-06-22 7:38 UTC (permalink / raw)
To: linux-kernel; +Cc: jeff
Splitting up patch and resending.
This patch adds MCP65 SATA controller support to the sata_nv driver.
Signed-off-by: Andrew Chew <achew@nvidia.com>
diff -uprN -X linux-2.6.16.19/Documentation/dontdiff linux-2.6.16.19.original/drivers/scsi/sata_nv.c linux-2.6.16.19/drivers/scsi/sata_nv.c
--- linux-2.6.16.19.original/drivers/scsi/sata_nv.c 2006-05-30 17:31:44.000000000 -0700
+++ linux-2.6.16.19/drivers/scsi/sata_nv.c 2006-06-05 17:20:48.000000000 -0700
@@ -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 */
};
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_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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Add MCP65 support for sata_nv driver
2006-06-22 7:38 [PATCH] Add MCP65 support for sata_nv driver Andrew Chew
@ 2006-06-23 3:07 ` Jeff Garzik
2006-06-23 3:13 ` Jeff Garzik
2006-06-23 21:16 ` Andrew Chew
0 siblings, 2 replies; 5+ messages in thread
From: Jeff Garzik @ 2006-06-23 3:07 UTC (permalink / raw)
To: Andrew Chew; +Cc: linux-kernel
Andrew Chew wrote:
> Splitting up patch and resending.
>
> This patch adds MCP65 SATA controller support to the sata_nv driver.
>
> Signed-off-by: Andrew Chew <achew@nvidia.com>
>
>
>
>
> diff -uprN -X linux-2.6.16.19/Documentation/dontdiff linux-2.6.16.19.original/drivers/scsi/sata_nv.c linux-2.6.16.19/drivers/scsi/sata_nv.c
> --- linux-2.6.16.19.original/drivers/scsi/sata_nv.c 2006-05-30 17:31:44.000000000 -0700
> +++ linux-2.6.16.19/drivers/scsi/sata_nv.c 2006-06-05 17:20:48.000000000 -0700
> @@ -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 },
Why do you want to remove the RAID PCI ID? That was not mentioned in
the patch description at all.
Jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Add MCP65 support for sata_nv driver
2006-06-23 3:07 ` Jeff Garzik
@ 2006-06-23 3:13 ` Jeff Garzik
2006-06-23 21:16 ` Andrew Chew
1 sibling, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2006-06-23 3:13 UTC (permalink / raw)
To: Andrew Chew; +Cc: linux-kernel, linux-ide
[-- Attachment #1: Type: text/plain, Size: 129 bytes --]
I just committed the abbreviated version of the sata_nv patch (see
attached)... that will get things going at least.
Jeff
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 822 bytes --]
c57c064994f1544a5ed2e9b319ebd0bc087ea540
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index be8650f..d18e7e0 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -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 },
^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH] Add MCP65 support for sata_nv driver
2006-06-23 3:07 ` Jeff Garzik
2006-06-23 3:13 ` Jeff Garzik
@ 2006-06-23 21:16 ` Andrew Chew
2006-06-23 21:32 ` Jeff Garzik
1 sibling, 1 reply; 5+ messages in thread
From: Andrew Chew @ 2006-06-23 21:16 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-kernel
> 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.
-----------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Add MCP65 support for sata_nv driver
2006-06-23 21:16 ` Andrew Chew
@ 2006-06-23 21:32 ` Jeff Garzik
0 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2006-06-23 21:32 UTC (permalink / raw)
To: Andrew Chew; +Cc: linux-kernel
Andrew Chew wrote:
>> 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.
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-06-23 21:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-06-22 7:38 [PATCH] Add MCP65 support for sata_nv driver Andrew Chew
2006-06-23 3:07 ` Jeff Garzik
2006-06-23 3:13 ` Jeff Garzik
2006-06-23 21:16 ` Andrew Chew
2006-06-23 21:32 ` Jeff Garzik
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).