Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-09-07 21:21:52 +0200
committerJiri Kosina <jkosina@suse.cz>2015-09-07 21:21:52 +0200
commitbef9feb587448ac1a6da63963be09fac0cc548d5 (patch)
tree0e4d981482501f57b1197d408b7ada0fcec48845
parent7213ecd97c9e3f51129e5c8546bf724741872915 (diff)
parentd17d29d156a06affe2c0c95ef4bc7886a205d881 (diff)
Merge branch 'SLE11-SP3' into SLE11-SP4
-rw-r--r--patches.suse/0001-ehci-pci-enable-interrupt-on-BayTrail.patch38
-rw-r--r--series.conf3
2 files changed, 41 insertions, 0 deletions
diff --git a/patches.suse/0001-ehci-pci-enable-interrupt-on-BayTrail.patch b/patches.suse/0001-ehci-pci-enable-interrupt-on-BayTrail.patch
new file mode 100644
index 0000000000..3798d1a0e9
--- /dev/null
+++ b/patches.suse/0001-ehci-pci-enable-interrupt-on-BayTrail.patch
@@ -0,0 +1,38 @@
+From 19f3a213b13274e107c2ed0e5d7436aef27ade4e Mon Sep 17 00:00:00 2001
+From: Oliver Neukum <oneukum@suse.com>
+Date: Thu, 3 Sep 2015 13:37:22 +0200
+Subject: [PATCH] ehci-pci: enable interrupt on BayTrail
+References: bnc926007
+Git-Commit: 19f3a213b13274e107c2ed0e5d7436aef27ade4e
+Patch-Mainline: Never (rendered obsolete by later changes in the PCI layer)
+
+BayTrail needs the interrupt to be explicitely enabled
+in our old 3.0 framework
+
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ drivers/usb/host/ehci-pci.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
+index 963a31f..9da37ee 100644
+--- a/drivers/usb/host/ehci-pci.c
++++ b/drivers/usb/host/ehci-pci.c
+@@ -144,6 +144,14 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
+ hcd->has_tt = 1;
+ tdi_reset(ehci);
+ }
++ /*
++ * on some BayTrail systems the firmware hands over the
++ * EHCI with interrupts disabled. Just in case, we override.
++ * Failure to do so renders the affected controllers unusable.
++ * In later kernels the generic PCI layer does this.
++ */
++ if (pdev->device == 0x0f34)
++ pci_intx(pdev, 1);
+ break;
+ case PCI_VENDOR_ID_TDI:
+ if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {
+--
+2.1.4
+
diff --git a/series.conf b/series.conf
index 36f1f0123a..8f55fa64ff 100644
--- a/series.conf
+++ b/series.conf
@@ -19127,6 +19127,9 @@
patches.drivers/0012-xhci-report-U3-when-link-is-in-resume-state.patch
patches.drivers/0013-xhci-do-not-report-PLC-when-link-is-in-internal-resu.patch
+ #BayTrail support for SLEPOS
+ patches.suse/0001-ehci-pci-enable-interrupt-on-BayTrail.patch
+
#kABI placeholders
patches.suse/0001-Add-a-void-suse_kabi_padding-placeholder-to-some-USB.patch