Skip to contentSkip to conversation

I2C: sis96x SMBus quirks cannot

PATCH New Mark M. Hoffman 2 participants 3 messages May 13, 2006 – May 24, 2006 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 I2C: sis96x SMBus quirks cannot

The sis96x SMBus PCI device depends on the order of two different quirks, which depends on link order. But this is apparently not guaranteed, as seen on a recent FC4 kernel. This patch fixes the quirk so that it works without depending on the link order.

http://lists.lm-sensors.org/pipermail/lm-sensors/2006-April/015962.html
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id9719

This code was suggested by Jean Delvare; the patch was tested and should be considered for 2.6.17.

Signed-off-by Mark M. Hoffman <mhoffman at lightlink.com>
drivers/pci/quirks.c +8 -6
@@ -1056,10 +1056,11 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
 static void __init quirk_sis_96x_smbus(struct pci_dev *dev)
 {
 	u8 val = 0;
-	printk(KERN_INFO "Enabling SiS 96x SMBus.\n");
-	pci_read_config_byte(dev, 0x77, &val);
-	pci_write_config_byte(dev, 0x77, val & ~0x10);
 	pci_read_config_byte(dev, 0x77, &val);
+	if (val & 0x10) {
+		printk(KERN_INFO "Enabling SiS 96x SMBus.\n");
+		pci_write_config_byte(dev, 0x77, val & ~0x10);
+	}
 }
 
 /*
@@ -1091,11 +1092,12 @@ static void __init quirk_sis_503(struct 
 	printk(KERN_WARNING "Uncovering SIS%x that hid as a SIS503 (compatible=%d)\n", devid, sis_96x_compatible);
 
 	/*
-	 * Ok, it now shows up as a 96x.. The 96x quirks are after
-	 * the 503 quirk in the quirk table, so they'll automatically
-	 * run and enable things like the SMBus device
+	 * Ok, it now shows up as a 96x... run the 96x quirk by
+	 * hand in case that one has already been processed.
+	 * (depends on link order, which is apparently not guaranteed)
 	 */
 	dev->device = devid;
+	quirk_sis_96x_smbus(dev);
 }
 
 static void __init quirk_sis_96x_compatible(struct pci_dev *dev)
Signature · 2 lines
Mark M. Hoffman
mhoffman at lightlink.com
#1 lore raw

PATCH 1/1 I2C: sis96x SMBus quirks cannot

Hi Mark,

Sorry for the late reply.

Quoted 10 lines

The sis96x SMBus PCI device depends on the order of two different quirks, which depends on link order. But this is apparently not guaranteed, as seen on a recent FC4 kernel. This patch fixes the quirk so that it works without depending on the link order.

http://lists.lm-sensors.org/pipermail/lm-sensors/2006-April/015962.html
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id9719

This code was suggested by Jean Delvare; the patch was tested and should be considered for 2.6.17.

I'm happier with this patch than the previous one. However, I'm still not really comfortable with it. Given that we don't understand why the quirk order suddenly became untrustworthy, it's hard to justify that we want this fix in 2.6.17, especially when vanilla kernels are not affected by the problem as far as I know.

At any rate, this patch does belong to the pci tree and not the i2c tree, so I am not the one who can push it. Please post this patch on the linux-pci list and get it discussed there. Hopefully the people there will be able to explain how the quirks sequencing works.

(Please put me in Cc, I'm interested in the answer.)

Thanks,

Signature · 1 line
Jean Delvare
#2 lore raw

PATCH 1/1 I2C: sis96x SMBus quirks cannot

In reply to Mark M. Hoffman

Hi Jean:

Quoted 19 lines · Jean Delvare

Sorry for the late reply.

Quoted 10 lines

The sis96x SMBus PCI device depends on the order of two different quirks, which depends on link order. But this is apparently not guaranteed, as seen on a recent FC4 kernel. This patch fixes the quirk so that it works without depending on the link order.

http://lists.lm-sensors.org/pipermail/lm-sensors/2006-April/015962.html
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id9719

This code was suggested by Jean Delvare; the patch was tested and should be considered for 2.6.17.

I'm happier with this patch than the previous one. However, I'm still not really comfortable with it. Given that we don't understand why the quirk order suddenly became untrustworthy, it's hard to justify that we want this fix in 2.6.17, especially when vanilla kernels are not affected by the problem as far as I know.

Quoted 4 lines

At any rate, this patch does belong to the pci tree and not the i2c tree, so I am not the one who can push it. Please post this patch on the linux-pci list and get it discussed there. Hopefully the people there will be able to explain how the quirks sequencing works.

That's fair enough.

Quoted 1 line

(Please put me in Cc, I'm interested in the answer.)

Thanks,

Signature · 2 lines
Mark M. Hoffman
mhoffman at lightlink.com