Attachment 304564 Details for Bug 182687 – Improved patch

[patch] Improved patch

linux-i2c-piix4-inc-delay-after-starting-transaction.patch (text/plain), 1.46 KB, created by Jean Delvare on 2008-05-05 21:34:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean Delvare

Created: 2008-05-05 21:34:06 UTC

Size: 1.46 KB

patch

obsolete

>---
> drivers/i2c/busses/i2c-piix4.c |   15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
>--- linux-2.6.26-rc1.orig/drivers/i2c/busses/i2c-piix4.c	2008-05-05 20:29:05.000000000 +0200
>+++ linux-2.6.26-rc1/drivers/i2c/busses/i2c-piix4.c	2008-05-05 23:25:34.000000000 +0200
>@@ -105,6 +105,7 @@ MODULE_PARM_DESC(force_addr,
> static int piix4_transaction(void);
> 
> static unsigned short piix4_smba;
>+static unsigned short srvrworks_csb5_delay;
> static struct pci_driver piix4_driver;
> static struct i2c_adapter piix4_adapter;
> 
>@@ -151,6 +152,10 @@ static int __devinit piix4_setup(struct 
> 		return -EPERM;
> 	}
> 
>+	if ((PIIX4_dev->vendor == PCI_VENDOR_ID_SERVERWORKS) &&
>+	    (PIIX4_dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5))
>+		srvrworks_csb5_delay = 1;
>+
> 	/* Don't access SMBus on IBM systems which get corrupted eeproms */
> 	if (dmi_check_system(piix4_dmi_ibm) &&
> 			PIIX4_dev->vendor == PCI_VENDOR_ID_INTEL) {
>@@ -262,10 +267,14 @@ static int piix4_transaction(void)
> 	outb_p(inb(SMBHSTCNT) | 0x040, SMBHSTCNT);
> 
> 	/* We will always wait for a fraction of a second! (See PIIX4 docs errata) */
>-	do {
>+	if (srvrworks_csb5_delay) /* Extra delay for SERVERWORKS_CSB5 */
>+		msleep(2);
>+	else
>+		msleep(1);
>+
>+	while ((timeout++ < MAX_TIMEOUT) &&
>+	       ((temp = inb_p(SMBHSTSTS)) & 0x01))
> 		msleep(1);
>-		temp = inb_p(SMBHSTSTS);
>-	} while ((temp & 0x01) && (timeout++ < MAX_TIMEOUT));
> 
> 	/* If the SMBus is still busy, we give up */
> 	if (timeout >= MAX_TIMEOUT) {

Actions: View | Diff

Attachments on bug 182687: 303535 | 303775 | 304504 | 304537 | 304564 | 304646