Skip to contentSkip to conversation

irq: irq and pci_ids patch for additional Intel Cougar Point DeviceIDs

PATCH New Seth Heasley 3 participants 5 messages Mar 25, 2010 – Sep 24, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 irq: irq and pci_ids patch for additional Intel Cougar Point DeviceIDs

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

The DeviceIDs are defined and referenced as a range of values, the same way Ibex Peak was implemented.

This patch was built against the linux-next.git tree.

linux/pci_ids.h renamed from linux/pci_ids.h.orig +2 -2
@@ -2419,8 +2419,8 @@
 #define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30
 #define PCI_DEVICE_ID_INTEL_IOAT	0x1a38
 #define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
-#define PCI_DEVICE_ID_INTEL_CPT_LPC1	0x1c42
-#define PCI_DEVICE_ID_INTEL_CPT_LPC2	0x1c43
+#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
+#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
x86/pci/irq.c renamed from x86/pci/irq.c.orig +7 -2
@@ -590,8 +590,6 @@
 	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_CPT_LPC1:
-	case PCI_DEVICE_ID_INTEL_CPT_LPC2:
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
@@ -606,6 +604,13 @@
 		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;
 }
#1 lore raw

PATCH 1/1 irq: irq and pci_ids patch for Intel Patsburg DeviceIDs

This patch adds the LPC Controller DeviceIDs for the Intel Patsburg PCH.

include/linux/pci_ids.h renamed from include/linux/pci_ids.h.orig +1 -0
@@ -2423,6 +2423,7 @@
 #define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PBG_LPC	0x1d40
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
/arch/x86/pci/irq.c renamed from arch/x86/pci/irq.c.orig +1 -0
@@ -589,6 +589,7 @@
 	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_PBG_LPC:
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
#2 lore raw

Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg DeviceIDs

Hi Seth,

Quoted 17 lines · Seth Heasley

This patch adds the LPC Controller DeviceIDs for the Intel Patsburg PCH.

include/linux/pci_ids.h renamed from include/linux/pci_ids.h.orig +1 -0
@@ -2423,6 +2423,7 @@
 #define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PBG_LPC	0x1d40
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413

/arch/x86/pci/irq.c line 595

Quoted 7 lines
/arch/x86/pci/irq.c renamed from arch/x86/pci/irq.c.orig +1 -0
@@ -589,6 +589,7 @@
 	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_PBG_LPC:
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;

Could Intel please stop using abbreviations for their chip names? If the chip is named Patsburg then please use PATSBURG in the symbol names too. MRST, PGB, etc. make me sick.

Thanks,

Signature · 1 line
Jean Delvare
#3 lore raw

Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg DeviceIDs

Quoted 23 lines · On Sat, 11 Sep 2010 10:57:06 +0200 Jean Delvare <[email protected]> wrote:

Hi Seth,

Quoted 20 lines · Seth Heasley

This patch adds the LPC Controller DeviceIDs for the Intel Patsburg PCH.

include/linux/pci_ids.h renamed from include/linux/pci_ids.h.orig +1 -0
@@ -2423,6 +2423,7 @@
 #define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PBG_LPC	0x1d40
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
/arch/x86/pci/irq.c renamed from arch/x86/pci/irq.c.orig +0 -0
@@ -589,6 +589,7 @@
 	case PCI_DEVICE_ID_INTEL_ICH10_1:
 	case PCI_DEVICE_ID_INTEL_ICH10_2:
 	case PCI_DEVICE_ID_INTEL_ICH10_3:
Quoted 8 lines

/arch/x86/pci/irq.c line 595

Quoted 4 lines
/arch/x86/pci/irq.c renamed from arch/x86/pci/irq.c.orig +1 -0
+	case PCI_DEVICE_ID_INTEL_PBG_LPC:
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;

Could Intel please stop using abbreviations for their chip names? If the chip is named Patsburg then please use PATSBURG in the symbol names too. MRST, PGB, etc. make me sick.

Agreed. Do you want to submit a rename patch for the existing stuff? You can do it on top of this one if you like, I'll put it into linux-next.

I guess this means more typing for you in future patches, Seth. :)

Thanks,

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Applied
#4 lore raw

Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg DeviceIDs

In reply to Seth Heasley
Quoted 18 lines · On Fri, 10 Sep 2010 16:36:39 -0700 Seth Heasley <[email protected]> wrote:

This patch adds the LPC Controller DeviceIDs for the Intel Patsburg PCH.

include/linux/pci_ids.h renamed from include/linux/pci_ids.h.orig +1 -0
@@ -2423,6 +2423,7 @@
 #define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
 #define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PBG_LPC	0x1d40
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413

/arch/x86/pci/irq.c line 595

Quoted 7 lines
/arch/x86/pci/irq.c renamed from arch/x86/pci/irq.c.orig +1 -0
@@ -589,6 +589,7 @@
 	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_PBG_LPC:
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;

Applied to linux-next, thanks.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center