[PATCH] ICH6/6300ESB i2c support

[PATCH] ICH6/6300ESB i2c support

[jdgaston]

This patch adds DID support for ICH6 and 6300ESB to i2c-i801.c(SMBus).  In order to add this support I needed to patch pci_ids.h with the SMBus DID's.  To keep things orginized I renumbered the ICH6 and ESB entries in pci_ids.h.  I then patched the piix IDE and i810 audio drivers to reflect the updated #define's.  I also removed an error from irq.c; there was a reference to a 6300ESB DID that does not exist.  This patch is against the 2.6.6 kernel.

The patch touches the following files:

linux-2.6.6/include/linux/pci-ids.h
linux-2.6.6/arch/i386/pci/irq.c
linux-2.6.6/drivers/ide/pci/piix.h
linux-2.6.6/drivers/ide/pci/piix.c
linux-2.6.6/sound/oss/i810_audio.c
linux-2.6.6/drivers/i2c/busses/i2c-i801.c
linux-2.6.6/drivers/i2c/busses/Kconfig

Please let me know if there are any questions or if there are any changes needed.  Greg k-h, please apply patch if accaptable.

Thank you,

Jason Gaston


--- linux-2.6.6/include/linux/pci_ids.h.orig	2004-05-10 11:55:43.000000000 -0700
+++ linux-2.6.6/include/linux/pci_ids.h	2004-05-10 11:56:30.000000000 -0700
@@ -2058,7 +2058,6 @@
 #define PCI_DEVICE_ID_INTEL_82801EB_7	0x24d7
 #define PCI_DEVICE_ID_INTEL_82801EB_11	0x24db
 #define PCI_DEVICE_ID_INTEL_82801EB_13	0x24dd
-#define PCI_DEVICE_ID_INTEL_ESB_0	0x25a0
 #define PCI_DEVICE_ID_INTEL_ESB_1	0x25a1
 #define PCI_DEVICE_ID_INTEL_ESB_2	0x25a2
 #define PCI_DEVICE_ID_INTEL_ESB_3	0x25a3
@@ -2084,8 +2083,24 @@
 #define PCI_DEVICE_ID_INTEL_82875_IG	0x257b
 #define PCI_DEVICE_ID_INTEL_ICH6_0	0x2640
 #define PCI_DEVICE_ID_INTEL_ICH6_1	0x2641
-#define PCI_DEVICE_ID_INTEL_ICH6_2	0x266f
-#define PCI_DEVICE_ID_INTEL_ICH6_3	0x266e
+#define PCI_DEVICE_ID_INTEL_ICH6_2	0x2642
+#define PCI_DEVICE_ID_INTEL_ICH6_3	0x2651
+#define PCI_DEVICE_ID_INTEL_ICH6_4	0x2652
+#define PCI_DEVICE_ID_INTEL_ICH6_5	0x2653
+#define PCI_DEVICE_ID_INTEL_ICH6_6	0x2658
+#define PCI_DEVICE_ID_INTEL_ICH6_7	0x2659
+#define PCI_DEVICE_ID_INTEL_ICH6_8	0x265a
+#define PCI_DEVICE_ID_INTEL_ICH6_9	0x265b
+#define PCI_DEVICE_ID_INTEL_ICH6_10	0x265c
+#define PCI_DEVICE_ID_INTEL_ICH6_11	0x2660
+#define PCI_DEVICE_ID_INTEL_ICH6_12	0x2662
+#define PCI_DEVICE_ID_INTEL_ICH6_13	0x2664
+#define PCI_DEVICE_ID_INTEL_ICH6_14	0x2666
+#define PCI_DEVICE_ID_INTEL_ICH6_15	0x2668
+#define PCI_DEVICE_ID_INTEL_ICH6_16	0x266a
+#define PCI_DEVICE_ID_INTEL_ICH6_17	0x266d
+#define PCI_DEVICE_ID_INTEL_ICH6_18	0x266e
+#define PCI_DEVICE_ID_INTEL_ICH6_19	0x266f
 #define PCI_DEVICE_ID_INTEL_82855PM_HB	0x3340
 #define PCI_DEVICE_ID_INTEL_82830_HB	0x3575
 #define PCI_DEVICE_ID_INTEL_82830_CGC	0x3577
--- linux-2.6.6/arch/i386/pci/irq.c.orig	2004-05-09 19:33:21.000000000 -0700
+++ linux-2.6.6/arch/i386/pci/irq.c	2004-05-10 11:56:30.000000000 -0700
@@ -476,8 +476,9 @@
 		case PCI_DEVICE_ID_INTEL_82801DB_0:
 		case PCI_DEVICE_ID_INTEL_82801E_0:
 		case PCI_DEVICE_ID_INTEL_82801EB_0:
-		case PCI_DEVICE_ID_INTEL_ESB_0:
+		case PCI_DEVICE_ID_INTEL_ESB_1:
 		case PCI_DEVICE_ID_INTEL_ICH6_0:
+		case PCI_DEVICE_ID_INTEL_ICH6_1:
 			r->name = "PIIX/ICH";
 			r->get = pirq_piix_get;
 			r->set = pirq_piix_set;
--- linux-2.6.6/drivers/ide/pci/piix.c.orig	2004-05-09 19:31:59.000000000 -0700
+++ linux-2.6.6/drivers/ide/pci/piix.c	2004-05-11 17:30:46.382204320 -0700
@@ -153,7 +153,7 @@
 			case PCI_DEVICE_ID_INTEL_82801EB_11:
 			case PCI_DEVICE_ID_INTEL_82801E_11:
 			case PCI_DEVICE_ID_INTEL_ESB_2:
-			case PCI_DEVICE_ID_INTEL_ICH6_2:
+			case PCI_DEVICE_ID_INTEL_ICH6_19:
 				p += sprintf(p, "PIIX4 Ultra 100 ");
 				break;
 			case PCI_DEVICE_ID_INTEL_82372FB_1:
@@ -292,7 +292,7 @@
 		case PCI_DEVICE_ID_INTEL_82801DB_11:
 		case PCI_DEVICE_ID_INTEL_82801EB_11:
 		case PCI_DEVICE_ID_INTEL_ESB_2:
-		case PCI_DEVICE_ID_INTEL_ICH6_2:
+		case PCI_DEVICE_ID_INTEL_ICH6_19:
 			mode = 3;
 			break;
 		/* UDMA 66 capable */
@@ -627,7 +627,7 @@
 		case PCI_DEVICE_ID_INTEL_82801EB_11:
 		case PCI_DEVICE_ID_INTEL_82801E_11:
 		case PCI_DEVICE_ID_INTEL_ESB_2:
-		case PCI_DEVICE_ID_INTEL_ICH6_2:
+		case PCI_DEVICE_ID_INTEL_ICH6_19:
 		{
 			unsigned int extra = 0;
 			pci_read_config_dword(dev, 0x54, &extra);
@@ -804,7 +804,7 @@
  	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18},
 #endif /* !CONFIG_SCSI_SATA */
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19},
-	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20},
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_19, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20},
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);
--- linux-2.6.6/drivers/ide/pci/piix.h.orig	2004-05-09 19:32:21.000000000 -0700
+++ linux-2.6.6/drivers/ide/pci/piix.h	2004-05-11 17:34:01.997466280 -0700
@@ -70,7 +70,7 @@
 	/* 17 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801DB_10, "ICH4"),
 	/* 18 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801EB_1,  "ICH5-SATA"),
 	/* 19 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_ESB_2,      "ICH5"),
-	/* 20 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_ICH6_2,     "ICH6"),
+	/* 20 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_ICH6_19,     "ICH6"),
 	{
 		.vendor		= 0,
 		.device		= 0,
--- linux-2.6.6/sound/oss/i810_audio.c.orig	2004-05-09 19:33:10.000000000 -0700
+++ linux-2.6.6/sound/oss/i810_audio.c	2004-05-10 11:56:30.000000000 -0700
@@ -120,8 +120,8 @@
 #ifndef PCI_DEVICE_ID_INTEL_ICH5
 #define PCI_DEVICE_ID_INTEL_ICH5	0x24d5
 #endif
-#ifndef PCI_DEVICE_ID_INTEL_ICH6_3
-#define PCI_DEVICE_ID_INTEL_ICH6_3	0x266e
+#ifndef PCI_DEVICE_ID_INTEL_ICH6_18
+#define PCI_DEVICE_ID_INTEL_ICH6_18	0x266e
 #endif
 #ifndef PCI_DEVICE_ID_INTEL_440MX
 #define PCI_DEVICE_ID_INTEL_440MX	0x7195
@@ -351,7 +351,7 @@
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD8111},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_5,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4},
-	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_3,
+	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_18,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4},
 
 	{0,}
@@ -2797,7 +2797,7 @@
 	/* see i810_ac97_init for the next 7 lines (jsaw) */
 	inw(card->ac97base);
 	if ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5 ||
-	     card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_3)
+	     card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_18)
 	    && (card->use_mmio)) {
 		primary_codec_id = (int) readl(card->iobase_mmio + SDM) & 0x3;
 		printk(KERN_INFO "i810_audio: Primary codec has ID %d\n",
@@ -2868,7 +2868,7 @@
 		   last codec ID spoken to. 
 		*/
 		if ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5 ||
-		     card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_3)
+		     card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_18)
 		    && (card->use_mmio)) {
 			ac97_id = (int) readl(card->iobase_mmio + SDM) & 0x3;
 			printk(KERN_INFO "i810_audio: Connection %d with codec id %d\n",
--- linux-2.6.6/drivers/i2c/busses/i2c-i801.c.orig	2004-05-09 19:32:37.000000000 -0700
+++ linux-2.6.6/drivers/i2c/busses/i2c-i801.c	2004-05-10 11:56:30.000000000 -0700
@@ -28,7 +28,8 @@
     82801CA/CAM		2483           
     82801DB		24C3   (HW PEC supported, 32 byte buffer not supported)
     82801EB		24D3   (HW PEC supported, 32 byte buffer not supported)
-
+    6300ESB		25A4
+    ICH6		266A
     This driver supports several versions of Intel's I/O Controller Hubs (ICH).
     For SMBus support, they are similar to the PIIX4 and are part
     of Intel's '810' and other chipsets.
@@ -121,7 +122,8 @@
 
 	I801_dev = dev;
 	if ((dev->device == PCI_DEVICE_ID_INTEL_82801DB_3) ||
-	    (dev->device == PCI_DEVICE_ID_INTEL_82801EB_3))
+	    (dev->device == PCI_DEVICE_ID_INTEL_82801EB_3) ||
+	    (dev->device == PCI_DEVICE_ID_INTEL_ESB_4))
 		isich4 = 1;
 	else
 		isich4 = 0;
@@ -576,10 +578,22 @@
 		.subdevice =	PCI_ANY_ID,
 	},
 	{
-		.vendor =   PCI_VENDOR_ID_INTEL,
-		.device =   PCI_DEVICE_ID_INTEL_82801EB_3,
-		.subvendor =    PCI_ANY_ID,
-		.subdevice =    PCI_ANY_ID,
+		.vendor =	PCI_VENDOR_ID_INTEL,
+		.device =	PCI_DEVICE_ID_INTEL_82801EB_3,
+		.subvendor =	PCI_ANY_ID,
+		.subdevice =	PCI_ANY_ID,
+	},
+	{
+		.vendor =	PCI_VENDOR_ID_INTEL,
+		.device =	PCI_DEVICE_ID_INTEL_ESB_4,
+		.subvendor =	PCI_ANY_ID,
+		.subdevice = 	PCI_ANY_ID,
+	},
+	{
+		.vendor =	PCI_VENDOR_ID_INTEL,
+		.device =	PCI_DEVICE_ID_INTEL_ICH6_16,
+		.subvendor =	PCI_ANY_ID,
+		.subdevice =	PCI_ANY_ID,
 	},
 	{ 0, }
 };
--- linux-2.6.6/drivers/i2c/busses/Kconfig.orig	2004-05-09 19:33:13.000000000 -0700
+++ linux-2.6.6/drivers/i2c/busses/Kconfig	2004-05-10 11:56:30.000000000 -0700
@@ -95,6 +95,8 @@
 	    82801CA/CAM
 	    82801DB
 	    82801EB
+	    6300ESB
+	    ICH6
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-i801.

Re: [PATCH] ICH6/6300ESB i2c support

[Jean Delvare]

Hi Jason,

A few comments on your patch:

> This patch adds DID support for ICH6 and 6300ESB to i2c-i801.c(SMBus).  In
> order to add this support I needed to patch pci_ids.h with the SMBus DID's.
> To keep things orginized I renumbered the ICH6 and ESB entries in pci_ids.h. 
> I then patched the piix IDE and i810 audio drivers to reflect the updated
> #define's.  I also removed an error from irq.c; there was a reference to a
> 6300ESB DID that does not exist.  This patch is against the 2.6.6 kernel.

To me, there are two different things here and you should split your
patch accordingly for clarity.  The renumbering of the entries should go
in a first patch, then the new devices support in i2c-i801 in a second.

I would also suggest that you follow the common habit to name the Intel
82801 chips after their numerical name (82801AA. 82801BA, etc...) and
not their nickname (ICH, ICH2...) in both the entries and the comments. 
Not that it is absolulety better, but that's the way we did so far, so
why change now?

I would appreciate it if you could submit a similar patch for the 2.4
version of the i2c-i801 driver as held in the lm_sensors project.

Thanks.

Jean Delvare


--
Jean "Khali" Delvare
http://khali.linux-fr.org/

RE: [PATCH] ICH6/6300ESB i2c support

[Gaston, Jason D]

Hi Jean,

The reason I have the renumbering in pci_ids.h and the new device
support in i2c-i801 in the same patch, is that the new device support is
dependent on the devices being added to pci_ids.h.  However, if it is
the consensus that these be two separate patches, I can separate them.

As far as using the ICHx model name is concerned; I can not use the
model name "82801xx" until after the product has launched.  I have also
seen requests to use the ICHx name rather then the model number.  Again,
if it is the consensus, I can go back after the product launches and
change all of the #defines, for the device, to use the model number
rather than the "common" name.

I will look into providing the same patch for the 2.4 kernel.

Thank you very much for looking at my patch,

Jason Gaston



-----Original Message-----
From: Jean Delvare [mailto:khali@linux-fr.org] 
Sent: Thursday, May 13, 2004 1:05 AM
To: jdgaston@snoqualmie.dp.intel.com
Cc: LKML
Subject: Re: [PATCH] ICH6/6300ESB i2c support


Hi Jason,

A few comments on your patch:

> This patch adds DID support for ICH6 and 6300ESB to i2c-i801.c(SMBus).
In
> order to add this support I needed to patch pci_ids.h with the SMBus
DID's.
> To keep things orginized I renumbered the ICH6 and ESB entries in
pci_ids.h. 
> I then patched the piix IDE and i810 audio drivers to reflect the
updated
> #define's.  I also removed an error from irq.c; there was a reference
to a
> 6300ESB DID that does not exist.  This patch is against the 2.6.6
kernel.

To me, there are two different things here and you should split your
patch accordingly for clarity.  The renumbering of the entries should go
in a first patch, then the new devices support in i2c-i801 in a second.

I would also suggest that you follow the common habit to name the Intel
82801 chips after their numerical name (82801AA. 82801BA, etc...) and
not their nickname (ICH, ICH2...) in both the entries and the comments. 
Not that it is absolulety better, but that's the way we did so far, so
why change now?

I would appreciate it if you could submit a similar patch for the 2.4
version of the i2c-i801 driver as held in the lm_sensors project.

Thanks.

Jean Delvare


--
Jean "Khali" Delvare
http://khali.linux-fr.org/

Re: [PATCH] ICH6/6300ESB i2c support

[Jean Delvare]

> The reason I have the renumbering in pci_ids.h and the new device
> support in i2c-i801 in the same patch, is that the new device support
> is dependent on the devices being added to pci_ids.h.  However, if it
> is the consensus that these be two separate patches, I can separate
> them.

I think it's better to split because the first patch (renumbering) seems
to be a good thing even if the second patch were not to be applied.
Experience proves that individual patches that do just one thing are
more likely to be accepted quickly than big ones, thus my advice.

> As far as using the ICHx model name is concerned; I can not use the
> model name "82801xx" until after the product has launched.  I have
> also seen requests to use the ICHx name rather then the model number. 
> Again, if it is the consensus, I can go back after the product
> launches and change all of the #defines, for the device, to use the
> model number rather than the "common" name.

That won't be needed. If you have good reasons for your choice, it's
fine with me. I was just wanting to avoid a policy change without a
reason. Since you know why you changed, it's OK (with me at least).

> I will look into providing the same patch for the 2.4 kernel.

Thanks :)

-- 
Jean Delvare
http://khali.linux-fr.org/

Re: [PATCH] ICH6/6300ESB i2c support

[Greg KH]

On Wed, May 12, 2004 at 12:52:23PM -0700, jdgaston@snoqualmie.dp.intel.com wrote:
> 
> Please let me know if there are any questions or if there are any
> changes needed.  Greg k-h, please apply patch if accaptable.

Applied to my trees, thanks.

greg k-h