Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Saenz Julienne <nsaenzjulienne@suse.de>2019-01-11 12:45:55 +0100
committerNicolas Saenz Julienne <nsaenzjulienne@suse.de>2019-01-11 12:46:05 +0100
commita5fcedb88acd3a4b5c5a5ef412e8b8f0173bf880 (patch)
tree747991dac9943dd8687ce61f05abf9c81376f7b1
parent6e5a55713d1bf241a637b3bded8dfcb51cd93f07 (diff)
USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd
(git-fixes).
-rw-r--r--patches.drivers/usb-xhci-fix-broken_suspend-placement-in-struct-xchi_hcd.patch43
-rw-r--r--series.conf1
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.drivers/usb-xhci-fix-broken_suspend-placement-in-struct-xchi_hcd.patch b/patches.drivers/usb-xhci-fix-broken_suspend-placement-in-struct-xchi_hcd.patch
new file mode 100644
index 0000000000..3fda27df61
--- /dev/null
+++ b/patches.drivers/usb-xhci-fix-broken_suspend-placement-in-struct-xchi_hcd.patch
@@ -0,0 +1,43 @@
+From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+Date: Mon, 17 Dec 2018 14:37:40 +0100
+Subject: USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd
+Git-commit: 2419f30a4a4fcaa5f35111563b4c61f1b2b26841
+Patch-mainline: v4.20
+References: git-fixes
+
+As commented in the struct's definition there shouldn't be anything
+underneath its 'priv[0]' member as it would break some macros.
+
+The patch converts the broken_suspend into a bit-field and relocates it
+next to to the rest of bit-fields.
+
+Fixes: a7d57abcc8a5 ("xhci: workaround CSS timeout on AMD SNPS 3.0 xHC")
+Reported-by: Oliver Neukum <oneukum@suse.com>
+Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/host/xhci.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/host/xhci.h
++++ b/drivers/usb/host/xhci.h
+@@ -1858,6 +1858,8 @@ struct xhci_hcd {
+ unsigned sw_lpm_support:1;
+ /* support xHCI 1.0 spec USB2 hardware LPM */
+ unsigned hw_lpm_support:1;
++ /* Broken Suspend flag for SNPS Suspend resume issue */
++ unsigned broken_suspend:1;
+ /* cached usb2 extened protocol capabilites */
+ u32 *ext_caps;
+ unsigned int num_ext_caps;
+@@ -1870,8 +1872,6 @@ struct xhci_hcd {
+
+ /* platform-specific data -- must come last */
+ unsigned long priv[0] __aligned(sizeof(s64));
+- /* Broken Suspend flag for SNPS Suspend resume issue */
+- u8 broken_suspend;
+ };
+
+ /* Platform specific overrides to generic XHCI hc_driver ops */
diff --git a/series.conf b/series.conf
index e7a88135b2..3b8d000813 100644
--- a/series.conf
+++ b/series.conf
@@ -41659,6 +41659,7 @@
patches.drivers/USB-serial-option-add-Simcom-SIM7500-SIM7600-MBIM-mo.patch
patches.drivers/USB-serial-option-add-Fibocom-NL668-series.patch
patches.drivers/USB-serial-option-add-Telit-LN940-series.patch
+ patches.drivers/usb-xhci-fix-broken_suspend-placement-in-struct-xchi_hcd.patch
patches.suse/msft-hv-1804-uio_hv_generic-set-callbacks-on-open.patch
patches.suse/msft-hv-1805-x86-hyperv-remove-PCI-dependency.patch
patches.suse/msft-hv-1806-Drivers-hv-vmbus-Return-EINVAL-for-the-sys-files-for.patch