Skip to contentSkip to conversation

pci: irq and pci_ids patch for Intel Lynx Point DeviceIDs

PATCH Applied Seth Heasley 3 participants 4 messages Jan 24, 2012 – Jan 27, 2012

Subsystems (2)
x86 PCI
lore
Share & tools
lore

Seth Heasley

author
#0 lore raw

PATCH 6/6 pci: irq and pci_ids patch for Intel Lynx Point DeviceIDs

This patch adds the LPC Controller DeviceIDs for the Intel Lynx Point PCH.

Signed-off-by Seth Heasley <[email protected]>
---
 arch/x86/pci/irq.c      |    4 +++-
 include/linux/pci_ids.h |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/pci/irq.c +3 -1
index 372e9b8..22468b6 100644
@@ -604,7 +604,9 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
 	||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
 	     device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)
 	||  (device >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN &&
-	     device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) {
+	     device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)
+	||  (device >= PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MIN &&
+	     device <= PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
include/linux/pci_ids.h +2 -0
index 31d77af..6a0359a 100644
@@ -2800,6 +2800,8 @@
 #define PCI_DEVICE_ID_INTEL_82454NX     0x84cb
 #define PCI_DEVICE_ID_INTEL_84460GX	0x84ea
 #define PCI_DEVICE_ID_INTEL_IXP4XX	0x8500
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MIN	0x8c40
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MAX	0x8c5f
 #define PCI_DEVICE_ID_INTEL_IXP2800	0x9004
 #define PCI_DEVICE_ID_INTEL_S21152BB	0xb152
Signature · 1 line
1.7.4.4
#1 lore raw

include/linux/pci_ids.h line 2804

Quoted 8 lines · Seth Heasley
include/linux/pci_ids.h +2 -0
@@ -2800,6 +2800,8 @@
 #define PCI_DEVICE_ID_INTEL_82454NX     0x84cb
 #define PCI_DEVICE_ID_INTEL_84460GX	0x84ea
 #define PCI_DEVICE_ID_INTEL_IXP4XX	0x8500
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MIN	0x8c40
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MAX	0x8c5f

You forgot to read the top of this file.

#2 lore raw
In reply to Seth Heasley
Quoted 28 lines · On Mon, 23 Jan 2012 16:46:24 -0800 Seth Heasley <[email protected]> wrote:

This patch adds the LPC Controller DeviceIDs for the Intel Lynx Point PCH.

Signed-off-by Seth Heasley <[email protected]>
---
 arch/x86/pci/irq.c      |    4 +++-
 include/linux/pci_ids.h |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/pci/irq.c +3 -1
index 372e9b8..22468b6 100644
@@ -604,7 +604,9 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
 	||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
 	     device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)
 	||  (device >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN &&
-	     device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) {
+	     device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)
+	||  (device >= PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MIN &&
+	     device <= PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
include/linux/pci_ids.h +0 -0
index 31d77af..6a0359a 100644

include/linux/pci_ids.h line 2807

Quoted 8 lines
include/linux/pci_ids.h +2 -0
@@ -2800,6 +2800,8 @@
 #define PCI_DEVICE_ID_INTEL_82454NX     0x84cb
 #define PCI_DEVICE_ID_INTEL_84460GX	0x84ea
 #define PCI_DEVICE_ID_INTEL_IXP4XX	0x8500
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MIN	0x8c40
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MAX	0x8c5f
 #define PCI_DEVICE_ID_INTEL_IXP2800	0x9004
 #define PCI_DEVICE_ID_INTEL_S21152BB	0xb152

Seems we add every new GMCH or PCH anyway, why not just use the piix routines for any unknown (therefore presumably new) Intel PCH device?

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
author
#3 lore raw
Quoted 33 lines
Quoted 1 line

This patch adds the LPC Controller DeviceIDs for the Intel Lynx Point

PCH.

arch/x86/pci/irq.c static __init int intel_router_probe(struct

Quoted 12 lines
Signed-off-by Seth Heasley <[email protected]>
---
 arch/x86/pci/irq.c      |    4 +++-
 include/linux/pci_ids.h |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/pci/irq.c index renamed from arch/x86/pci/irq.c +0 -0

372e9b8..22468b6 100644

arch/x86/pci/irq.c +0 -0
@@ -604,7 +604,9 @@ static __init int intel_router_probe(struct

irq_router *r, struct pci_dev *route

Quoted 18 lines
arch/x86/pci/irq.c +3 -1
 	||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
 	     device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)
 	||  (device >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN &&
-	     device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) {
+	     device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)
+	||  (device >= PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MIN &&
+	     device <= PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
include/linux/pci_ids.h index renamed from include/linux/pci_ids.h +0 -0

31d77af..6a0359a 100644

include/linux/pci_ids.h +0 -0
@@ -2800,6 +2800,8 @@
 #define PCI_DEVICE_ID_INTEL_82454NX     0x84cb
 #define PCI_DEVICE_ID_INTEL_84460GX	0x84ea
 #define PCI_DEVICE_ID_INTEL_IXP4XX	0x8500
Quoted 8 lines

include/linux/pci_ids.h line 2807

Quoted 5 lines
include/linux/pci_ids.h +2 -0
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MIN	0x8c40
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LPC_MAX	0x8c5f
 #define PCI_DEVICE_ID_INTEL_IXP2800	0x9004
 #define PCI_DEVICE_ID_INTEL_S21152BB	0xb152

Seems we add every new GMCH or PCH anyway, why not just use the piix routines for any unknown (therefore presumably new) Intel PCH device?

Makes sense to me.
-Seth