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

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1290766199 0
# Node ID dc1d2d3da95f44452e66e00aea9febb5e9a78b65
# Parent  59f097ef181b2d131fdc72a56071b964d771bcaa
Add some Intel PCI device ID's to irq.c; sync irq-xen.c with irq.c

From: Laszlo Ersek <lersek@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxx>
---
 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 -r dc1d2d3da95f 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   Fri Nov 26 10:09:59 2010 +0000
@@ -553,14 +553,33 @@ 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 -r dc1d2d3da95f 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       Fri Nov 26 10:09:59 2010 +0000
@@ -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 -r dc1d2d3da95f 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   Fri Nov 26 10:09:59 2010 +0000
@@ -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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog