* Re: [PATCH] add new nForce IDE/SATA device IDs
[not found] <C064BF1617D93B4B83714E38C4653A6E0AF48248@mail-sc-10.nvidia.com>
@ 2004-05-27 19:38 ` Jeff Garzik
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2004-05-27 19:38 UTC (permalink / raw)
To: Brian Lazara; +Cc: linux-kernel, linux-ide, Bartlomiej Zolnierkiewicz
Brian Lazara wrote:
> Patches to add device IDs for new nForce IDE and SATA controllers.
> Rename some of the existing controller names to correctly match released
> product names.
>
> Patches against 2.4.27-pre2 and 2.6.6
It is difficult to review patches that look like the following...
please include the patches include, or attach them as plaintext.
Three other comments:
1) please CC linux-ide@vger.kernel.org on all IDE/SATA-related patches
2) Please To: or CC: Bartlomiej (cc'd on this email) on all drivers/ide
patches, as he is the IDE maintainer.
3) Normally we want to add SATA support to libata not drivers/ide. Do
the nVidia SATA chips support SATA SCRs or anything like that? Why not
use libata?
Content-Type: application/octet-stream;
name="linux-2.4.27-pre2-nforce-ck804-ide.patch"
Content-Transfer-Encoding: base64
Content-Description: linux-2.4.27-pre2-nforce-ck804-ide.patch
Content-Disposition: attachment;
filename="linux-2.4.27-pre2-nforce-ck804-ide.patch"
ZGlmZiAtdXByTiAtWCBkb250ZGlmZiBsaW51eC0yLjQuMjctcHJlMi9kcml2ZXJzL2lkZS9wY2kv
YW1kNzR4eC5jIGxpbnV4LTIuNC4yNy1wcmUyLW5mb3JjZS1jazgwNC1pZGUvZHJpdmVycy9pZGUv
cGNpL2FtZDc0eHguYwotLS0gbGludXgtMi40LjI3LXByZTIvZHJpdmVycy9pZGUvcGNpL2FtZDc0
eHguYwkyMDA0LTA0LTE0IDA2OjA1OjI5LjAwMDAwMDAwMCAtMDcwMAorKysgbGludXgtMi40LjI3
LXByZTItbmZvcmNlLWNrODA0LWlkZS9kcml2ZXJzL2lkZS9wY2kvYW1kNzR4eC5jCTIwMDQtMDUt
MTcgMTM6Mjc6MzEuMDAwMDAwMDAwIC0wNzAwCkBAIC0xLDcgKzEsOCBAQAogLyoKICAqIFZlcnNp
b24gMi4xMwogICoKLSAqIEFNRCA3NTUvNzU2Lzc2Ni84MTExIGFuZCBuVmlkaWEgbkZvcmNlLzIv
MnMvMy8zcyBJREUgZHJpdmVyIGZvciBMaW51eC4KKyAqIEFNRCA3NTUvNzU2Lzc2Ni84MTExIGFu
ZCBuVmlkaWEgbkZvcmNlLzIvMnMvMy8zcy9DSzgwNC9NQ1AwNCAKKyAqIElERSBkcml2ZXIgZm9y
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH] add new nForce IDE/SATA device IDs
@ 2004-05-27 20:21 Brian Lazara
2004-05-27 20:31 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Brian Lazara @ 2004-05-27 20:21 UTC (permalink / raw)
To: Jeff Garzik, linux-kernel; +Cc: linux-ide, Bartlomiej Zolnierkiewicz
Sorry about that. Patches added below as plain text:
> 3) Normally we want to add SATA support to libata not
> drivers/ide. Do
> the nVidia SATA chips support SATA SCRs or anything like
> that? Why not
> use libata?
We do plan on moving our SATA support to libata.
Patches for 2.4.27-pre2 and 2.6.6 to add device IDs for new nForce IDE
and SATA controllers. Rename some of the existing controller names to
correctly match released product names.
diff -uprN -X dontdiff linux-2.6.6/drivers/ide/pci/amd74xx.c
linux-2.6.6-nforce-ck804-ide/drivers/ide/pci/amd74xx.c
--- linux-2.6.6/drivers/ide/pci/amd74xx.c 2004-05-09
19:33:21.000000000 -0700
+++ linux-2.6.6-nforce-ck804-ide/drivers/ide/pci/amd74xx.c
2004-05-17 15:03:08.000000000 -0700
@@ -1,7 +1,8 @@
/*
* Version 2.13
*
- * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s IDE driver for
Linux.
+ * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04
+ * IDE driver for Linux.
*
* Copyright (c) 2000-2002 Vojtech Pavlik
*
@@ -68,6 +69,12 @@ static struct amd_ide_chip {
{ PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE, 0x50, AMD_UDMA_133 },
{ PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA, 0x50, AMD_UDMA_133 },
{ PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2, 0x50, AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2, 0x50,
AMD_UDMA_133 },
{ 0 }
};
@@ -465,6 +472,12 @@ static struct pci_device_id amd74xx_pci_
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2,
+PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 },
{ 0, },
};
MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);
diff -uprN -X dontdiff linux-2.6.6/drivers/ide/pci/amd74xx.h
linux-2.6.6-nforce-ck804-ide/drivers/ide/pci/amd74xx.h
--- linux-2.6.6/drivers/ide/pci/amd74xx.h 2004-05-09
19:31:59.000000000 -0700
+++ linux-2.6.6-nforce-ck804-ide/drivers/ide/pci/amd74xx.h
2004-05-17 15:03:08.000000000 -0700
@@ -94,7 +94,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 7 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE,
- .name = "NFORCE2S",
+ .name = "NFORCE2-U400R",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -105,7 +105,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 8 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,
- .name = "NFORCE2S-SATA",
+ .name = "NFORCE2-U400R-SATA",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -116,7 +116,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 9 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE,
- .name = "NFORCE3",
+ .name = "NFORCE3-150",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -127,7 +127,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 10 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE,
- .name = "NFORCE3S",
+ .name = "NFORCE3-250",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -138,7 +138,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 11 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
- .name = "NFORCE3S-SATA",
+ .name = "NFORCE3-250-SATA",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -149,7 +149,73 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 12 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,
- .name = "NFORCE3S-SATA2",
+ .name = "NFORCE3-250-SATA2",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 13 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device = PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,
+ .name = "NFORCE-CK804",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 14 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device =
PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA,
+ .name = "NFORCE-CK804-SATA",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 15 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device =
PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2,
+ .name = "NFORCE-CK804-SATA2",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 16 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device = PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,
+ .name = "NFORCE-MCP04",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 17 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device =
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA,
+ .name = "NFORCE-MCP04-SATA",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 18 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device =
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2,
+ .name = "NFORCE-MCP04-SATA2",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
diff -uprN -X dontdiff linux-2.6.6/include/linux/pci_ids.h
linux-2.6.6-nforce-ck804-ide/include/linux/pci_ids.h
--- linux-2.6.6/include/linux/pci_ids.h 2004-05-09 19:32:28.000000000
-0700
+++ linux-2.6.6-nforce-ck804-ide/include/linux/pci_ids.h
2004-05-17 15:03:08.000000000 -0700
@@ -1054,6 +1054,12 @@
#define PCI_DEVICE_ID_NVIDIA_UTNT2 0x0029
#define PCI_DEVICE_ID_NVIDIA_VTNT2 0x002C
#define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE 0x0035
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA 0x0036
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2 0x003e
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE 0x0053
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA 0x0054
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2 0x0055
#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE 0x0065
#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE 0x0085
#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA 0x008e
diff -uprN -X dontdiff linux-2.4.27-pre2/drivers/ide/pci/amd74xx.c
linux-2.4.27-pre2-nforce-ck804-ide/drivers/ide/pci/amd74xx.c
--- linux-2.4.27-pre2/drivers/ide/pci/amd74xx.c 2004-04-14
06:05:29.000000000 -0700
+++ linux-2.4.27-pre2-nforce-ck804-ide/drivers/ide/pci/amd74xx.c
2004-05-17 13:27:31.000000000 -0700
@@ -1,7 +1,8 @@
/*
* Version 2.13
*
- * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s IDE driver for
Linux.
+ * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04
+ * IDE driver for Linux.
*
* Copyright (c) 2000-2002 Vojtech Pavlik
*
@@ -68,6 +69,12 @@ static struct amd_ide_chip {
{ PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE, 0x50, AMD_UDMA_133 },
{ PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA, 0x50, AMD_UDMA_133 },
{ PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2, 0x50, AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA, 0x50,
AMD_UDMA_133 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2, 0x50,
AMD_UDMA_133 },
{ 0 }
};
@@ -464,6 +471,12 @@ static struct pci_device_id amd74xx_pci_
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2,
+PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 },
{ 0, },
};
diff -uprN -X dontdiff linux-2.4.27-pre2/drivers/ide/pci/amd74xx.h
linux-2.4.27-pre2-nforce-ck804-ide/drivers/ide/pci/amd74xx.h
--- linux-2.4.27-pre2/drivers/ide/pci/amd74xx.h 2004-04-14
06:05:29.000000000 -0700
+++ linux-2.4.27-pre2-nforce-ck804-ide/drivers/ide/pci/amd74xx.h
2004-05-17 12:08:04.000000000 -0700
@@ -112,7 +112,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 7 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE,
- .name = "NFORCE2S",
+ .name = "NFORCE2-U400R",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -123,7 +123,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 8 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,
- .name = "NFORCE2S-SATA",
+ .name = "NFORCE2-U400R-SATA",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -134,7 +134,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 9 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE,
- .name = "NFORCE3",
+ .name = "NFORCE3-150",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -145,7 +145,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 10 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE,
- .name = "NFORCE3S",
+ .name = "NFORCE3-250",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -156,7 +156,7 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 11 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
- .name = "NFORCE3S-SATA",
+ .name = "NFORCE3-250-SATA",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
@@ -167,7 +167,73 @@ static ide_pci_device_t amd74xx_chipsets
{ /* 12 */
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,
- .name = "NFORCE3S-SATA2",
+ .name = "NFORCE3-250-SATA2",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 13 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device = PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,
+ .name = "NFORCE-CK804",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 14 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device =
PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA,
+ .name = "NFORCE-CK804-SATA",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 15 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device =
PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2,
+ .name = "NFORCE-CK804-SATA2",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 16 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device = PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,
+ .name = "NFORCE-MCP04",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 17 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device =
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA,
+ .name = "NFORCE-MCP04-SATA",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ { /* 18 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device =
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2,
+ .name = "NFORCE-MCP04-SATA2",
.init_chipset = init_chipset_amd74xx,
.init_hwif = init_hwif_amd74xx,
.channels = 2,
diff -uprN -X dontdiff linux-2.4.27-pre2/include/linux/pci_ids.h
linux-2.4.27-pre2-nforce-ck804-ide/include/linux/pci_ids.h
--- linux-2.4.27-pre2/include/linux/pci_ids.h 2004-05-17
11:46:29.000000000 -0700
+++ linux-2.4.27-pre2-nforce-ck804-ide/include/linux/pci_ids.h
2004-05-17 12:04:30.000000000 -0700
@@ -977,6 +977,12 @@
#define PCI_DEVICE_ID_NVIDIA_UTNT2 0x0029
#define PCI_DEVICE_ID_NVIDIA_VTNT2 0x002C
#define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE 0x0035
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA 0x0036
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2 0x003e
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE 0x0053
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA 0x0054
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2 0x0055
#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE 0x0065
#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE 0x0085
#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA 0x008e
> -----Original Message-----
> From: Jeff Garzik [mailto:jgarzik@pobox.com]
> Sent: Thursday, May 27, 2004 12:38 PM
> To: Brian Lazara
> Cc: linux-kernel@vger.kernel.org; linux-ide@vger.kernel.org;
> Bartlomiej Zolnierkiewicz
> Subject: Re: [PATCH] add new nForce IDE/SATA device IDs
>
>
> Brian Lazara wrote:
> > Patches to add device IDs for new nForce IDE and SATA controllers.
> > Rename some of the existing controller names to correctly match
> > released product names.
> >
> > Patches against 2.4.27-pre2 and 2.6.6
>
> It is difficult to review patches that look like the following...
> please include the patches include, or attach them as plaintext.
>
> Three other comments:
>
> 1) please CC linux-ide@vger.kernel.org on all IDE/SATA-related patches
> 2) Please To: or CC: Bartlomiej (cc'd on this email) on all
> drivers/ide
> patches, as he is the IDE maintainer.
> 3) Normally we want to add SATA support to libata not
> drivers/ide. Do
> the nVidia SATA chips support SATA SCRs or anything like
> that? Why not
> use libata?
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] add new nForce IDE/SATA device IDs
2004-05-27 20:21 Brian Lazara
@ 2004-05-27 20:31 ` Jeff Garzik
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2004-05-27 20:31 UTC (permalink / raw)
To: Brian Lazara; +Cc: linux-kernel, linux-ide, Bartlomiej Zolnierkiewicz
Brian Lazara wrote:
> We do plan on moving our SATA support to libata.
cool
> Patches for 2.4.27-pre2 and 2.6.6 to add device IDs for new nForce IDE
> and SATA controllers. Rename some of the existing controller names to
> correctly match released product names.
The patch looks OK to me, though the final call is up to Bart.
FWIW, when you included the patch inline, your email editor word-wrapped
it so it will not apply.
If Microsoft Outlook (or whatever) cannot produce decent patches, you
may need to include your patches _twice_ -- once in plaintext (with
annoying word wrap) for review, and once as you did initially, as a
base64 attachment.
Most MUA's are able to attach patches as plaintext (not base64), so see
if there are setting you can flip...
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-05-27 20:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <C064BF1617D93B4B83714E38C4653A6E0AF48248@mail-sc-10.nvidia.com>
2004-05-27 19:38 ` [PATCH] add new nForce IDE/SATA device IDs Jeff Garzik
2004-05-27 20:21 Brian Lazara
2004-05-27 20:31 ` 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).