Skip to contentSkip to conversation

pci_ids.h: add some VIA IDE identifiers

PATCH In review Dave Jones 4 participants 6 messages Sep 9, 2006

Subsystems (2)
lore
Share & tools
lore

Dave Jones

author
#0 lore raw

PATCH 1/1 pci_ids.h: add some VIA IDE identifiers

This never made it into 2.6.17.12
Without it, this happens..

drivers/ide/pci/via82cxxx.c:85: error: 'PCI_DEVICE_ID_VIA_8237A' undeclared here (not in a function)

Dave

Quoted 17 lines · Greg KH

-stable review patch. If anyone has any objections, please let us know.

------------------
From: Alan Cox <[email protected]>

The following change from -mm is important to 2.6.18 (actually to 2.6.17 but its too late for that). This was contributed over three months ago by VIA to Bartlomiej and nothing happened. As a result the new chipset is now out and Linux won't run on it. By the time 2.6.18 is finalised this will be the defacto standard VIA chipset so support would be a good plan.

Tested in -mm for a while, its essentially a PCI ident update but for the bridge chip because VIA do things in weird ways.

Quoted 7 lines
---
 drivers/ide/pci/via82cxxx.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

...

If anyone actually tries to compile this driver the patch below might be helpful.

cu
Adrian

<-- snip -->

commit 47251e05f74783cc03f83f5e88016fc2cbd059f1

Author: Alan Cox <[email protected]>
Date:   Wed Sep 6 19:55:17 2006 +0200

pci_ids.h: add some VIA IDE identifiers

include/linux/pci_ids.h +4 -1
index 751eea5..960fb7b 100644
@@ -1223,6 +1223,7 @@ #define PCI_DEVICE_ID_VIA_PT880		0x0258
 #define PCI_DEVICE_ID_VIA_PX8X0_0	0x0259
 #define PCI_DEVICE_ID_VIA_3269_0	0x0269
 #define PCI_DEVICE_ID_VIA_K8T800PRO_0	0x0282
+#define PCI_DEVICE_ID_VIA_3296_0	0x0296
 #define PCI_DEVICE_ID_VIA_8363_0	0x0305
 #define PCI_DEVICE_ID_VIA_P4M800CE	0x0314
 #define PCI_DEVICE_ID_VIA_8371_0	0x0391
@@ -1230,6 +1231,7 @@ #define PCI_DEVICE_ID_VIA_8501_0	0x0501
 #define PCI_DEVICE_ID_VIA_82C561	0x0561
 #define PCI_DEVICE_ID_VIA_82C586_1	0x0571
 #define PCI_DEVICE_ID_VIA_82C576	0x0576
+#define PCI_DEVICE_ID_VIA_SATA_EIDE	0x0581
 #define PCI_DEVICE_ID_VIA_82C586_0	0x0586
 #define PCI_DEVICE_ID_VIA_82C596	0x0596
 #define PCI_DEVICE_ID_VIA_82C597_0	0x0597
@@ -1270,10 +1272,11 @@ #define PCI_DEVICE_ID_VIA_8378_0	0x3205
 #define PCI_DEVICE_ID_VIA_8783_0	0x3208
 #define PCI_DEVICE_ID_VIA_8237		0x3227
 #define PCI_DEVICE_ID_VIA_8251		0x3287
-#define PCI_DEVICE_ID_VIA_3296_0	0x0296
+#define PCI_DEVICE_ID_VIA_8237A		0x3337
 #define PCI_DEVICE_ID_VIA_8231		0x8231
 #define PCI_DEVICE_ID_VIA_8231_4	0x8235
 #define PCI_DEVICE_ID_VIA_8365_1	0x8305
+#define PCI_DEVICE_ID_VIA_CX700		0x8324
 #define PCI_DEVICE_ID_VIA_8371_1	0x8391
 #define PCI_DEVICE_ID_VIA_82C598_1	0x8598
 #define PCI_DEVICE_ID_VIA_838X_1	0xB188
#1 lore raw
Quoted 2 lines · Dave Jones

If anyone actually tries to compile this driver the patch below might be helpful.

It's a bit late now for -stable, 2.6.17.13 needed ASAP?

Grant.

#2 lore raw
In reply to Dave Jones
Quoted 6 lines · Dave Jones

This never made it into 2.6.17.12
Without it, this happens..

drivers/ide/pci/via82cxxx.c:85: error: 'PCI_DEVICE_ID_VIA_8237A' undeclared here (not in a function)

Dave

patching file include/linux/pci_ids.h
Hunk #1 succeeded at 1235 (offset 12 lines).
Hunk #3 succeeded at 1284 (offset 12 lines).

Works here ;)

Grant.

#3 lore raw
In reply to Dave Jones
Quoted 4 lines · Dave Jones

This never made it into 2.6.17.12
Without it, this happens..

drivers/ide/pci/via82cxxx.c:85: error: 'PCI_DEVICE_ID_VIA_8237A' undeclared here (not in a function)

Doh! Sorry about that, I forgot to do a run with 'make allmodconfig' this time around, and it shows :(

.13 will be out shortly...

thanks,

greg k-h

author
#4 lore raw
Quoted 10 lines · Greg KH
Quoted 4 lines · Dave Jones

This never made it into 2.6.17.12
Without it, this happens..

drivers/ide/pci/via82cxxx.c:85: error: 'PCI_DEVICE_ID_VIA_8237A' undeclared here (not in a function)

Doh! Sorry about that, I forgot to do a run with 'make allmodconfig' this time around, and it shows :(

.13 will be out shortly...

Might want to throw this in too, which removes a new warning that appeared in 2.6.17.12 warning about implicit declaration of idr_remove

drivers/md/dm.c renamed from drivers/md/dm.c~ +1 -0
@@ -20,6 +20,7 @@
 #include <linux/idr.h>
 #include <linux/hdreg.h>
 #include <linux/blktrace_api.h>
+#include <linux/idr.h>
 
 static const char *_name = DM_NAME;
 
#5 lore raw
Quoted 7 lines · Dave Jones
Quoted 6 lines · Greg KH
Quoted 4 lines · Dave Jones

This never made it into 2.6.17.12
Without it, this happens..

drivers/ide/pci/via82cxxx.c:85: error: 'PCI_DEVICE_ID_VIA_8237A' undeclared here (not in a function)

Quoted 7 lines
Quoted 4 lines

Doh! Sorry about that, I forgot to do a run with 'make allmodconfig' this time around, and it shows :(

.13 will be out shortly...

Might want to throw this in too, which removes a new warning that appeared in 2.6.17.12 warning about implicit declaration of idr_remove

That would not have worked, idr_remove wasn't even in the tree :(

I should have fixed it now, thanks.

greg k-h