diff mbox

[Regression,Trusty] Built-in ohci-pci

Message ID 1386162270-31210-1-git-send-email-stefan.bader@canonical.com
State New
Headers show

Commit Message

Stefan Bader Dec. 4, 2013, 1:04 p.m. UTC 
Since the split USB keyboards are broken for several people using the
server image (Saucy).

In order for those to get a working image, the cd image would have to
be recreated with the new kernel... Not sure how likely this will happen
for Saucy. For that I have to follow up with a separate version (mostly
for the modules.ignore part).

Should not change anything on Arm (as it is PCI related) but maybe
we should cross-check... at least this seems to have been built on
armhf.

-Stefan

From db60345463ec7c4df551ac74025b59875dc2e518 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Wed, 4 Dec 2013 11:59:46 +0100
Subject: [PATCH] UBUNTU: (config) Built-in ohci-pci

This was separated from the ohci-hcd driver in:

  commit c1117afb85890adf4073c7ff18ebcb4d0495e6af
  Author: Manjunath Goudar <manjunath.goudar@linaro.org>
  Date:   Tue May 28 18:34:51 2013 +0530

    USB: OHCI: make ohci-pci a separate driver

There is a similar split for the EHCI driver (though the option there
is USB_EHCI_PCI, without the HCD) which is set to y and for XHCI the
PCI part always gets attached to the main XHCI_HCD module based on
CONFIG_PCI. That driver also is built-in.

Without that change USB keyboards will not work before the module gets
loaded and that is not done in the debian installer. So installations
(at least server image) cannot be controlled from a USB keyboard (which
includes virtual KVM access (IPMI).

BugLink: http://bugs.launchpad.net/bugs/1244176

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 debian.master/abi/3.12.0-5.13/modules.ignore |    1 +
 debian.master/config/config.common.ubuntu    |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 debian.master/abi/3.12.0-5.13/modules.ignore

Comments

Tim Gardner Dec. 4, 2013, 1:23 p.m. UTC | #1
diff mbox

Patch

diff --git a/debian.master/abi/3.12.0-5.13/modules.ignore b/debian.master/abi/3.12.0-5.13/modules.ignore
new file mode 100644
index 0000000..70f4968
--- /dev/null
+++ b/debian.master/abi/3.12.0-5.13/modules.ignore
@@ -0,0 +1 @@ 
+ohci-pci
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 58d5416..e78a4b9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6432,7 +6432,7 @@  CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
-CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set