irq: irq and pci_ids patch for Intel

PATCH Applied Seth Heasley 3 participants 7 messages Sep 24, 2010 – Oct 16, 2010

Subsystems (4)

x86 PCI I2C subsystem host drivers I2C/smbus controller drivers for pc

lore

Share & tools

lore

Seth Heasley

author

2010-09-24 23:06 UTC #0 lore raw

Quoted 9 lines

Quoted 2 lines
Could Intel please stop using abbreviations for their chip names? If the chip is named Patsburg then please use PATSBURG in the symbol
names
Quoted 1 line
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.

Quoted 5 lines

I guess this means more typing for you in future patches, Seth. :)
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center

Jesse,

I renamed some of the recent symbols, others to be renamed later on. This patch was built against the previous changes.

Jean,

Also included in the patch are changes to drivers/i2c/busses/i2c-i801.c, as the updated symbols are referenced there.

Regards,
-Seth
-------------

This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.

Signed-off-by Seth Heasley <[email protected]>

include/linux/pci_ids.h renamed from include/linux/pci_ids.h.orig +9 -8

@@ -2420,9 +2420,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_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_COUGARPOINT_SMBUS	0x1c22
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN	0x1c41
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PATSBURG_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

@@ -2628,9 +2629,9 @@
 #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
 #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
-#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_5_3400_SERIES_LPC_MIN	0x3b00
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5

@@ -2639,8 +2640,8 @@
 #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
 #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
+#define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
+#define PCI_DEVICE_ID_INTEL_EP80579_1	0x5032
 #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020

arch/x86/pci/irq.c renamed from arch/x86/pci/irq.c.orig +6 -6

@@ -584,28 +584,28 @@
 	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_EP80579_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_PBG_LPC:
+	case PCI_DEVICE_ID_INTEL_PATSBURG_LPC:
 		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)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_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)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;

drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +1 -1

@@ -95,7 +95,7 @@
 	    ESB2
 	    ICH8
 	    ICH9
-	    Tolapai
+	    EP80579
 	    ICH10
 	    3400/5 Series (PCH)
 	    Cougar Point (PCH)

drivers/i2c/busses/i2c-i801.c renamed from drivers/i2c/busses/i2c-i801.c.orig +4 -4

@@ -38,7 +38,7 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
   82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
   82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
-  Tolapai               0x5032     32     hard     yes     yes     yes
+  EP80579               0x5032     32     hard     yes     yes     yes
   ICH10                 0x3a30     32     hard     yes     yes     yes
   ICH10                 0x3a60     32     hard     yes     yes     yes
   3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes

@@ -587,11 +587,11 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EP80579_1) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
 	{ 0, }
 };

Jean Delvare

Acked-by

2010-09-25 11:30 UTC #1 lore raw

Quoted 111 lines · Seth Heasley

Quoted 9 lines

Quoted 2 lines
Could Intel please stop using abbreviations for their chip names? If the chip is named Patsburg then please use PATSBURG in the symbol
names
Quoted 1 line
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.

Quoted 5 lines

I guess this means more typing for you in future patches, Seth. :)
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center

Jesse,

I renamed some of the recent symbols, others to be renamed later on. This patch was built against the previous changes.

Jean,

Also included in the patch are changes to drivers/i2c/busses/i2c-i801.c, as the updated symbols are referenced there.

Regards,
-Seth
-------------

Signed-off-by Seth Heasley <[email protected]>

include/linux/pci_ids.h renamed from include/linux/pci_ids.h.orig +9 -8

@@ -2420,9 +2420,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_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_COUGARPOINT_SMBUS	0x1c22
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN	0x1c41
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PATSBURG_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

@@ -2628,9 +2629,9 @@
 #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
 #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
-#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_5_3400_SERIES_LPC_MIN	0x3b00
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5

@@ -2639,8 +2640,8 @@
 #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
 #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
+#define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
+#define PCI_DEVICE_ID_INTEL_EP80579_1	0x5032
 #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020

arch/x86/pci/irq.c renamed from arch/x86/pci/irq.c.orig +6 -6

@@ -584,28 +584,28 @@
 	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_EP80579_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_PBG_LPC:
+	case PCI_DEVICE_ID_INTEL_PATSBURG_LPC:
 		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)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_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)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;

drivers/i2c/busses/Kconfig line 100

Quoted 7 lines

drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +1 -1

@@ -95,7 +95,7 @@
 	    ESB2
 	    ICH8
 	    ICH9
-	    Tolapai
+	    EP80579
 	    ICH10
 	    3400/5 Series (PCH)

How did this become "5_3400_SERIES" in the symbol names? Shouldn't it be 3400_5_SERIES instead?

drivers/i2c/busses/i2c-i801.c line 41

Quoted 9 lines

drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +0 -0

 	    Cougar Point (PCH)

drivers/i2c/busses/i2c-i801.c renamed from drivers/i2c/busses/i2c-i801.c.orig +1 -1

@@ -38,7 +38,7 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
   82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
   82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
-  Tolapai               0x5032     32     hard     yes     yes     yes
+  EP80579               0x5032     32     hard     yes     yes     yes

Maybe keep "Tolapai" inside parentheses, as people may know the platform by that name by now?

Quoted 7 lines

drivers/i2c/busses/i2c-i801.c renamed from drivers/i2c/busses/i2c-i801.c.orig +0 -0

   ICH10                 0x3a30     32     hard     yes     yes     yes
   ICH10                 0x3a60     32     hard     yes     yes     yes
   3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes

@@ -587,11 +587,11 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },

drivers/i2c/busses/i2c-i801.c line 596

Quoted 10 lines

drivers/i2c/busses/i2c-i801.c renamed from drivers/i2c/busses/i2c-i801.c.orig +3 -3

-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EP80579_1) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
 	{ 0, }
 };

Other than these minor details, I'm very happy with this change:

Acked-by Jean Delvare <[email protected]>

Signature · 1 line

Jean Delvare

Heasley, Seth

author

2010-09-25 15:13 UTC #2 lore raw

Quoted 4 lines

Quoted 1 line
--- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig 2010-09-24
14:59:23.000000000 -0700
Quoted 1 line
+++ linux-2.6.35.4/drivers/i2c/busses/Kconfig 2010-09-24
14:59:42.000000000 -0700

Quoted 11 lines

drivers/i2c/busses/Kconfig line 100
Quoted 8 lines
drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +1 -1
@@ -95,7 +95,7 @@
 	    ESB2
 	    ICH8
 	    ICH9
-	    Tolapai
+	    EP80579
 	    ICH10
 	    3400/5 Series (PCH)
How did this become "5_3400_SERIES" in the symbol names? Shouldn't it be 3400_5_SERIES instead?

The way I did it here is consistent with the approved branding submitted for pci.ids. So perhaps changing the 3400/5 Series to "5 Series/3400 Series" would make sense.

Quoted 12 lines

Review
Quoted 3 lines
(quoted diff) +0 -1
 	    Cougar Point (PCH)
--- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig	2010-09-24
14:57:55.000000000 -0700
Quoted 1 line
+++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c 2010-09-24
14:59:13.000000000 -0700
Review line 38
Quoted 2 lines
(quoted diff) +0 -0
@@ -38,7 +38,7 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes
yes
Review line 39
Quoted 1 line
(quoted diff) +0 -0
   82801H   (ICH8)       0x283e     32     hard     yes     yes
yes
Review line 40
Quoted 1 line
(quoted diff) +0 -0
   82801I   (ICH9)       0x2930     32     hard     yes     yes

Quoted 8 lines

yes
Review line 41
Quoted 1 line
(quoted diff) +0 -1
-  Tolapai               0x5032     32     hard     yes     yes
yes
Review line 41
Quoted 1 line
(quoted diff) +1 -0
+  EP80579               0x5032     32     hard     yes     yes
yes
Maybe keep "Tolapai" inside parentheses, as people may know the platform by that name by now?

That'd be fine with me.

-Seth

Seth Heasley

author

2010-10-04 20:27 UTC #3 lore raw

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

In reply to Seth Heasley

Quoted 4 lines

Quoted 1 line
--- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig 2010-09-24
14:59:23.000000000 -0700
Quoted 1 line
+++ linux-2.6.35.4/drivers/i2c/busses/Kconfig 2010-09-24
14:59:42.000000000 -0700

Quoted 11 lines

Review line 100
Quoted 8 lines
(quoted diff) +1 -1
@@ -95,7 +95,7 @@
         ESB2
         ICH8
         ICH9
-        Tolapai
+        EP80579
         ICH10
         3400/5 Series (PCH)
How did this become "5_3400_SERIES" in the symbol names? Shouldn't it be 3400_5_SERIES instead?

The approved branding in pci.ids is 5/3400 Series, so I wanted to reflect that here. I've changed it in Kconfig as well as i2c-i801.c to be consistent.

Quoted 10 lines

Review line 101
Quoted 1 line
(quoted diff) +0 -1
--- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig        2010-09-24
14:57:55.000000000 -0700
Review line 101
Quoted 1 line
(quoted diff) +1 -0
+++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c     2010-09-24
14:59:13.000000000 -0700
Review line 38
Quoted 2 lines
(quoted diff) +0 -0
@@ -38,7 +38,7 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes
yes
Review line 39
Quoted 1 line
(quoted diff) +0 -0
   82801H   (ICH8)       0x283e     32     hard     yes     yes
yes
Review line 40
Quoted 1 line
(quoted diff) +0 -0
   82801I   (ICH9)       0x2930     32     hard     yes     yes

Quoted 8 lines

yes
Review line 41
Quoted 1 line
(quoted diff) +0 -1
-  Tolapai               0x5032     32     hard     yes     yes
yes
Review line 41
Quoted 1 line
(quoted diff) +1 -0
+  EP80579               0x5032     32     hard     yes     yes
yes
Maybe keep "Tolapai" inside parentheses, as people may know the platform by that name by now?

Agreed. I've updated that in both places it's referenced. Final (hopefully) patch below:

Signed-off-by Seth Heasley <[email protected]>

include/linux/pci_ids.h renamed from include/linux/pci_ids.h.orig +9 -8

@@ -2420,9 +2420,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_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_COUGARPOINT_SMBUS	0x1c22
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN	0x1c41
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PATSBURG_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

@@ -2628,9 +2629,9 @@
 #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
 #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
-#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_5_3400_SERIES_LPC_MIN	0x3b00
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5

@@ -2639,8 +2640,8 @@
 #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
 #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
+#define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
+#define PCI_DEVICE_ID_INTEL_EP80579_1	0x5032
 #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020

arch/x86/pci/irq.c renamed from arch/x86/pci/irq.c.orig +6 -6

@@ -584,28 +584,28 @@
 	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_EP80579_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_PBG_LPC:
+	case PCI_DEVICE_ID_INTEL_PATSBURG_LPC:
 		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)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_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)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;

drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +2 -2

@@ -95,9 +95,9 @@
 	    ESB2
 	    ICH8
 	    ICH9
-	    Tolapai
+	    EP80579 (Tolapai)
 	    ICH10
-	    3400/5 Series (PCH)
+	    5/3400 Series (PCH)
 	    Cougar Point (PCH)
 
 	  This driver can also be built as a module.  If so, the module

drivers/i2c/busses/i2c-i801.c renamed from drivers/i2c/busses/i2c-i801.c.orig +5 -5

@@ -38,10 +38,10 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
   82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
   82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
-  Tolapai               0x5032     32     hard     yes     yes     yes
+  EP80579 (Tolapai)     0x5032     32     hard     yes     yes     yes
   ICH10                 0x3a30     32     hard     yes     yes     yes
   ICH10                 0x3a60     32     hard     yes     yes     yes
-  3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes
+  5/3400 Series (PCH)   0x3b30     32     hard     yes     yes     yes
   Cougar Point (PCH)    0x1c22     32     hard     yes     yes     yes
 
   Features supported by this driver:

@@ -587,11 +587,11 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EP80579_1) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
 	{ 0, }
 };

Jean Delvare

Acked-by

2010-10-05 06:57 UTC #4 lore raw

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

Quoted 5 lines · Seth Heasley

Agreed. I've updated that in both places it's referenced. Final (hopefully) patch below:
This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.
Signed-off-by Seth Heasley <[email protected]>

Thanks a lot for doing this.

Acked-by Jean Delvare <[email protected]>

Quoted 126 lines

include/linux/pci_ids.h renamed from include/linux/pci_ids.h.orig +9 -8

@@ -2420,9 +2420,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_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_COUGARPOINT_SMBUS	0x1c22
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN	0x1c41
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PATSBURG_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

@@ -2628,9 +2629,9 @@
 #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
 #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
-#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_5_3400_SERIES_LPC_MIN	0x3b00
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5

@@ -2639,8 +2640,8 @@
 #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
 #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
+#define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
+#define PCI_DEVICE_ID_INTEL_EP80579_1	0x5032
 #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020

arch/x86/pci/irq.c renamed from arch/x86/pci/irq.c.orig +6 -6

@@ -584,28 +584,28 @@
 	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_EP80579_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_PBG_LPC:
+	case PCI_DEVICE_ID_INTEL_PATSBURG_LPC:
 		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)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_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)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;

drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +2 -2

@@ -95,9 +95,9 @@
 	    ESB2
 	    ICH8
 	    ICH9
-	    Tolapai
+	    EP80579 (Tolapai)
 	    ICH10
-	    3400/5 Series (PCH)
+	    5/3400 Series (PCH)
 	    Cougar Point (PCH)
 
 	  This driver can also be built as a module.  If so, the module

drivers/i2c/busses/i2c-i801.c renamed from drivers/i2c/busses/i2c-i801.c.orig +5 -6

@@ -38,10 +38,10 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
   82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
   82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
-  Tolapai               0x5032     32     hard     yes     yes     yes
+  EP80579 (Tolapai)     0x5032     32     hard     yes     yes     yes
   ICH10                 0x3a30     32     hard     yes     yes     yes
   ICH10                 0x3a60     32     hard     yes     yes     yes
-  3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes
+  5/3400 Series (PCH)   0x3b30     32     hard     yes     yes     yes
   Cougar Point (PCH)    0x1c22     32     hard     yes     yes     yes
 
   Features supported by this driver:

@@ -587,11 +587,11 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EP80579_1) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
 	{ 0, }
 };
 
--

To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line

Jean Delvare

Jesse Barnes

Applied

2010-10-15 19:54 UTC #5 lore raw

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

In reply to Seth Heasley

Quoted 34 lines · On Mon, 4 Oct 2010 13:27:14 -0700 Seth Heasley…

Quoted 4 lines
Quoted 1 line
--- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig 2010-09-24
14:59:23.000000000 -0700
Quoted 1 line
+++ linux-2.6.35.4/drivers/i2c/busses/Kconfig 2010-09-24
14:59:42.000000000 -0700
Quoted 11 lines
drivers/i2c/busses/Kconfig line 100
Quoted 8 lines
drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +1 -1
@@ -95,7 +95,7 @@
         ESB2
         ICH8
         ICH9
-        Tolapai
+        EP80579
         ICH10
         3400/5 Series (PCH)
How did this become "5_3400_SERIES" in the symbol names? Shouldn't it be 3400_5_SERIES instead?
The approved branding in pci.ids is 5/3400 Series, so I wanted to reflect that here. I've changed it in Kconfig as well as i2c-i801.c to be consistent.
Quoted 16 lines
Review line 101
Quoted 1 line
(quoted diff) +0 -1
--- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig        2010-09-24
14:57:55.000000000 -0700
Review line 101
Quoted 1 line
(quoted diff) +1 -0
+++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c     2010-09-24
14:59:13.000000000 -0700
Review line 38
Quoted 2 lines
(quoted diff) +0 -0
@@ -38,7 +38,7 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes
yes
Review line 39
Quoted 1 line
(quoted diff) +0 -0
   82801H   (ICH8)       0x283e     32     hard     yes     yes
yes
Review line 40
Quoted 1 line
(quoted diff) +0 -0
   82801I   (ICH9)       0x2930     32     hard     yes     yes
yes
Review line 41
Quoted 1 line
(quoted diff) +0 -1
-  Tolapai               0x5032     32     hard     yes     yes
yes
Review line 41
Quoted 1 line
(quoted diff) +1 -0
+  EP80579               0x5032     32     hard     yes     yes
yes

Quoted 8 lines

Quoted 2 lines
Maybe keep "Tolapai" inside parentheses, as people may know the platform by that name by now?
Agreed. I've updated that in both places it's referenced. Final (hopefully) patch below:
This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.
Signed-off-by Seth Heasley <[email protected]>

Applied this update, thanks.

Note that going forward I don't expect (or want!) patches to convert the development names into marketing names. We should just add new stuff with the development names (before the product ships) and leave them that way to avoid unnecessary churn.

Thanks,

Signature · 1 line

Jesse Barnes, Intel Open Source Technology Center

Jean Delvare

2010-10-16 06:40 UTC #6 lore raw

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

Quoted 4 lines · Jesse Barnes

Quoted 2 lines · On Mon, 4 Oct 2010 13:27:14 -0700 Seth Heasley <[email protected]> wrote:
This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.

Quoted 8 lines

Quoted 1 line
Signed-off-by Seth Heasley <[email protected]>
Applied this update, thanks.
Note that going forward I don't expect (or want!) patches to convert the development names into marketing names. We should just add new stuff with the development names (before the product ships) and leave them that way to avoid unnecessary churn.

Fine with me, as long as it is the actual names and not obscure 3-letter shortcuts.

Signature · 1 line

Jean Delvare