On Fri, Jun 08, 2012 at 07:55:21AM +0900, Greg Kroah-Hartman wrote: > On Thu, Jun 07, 2012 at 03:49:11PM -0700, Sarah Sharp wrote: > > If the user chooses to say "no" to CONFIG_USB_XHCI_HCD on a system > > with an Intel Panther Point chipset, the PCI quirks code or the EHCI > > driver will switch the ports over to the xHCI host, but the xHCI driver > > will never load. The ports will be powered off and seem "dead" to the > > user. > > > > Fix this by only switching the ports over if CONFIG_USB_XHCI_HCD is > > either compiled in, or compiled as a module. > > > > This patch should be backported to the 3.0 stable kernel, since it > > contains the commit 69e848c2090aebba5698a1620604c7dccb448684 "Intel > > xhci: Support EHCI/xHCI port switching." > > > > Signed-off-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx> > > Reported-by: Eric Anholt <eric.anholt@xxxxxxxxx> > > Reported-by: David Bein <d.bein@xxxxxx> > > Cc: stable@xxxxxxxxxxxxxxx > > --- > > > > Hi Greg, > > > > This patch should build against the 3.0-stable branch. Please queue it > > for 3.0. > > Hm, really? What patch is this in Linus's tree, > 69e848c2090aebba5698a1620604c7dccb448684? This is a bug fix against the feature added in commit 69e848c. This bug fix is already in Linus' tree, see commit 51c9e6c7732b67769c0a514d31f505e49fa82dd4 "xhci: Avoid dead ports when CONFIG_USB_XHCI_HCD=n" > If so, why not just use that > one? Or is this a backported version of that commit? You sent me mail that commit 51c9e6c7732b67769c0a514d31f505e49fa82dd4 didn't compile against the 3.0 kernel, and you were dropping it from the 3.0 queue. So I tried to see why it didn't compile. The original commit doesn't compile against the 3.0 kernel sources because it uses the macro IS_ENABLED() from the header file linux/kconfig.h. That header file wasn't added until the 3.1 kernel, with commit 2a11c8ea20bf850b3a2c60db8c2e7497d28aba99 "kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()". This version of the patch reworks the code to use the old style of checking for kernel modules: +#if defined(CONFIG_USB_XHCI_HCD) || defined(CONFIG_USB_XHCI_HCD_MODULE) instead of the new style introduced in linux/kconfig.h: if (IS_ENABLED(CONFIG_USB_XHCI_HCD)) So please accept this patch in lieu of just adding commit 51c9e6c7732b67769c0a514d31f505e49fa82dd4 to the 3.0 stable tree. Sarah Sharp -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
