rpms/kernel/F-8 linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch, NONE, 1.1 kernel.spec, 1.402, 1.403

Chuck Ebbert (cebbert) fedora-extras-commits at redhat.com
Wed Mar 26 20:06:52 UTC 2008


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14363

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch 
Log Message:
* Wed Mar 26 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.4-57
- Fix spurious thermal trips on Compaq notebook. (#437466)


linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch:

--- NEW FILE linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch ---
From: Jean Delvare <khali at linux-fr.org>
Subject: PCI: Revert SMBus unhide on HP Compaq nx6110

This reverts commit 3c0a654e390d00fef9d8faed758f5e1e8078adb5 and
fixes kernel bug #10245.
http://bugzilla.kernel.org/show_bug.cgi?id=10245

The HP Compaq nc6120 has the same PCI sub-device ID as the nx6110, and the
SMBus is used by ACPI for thermal management on the nc6120, so Linux should
not attach a native driver to it. This means that this quirk is unsafe and
has to be removed.

I also added a comment to help developers realize that adding new IDs
to this SMBus unhiding quirk table should be done only with great care,
and in particular only after checking that ACPI is not making use of
the SMBus.

Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: Tomasz Koprowski <tomek at koprowski.org>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/pci/quirks.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- linux-2.6.25-rc6.orig/drivers/pci/quirks.c	2008-03-05 16:44:21.000000000 +0100
+++ linux-2.6.25-rc6/drivers/pci/quirks.c	2008-03-21 10:08:46.000000000 +0100
@@ -951,6 +951,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
  * 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_host
 			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) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- kernel.spec	25 Mar 2008 20:39:39 -0000	1.402
+++ kernel.spec	26 Mar 2008 20:05:26 -0000	1.403
@@ -628,7 +628,7 @@
 Patch350: linux-2.6-devmem.patch
 Patch370: linux-2.6-crash-driver.patch
 
-# Patch380: linux-2.6-irq-synchronization.patch
+Patch380: linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch
 
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
@@ -1153,9 +1153,7 @@
 #
 # driver core
 #
-# synchronize irqs poperly
-# ApplyPatch linux-2.6-irq-synchronization.patch
-# don't resize transparent bridges
+ApplyPatch linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch
 
 #
 # SCSI Bits.
@@ -1931,6 +1929,9 @@
 
 
 %changelog
+* Wed Mar 26 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.4-57
+- Fix spurious thermal trips on Compaq notebook. (#437466)
+
 * Tue Mar 25 2008 Jarod Wilson <jwilson at redhat.com> 2.6.24.4-56
 - Plug DMA memory leak in firewire async receive handler
 




More information about the fedora-extras-commits mailing list