rpms/kernel/devel git-linus.diff, 1.17, 1.18 kernel.spec, 1.1821, 1.1822

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20631

Modified Files:
	git-linus.diff kernel.spec 
Log Message:
Last-minute USB fix from upstream.

git-linus.diff:
 pci-quirks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- git-linus.diff	3 Mar 2009 21:55:18 -0000	1.17
+++ git-linus.diff	12 Oct 2009 04:30:03 -0000	1.18
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User Linus Torvalds <torvalds at linux-foundation.org>
+# Date 1255301877 25200
+# Node ID 7d6c25d3acd4ffe9cd339ae4032b80480837a5d8
+# Parent  606b8ffcf2f0fe29cd00e35bd04dbae63487951e
+Revert "USB: Work around BIOS bugs by quiescing USB controllers earlier"
+
+This reverts commit db8be50c4307dac2b37305fc59c8dc0f978d09ea, as per
+
+	http://bugzilla.kernel.org/show_bug.cgi?id=14374
+	http://marc.info/?l=linux-kernel&m=125446885705223&w=4
+
+We simply can't do the USB handoff at FIXUP_HEADER time, since it will
+often require us to have valid IO mappings etc.  But that in turn
+requires a whole different approach, not this trivial one-liner.
+
+Maybe we could teach all the USB quirk handoff handlers to only do the
+quirk if the device has all its registers set up (since if it isn't
+initialized, it's unlikely to be active), but regardless that will need
+a whole lot more code than just saying "let's do it really early".
+
+The proper fix is almost certainly to just leave the legacy IOMMU
+mappings active until after all devices have been initialized.
+
+Reported-by: Nick Piggin <npiggin at suse.de>
+Cc: David Woodhouse <David.Woodhouse at intel.com>
+Cc: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+committer: Linus Torvalds <torvalds at linux-foundation.org>
+
+--- a/drivers/usb/host/pci-quirks.c	Sun Oct 11 22:00:06 2009 +0000
++++ b/drivers/usb/host/pci-quirks.c	Sun Oct 11 15:57:57 2009 -0700
+@@ -475,4 +475,4 @@
+ 	else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
+ 		quirk_usb_handoff_xhci(pdev);
+ }
+-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
++DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1821
retrieving revision 1.1822
diff -u -p -r1.1821 -r1.1822
--- kernel.spec	12 Oct 2009 04:12:33 -0000	1.1821
+++ kernel.spec	12 Oct 2009 04:30:03 -0000	1.1822
@@ -1107,7 +1107,7 @@ make -f %{SOURCE20} VERSION=%{version} c
   done
 %endif
 
-#ApplyOptionalPatch git-linus.diff
+ApplyOptionalPatch git-linus.diff
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1988,6 +1988,9 @@ fi
 # ##############################################################
 
 %changelog
+* Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.32-0.24.rc4.git0
+- Last-minute USB fix from upstream.
+
 * Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix lirc build after header changes.
 - Fix bug in lirc interrupt processing.