Author: cebbert

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

Modified Files: linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch Log Message: official patch, for -stable

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

Index: linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch 26 Mar 2008 20:05:26 -0000 1.1 +++ linux-2.6-pci-keep-SMBus-hidden-on-nx6110.patch 31 Mar 2008 23:01:56 -0000 1.2 @@ -1,30 +1,41 @@ -From: Jean Delvare khali@linux-fr.org -Subject: PCI: Revert SMBus unhide on HP Compaq nx6110 +Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commi... +Commit: a99acc832de1104afaba02d7c2576fd9b9fd6422 +Parent: 5ac7ec85bcc70ef605657fb2d1106d27ab3bd131 +Author: Jean Delvare khali@linux-fr.org +AuthorDate: Fri Mar 28 14:16:04 2008 -0700 +Committer: Linus Torvalds torvalds@linux-foundation.org +CommitDate: Fri Mar 28 14:45:22 2008 -0700

-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@linux-fr.org -Cc: Tomasz Koprowski tomek@koprowski.org -Cc: Greg Kroah-Hartman gregkh@suse.de + 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@linux-fr.org + Cc: Tomasz Koprowski tomek@koprowski.org + Acked-by: Greg Kroah-Hartman gregkh@suse.de + Signed-off-by: Andrew Morton akpm@linux-foundation.org + Signed-off-by: Linus Torvalds torvalds@linux-foundation.org --- drivers/pci/quirks.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) + 1 files 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 +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index e9a333d..e887aa4 100644 +--- a/drivers/pci/quirks.c ++++ b/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. @@ -37,7 +48,7 @@ */ static int asus_hides_smbus;

-@@ -1028,11 +1034,6 @@ static void __init asus_hides_smbus_host +@@ -1028,11 +1034,6 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev) case 0x12bf: /* HP xw4100 */ asus_hides_smbus = 1; }