From 63622166ca436d0c27cbecfd31ddfe6953c9b8dd Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 28 Mar 2008 14:16:04 -0700 Subject: [PATCH] --- yaml --- r: 87903 b: refs/heads/master c: a99acc832de1104afaba02d7c2576fd9b9fd6422 h: refs/heads/master i: 87901: 60d482b90740816ad9cd9fd7084aadafb0327981 87899: a9c73624abe7087d892ef437a74f3b6dee22e8f1 87895: 4218c84b0824691be7927230609089217365cc3a 87887: 14e97eb66ae123cd246b9920c1e2136bc19b74b6 87871: 2ebe08cf58782f5129615c1d687ab89abca31567 v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 46274667da7b..a166b3949152 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ac7ec85bcc70ef605657fb2d1106d27ab3bd131 +refs/heads/master: a99acc832de1104afaba02d7c2576fd9b9fd6422 diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index e9a333d98552..e887aa45c9cd 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -951,6 +951,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82375, quirk_e * accesses to the SMBus registers, with potentially bad effects. Thus you * should be very careful when adding new entries: if SMM is accessing the * Intel SMBus, this is a very good reason to leave it hidden. + * + * Likewise, many recent laptops use ACPI for thermal management. If the + * ACPI DSDT code accesses the SMBus, then Linux should not access it + * natively, and keeping the SMBus hidden is the right thing to do. If you + * are about to add an entry in the table below, please first disassemble + * the DSDT and double-check that there is no code accessing the SMBus. */ static int asus_hides_smbus; @@ -1028,11 +1034,6 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev) case 0x12bf: /* HP xw4100 */ asus_hides_smbus = 1; } - else if (dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB) - switch (dev->subsystem_device) { - case 0x099c: /* HP Compaq nx6110 */ - asus_hides_smbus = 1; - } } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)) { if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB) switch(dev->subsystem_device) {