[PATCH linux-2.6.18-xen] add some Intel PCI device ID's to irq.c; sync irq-xen.c with irq.c

[PATCH linux-2.6.18-xen] add some Intel PCI device ID's to irq.c; sync irq-xen.c with irq.c

[Laszlo Ersek]

Hi,

the following patch adds some Intel PCI device ID's to "arch/i386/pci/irq.c" and "include/linux/pci_ids.h" (Tolapai, Cougar Point, Patsburg), and synchronizes "irq-xen.c" with "irq.c".

Thanks for considering,
lacos

 arch/i386/pci/irq-xen.c |   19 +++++++++++++++++++
 arch/i386/pci/irq.c     |   10 ++++++++++
 include/linux/pci_ids.h |    5 +++++
 3 files changed, 34 insertions(+)

diff -r 59f097ef181b arch/i386/pci/irq-xen.c
--- a/arch/i386/pci/irq-xen.c	Tue Nov 23 13:58:38 2010 +0000
+++ b/arch/i386/pci/irq-xen.c	Wed Nov 24 21:06:57 2010 +0100
@@ -553,15 +553,34 @@ static __init int intel_router_probe(str
 		case PCI_DEVICE_ID_INTEL_ICH9_3:
 		case PCI_DEVICE_ID_INTEL_ICH9_4:
 		case PCI_DEVICE_ID_INTEL_ICH9_5:
+		case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
 		case PCI_DEVICE_ID_INTEL_ICH10_0:
 		case PCI_DEVICE_ID_INTEL_ICH10_1:
 		case PCI_DEVICE_ID_INTEL_ICH10_2:
 		case PCI_DEVICE_ID_INTEL_ICH10_3:
+		case PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0:
+		case PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1:
 			r->name = "PIIX/ICH";
 			r->get = pirq_piix_get;
 			r->set = pirq_piix_set;
 			return 1;
 	}
+
+	if ((device >= PCI_DEVICE_ID_INTEL_PCH_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_PCH_LPC_MAX)) {
+		r->name = "PIIX/ICH";
+		r->get = pirq_piix_get;
+		r->set = pirq_piix_set;
+		return 1;
+	}
+
+	if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) {
+		r->name = "PIIX/ICH";
+		r->get = pirq_piix_get;
+		r->set = pirq_piix_set;
+		return 1;
+	}
 	return 0;
 }
 
diff -r 59f097ef181b arch/i386/pci/irq.c
--- a/arch/i386/pci/irq.c	Tue Nov 23 13:58:38 2010 +0000
+++ b/arch/i386/pci/irq.c	Wed Nov 24 21:06:57 2010 +0100
@@ -549,10 +549,13 @@ static __init int intel_router_probe(str
 		case PCI_DEVICE_ID_INTEL_ICH9_3:
 		case PCI_DEVICE_ID_INTEL_ICH9_4:
 		case PCI_DEVICE_ID_INTEL_ICH9_5:
+		case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
 		case PCI_DEVICE_ID_INTEL_ICH10_0:
 		case PCI_DEVICE_ID_INTEL_ICH10_1:
 		case PCI_DEVICE_ID_INTEL_ICH10_2:
 		case PCI_DEVICE_ID_INTEL_ICH10_3:
+		case PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0:
+		case PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1:
 			r->name = "PIIX/ICH";
 			r->get = pirq_piix_get;
 			r->set = pirq_piix_set;
@@ -567,6 +570,13 @@ static __init int intel_router_probe(str
 		return 1;
 	}
 
+	if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) {
+		r->name = "PIIX/ICH";
+		r->get = pirq_piix_get;
+		r->set = pirq_piix_set;
+		return 1;
+	}
 	return 0;
 }
 
diff -r 59f097ef181b include/linux/pci_ids.h
--- a/include/linux/pci_ids.h	Tue Nov 23 13:58:38 2010 +0000
+++ b/include/linux/pci_ids.h	Wed Nov 24 21:06:57 2010 +0100
@@ -2098,6 +2098,10 @@
 #define PCI_DEVICE_ID_INTEL_82840_HB	0x1a21
 #define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30
 #define PCI_DEVICE_ID_INTEL_IOAT	0x1a38
+#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
+#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0	0x1d40
+#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1	0x1d41
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
@@ -2222,6 +2226,7 @@
 #define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN	0x3b00
 #define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX	0x3b1f
 #define PCI_DEVICE_ID_INTEL_PCH_SMBUS	0x3b30
+#define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031
 #define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
 #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010