From 05ef68c2e8b472fa84026f32ef591598acdfa039 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 29 Dec 2019 15:53:00 +0100 Subject: [PATCH] 4.9-stable patches added patches: intel_th-pci-add-comet-lake-pch-v-support.patch intel_th-pci-add-elkhart-lake-soc-support.patch platform-x86-hp-wmi-make-buffer-for-hpwmi_feature2_query-128-bytes.patch staging-comedi-gsc_hpdi-check-dma_alloc_coherent-return-value.patch usb-ehci-do-not-return-epipe-when-hub-is-disconnected.patch usbip-fix-error-path-of-vhci_recv_ret_submit.patch --- ..._th-pci-add-comet-lake-pch-v-support.patch | 35 ++++++++ ..._th-pci-add-elkhart-lake-soc-support.patch | 35 ++++++++ ...r-for-hpwmi_feature2_query-128-bytes.patch | 42 +++++++++ queue-4.9/series | 6 ++ ...heck-dma_alloc_coherent-return-value.patch | 54 ++++++++++++ ...eturn-epipe-when-hub-is-disconnected.patch | 85 +++++++++++++++++++ ...x-error-path-of-vhci_recv_ret_submit.patch | 70 +++++++++++++++ 7 files changed, 327 insertions(+) create mode 100644 queue-4.9/intel_th-pci-add-comet-lake-pch-v-support.patch create mode 100644 queue-4.9/intel_th-pci-add-elkhart-lake-soc-support.patch create mode 100644 queue-4.9/platform-x86-hp-wmi-make-buffer-for-hpwmi_feature2_query-128-bytes.patch create mode 100644 queue-4.9/staging-comedi-gsc_hpdi-check-dma_alloc_coherent-return-value.patch create mode 100644 queue-4.9/usb-ehci-do-not-return-epipe-when-hub-is-disconnected.patch create mode 100644 queue-4.9/usbip-fix-error-path-of-vhci_recv_ret_submit.patch diff --git a/queue-4.9/intel_th-pci-add-comet-lake-pch-v-support.patch b/queue-4.9/intel_th-pci-add-comet-lake-pch-v-support.patch new file mode 100644 index 00000000000..3a73bc9eff2 --- /dev/null +++ b/queue-4.9/intel_th-pci-add-comet-lake-pch-v-support.patch @@ -0,0 +1,35 @@ +From e4de2a5d51f97a6e720a1c0911f93e2d8c2f1c08 Mon Sep 17 00:00:00 2001 +From: Alexander Shishkin +Date: Tue, 17 Dec 2019 13:55:24 +0200 +Subject: intel_th: pci: Add Comet Lake PCH-V support + +From: Alexander Shishkin + +commit e4de2a5d51f97a6e720a1c0911f93e2d8c2f1c08 upstream. + +This adds Intel(R) Trace Hub PCI ID for Comet Lake PCH-V. + +Signed-off-by: Alexander Shishkin +Reviewed-by: Andy Shevchenko +Cc: +Link: https://lore.kernel.org/r/20191217115527.74383-2-alexander.shishkin@linux.intel.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hwtracing/intel_th/pci.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/hwtracing/intel_th/pci.c ++++ b/drivers/hwtracing/intel_th/pci.c +@@ -96,6 +96,11 @@ static const struct pci_device_id intel_ + .driver_data = (kernel_ulong_t)0, + }, + { ++ /* Comet Lake PCH-V */ ++ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa3a6), ++ .driver_data = (kernel_ulong_t)&intel_th_2x, ++ }, ++ { + /* Gemini Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e), + .driver_data = (kernel_ulong_t)0, diff --git a/queue-4.9/intel_th-pci-add-elkhart-lake-soc-support.patch b/queue-4.9/intel_th-pci-add-elkhart-lake-soc-support.patch new file mode 100644 index 00000000000..22d6c7df22f --- /dev/null +++ b/queue-4.9/intel_th-pci-add-elkhart-lake-soc-support.patch @@ -0,0 +1,35 @@ +From 88385866bab8d5e18c7f45d1023052c783572e03 Mon Sep 17 00:00:00 2001 +From: Alexander Shishkin +Date: Tue, 17 Dec 2019 13:55:25 +0200 +Subject: intel_th: pci: Add Elkhart Lake SOC support + +From: Alexander Shishkin + +commit 88385866bab8d5e18c7f45d1023052c783572e03 upstream. + +This adds support for Intel Trace Hub in Elkhart Lake. + +Signed-off-by: Alexander Shishkin +Reviewed-by: Andy Shevchenko +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20191217115527.74383-3-alexander.shishkin@linux.intel.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hwtracing/intel_th/pci.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/hwtracing/intel_th/pci.c ++++ b/drivers/hwtracing/intel_th/pci.c +@@ -105,6 +105,11 @@ static const struct pci_device_id intel_ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e), + .driver_data = (kernel_ulong_t)0, + }, ++ { ++ /* Elkhart Lake */ ++ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4b26), ++ .driver_data = (kernel_ulong_t)&intel_th_2x, ++ }, + { 0 }, + }; + diff --git a/queue-4.9/platform-x86-hp-wmi-make-buffer-for-hpwmi_feature2_query-128-bytes.patch b/queue-4.9/platform-x86-hp-wmi-make-buffer-for-hpwmi_feature2_query-128-bytes.patch new file mode 100644 index 00000000000..240f7c7a4a1 --- /dev/null +++ b/queue-4.9/platform-x86-hp-wmi-make-buffer-for-hpwmi_feature2_query-128-bytes.patch @@ -0,0 +1,42 @@ +From 133b2acee3871ae6bf123b8fe34be14464aa3d2c Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 17 Dec 2019 20:06:04 +0100 +Subject: platform/x86: hp-wmi: Make buffer for HPWMI_FEATURE2_QUERY 128 bytes + +From: Hans de Goede + +commit 133b2acee3871ae6bf123b8fe34be14464aa3d2c upstream. + +At least on the HP Envy x360 15-cp0xxx model the WMI interface +for HPWMI_FEATURE2_QUERY requires an outsize of at least 128 bytes, +otherwise it fails with an error code 5 (HPWMI_RET_INVALID_PARAMETERS): + +Dec 06 00:59:38 kernel: hp_wmi: query 0xd returned error 0x5 + +We do not care about the contents of the buffer, we just want to know +if the HPWMI_FEATURE2_QUERY command is supported. + +This commits bumps the buffer size, fixing the error. + +Fixes: 8a1513b4932 ("hp-wmi: limit hotkey enable") +Cc: stable@vger.kernel.org +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1520703 +Signed-off-by: Hans de Goede +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/hp-wmi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/platform/x86/hp-wmi.c ++++ b/drivers/platform/x86/hp-wmi.c +@@ -308,7 +308,7 @@ static int __init hp_wmi_bios_2008_later + + static int __init hp_wmi_bios_2009_later(void) + { +- int state = 0; ++ u8 state[128]; + int ret = hp_wmi_perform_query(HPWMI_FEATURE2_QUERY, 0, &state, + sizeof(state), sizeof(state)); + if (!ret) diff --git a/queue-4.9/series b/queue-4.9/series index 01032f1098e..f1293e429af 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -101,3 +101,9 @@ net-qlogic-fix-error-paths-in-ql_alloc_large_buffers.patch net-usb-lan78xx-fix-suspend-resume-phy-register-access-error.patch sctp-fully-initialize-v4-addr-in-some-functions.patch net-dst-force-4-byte-alignment-of-dst_metrics.patch +usbip-fix-error-path-of-vhci_recv_ret_submit.patch +usb-ehci-do-not-return-epipe-when-hub-is-disconnected.patch +intel_th-pci-add-comet-lake-pch-v-support.patch +intel_th-pci-add-elkhart-lake-soc-support.patch +platform-x86-hp-wmi-make-buffer-for-hpwmi_feature2_query-128-bytes.patch +staging-comedi-gsc_hpdi-check-dma_alloc_coherent-return-value.patch diff --git a/queue-4.9/staging-comedi-gsc_hpdi-check-dma_alloc_coherent-return-value.patch b/queue-4.9/staging-comedi-gsc_hpdi-check-dma_alloc_coherent-return-value.patch new file mode 100644 index 00000000000..cc4f47a39f0 --- /dev/null +++ b/queue-4.9/staging-comedi-gsc_hpdi-check-dma_alloc_coherent-return-value.patch @@ -0,0 +1,54 @@ +From ab42b48f32d4c766420c3499ee9c0289b7028182 Mon Sep 17 00:00:00 2001 +From: Ian Abbott +Date: Mon, 16 Dec 2019 11:08:23 +0000 +Subject: staging: comedi: gsc_hpdi: check dma_alloc_coherent() return value + +From: Ian Abbott + +commit ab42b48f32d4c766420c3499ee9c0289b7028182 upstream. + +The "auto-attach" handler function `gsc_hpdi_auto_attach()` calls +`dma_alloc_coherent()` in a loop to allocate some DMA data buffers, and +also calls it to allocate a buffer for a DMA descriptor chain. However, +it does not check the return value of any of these calls. Change +`gsc_hpdi_auto_attach()` to return `-ENOMEM` if any of these +`dma_alloc_coherent()` calls fail. This will result in the comedi core +calling the "detach" handler `gsc_hpdi_detach()` as part of the +clean-up, which will call `gsc_hpdi_free_dma()` to free any allocated +DMA coherent memory buffers. + +Cc: #4.6+ +Signed-off-by: Ian Abbott +Link: https://lore.kernel.org/r/20191216110823.216237-1-abbotti@mev.co.uk +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/comedi/drivers/gsc_hpdi.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/staging/comedi/drivers/gsc_hpdi.c ++++ b/drivers/staging/comedi/drivers/gsc_hpdi.c +@@ -632,6 +632,11 @@ static int gsc_hpdi_auto_attach(struct c + dma_alloc_coherent(&pcidev->dev, DMA_BUFFER_SIZE, + &devpriv->dio_buffer_phys_addr[i], + GFP_KERNEL); ++ if (!devpriv->dio_buffer[i]) { ++ dev_warn(dev->class_dev, ++ "failed to allocate DMA buffer\n"); ++ return -ENOMEM; ++ } + } + /* allocate dma descriptors */ + devpriv->dma_desc = dma_alloc_coherent(&pcidev->dev, +@@ -639,6 +644,11 @@ static int gsc_hpdi_auto_attach(struct c + NUM_DMA_DESCRIPTORS, + &devpriv->dma_desc_phys_addr, + GFP_KERNEL); ++ if (!devpriv->dma_desc) { ++ dev_warn(dev->class_dev, ++ "failed to allocate DMA descriptors\n"); ++ return -ENOMEM; ++ } + if (devpriv->dma_desc_phys_addr & 0xf) { + dev_warn(dev->class_dev, + " dma descriptors not quad-word aligned (bug)\n"); diff --git a/queue-4.9/usb-ehci-do-not-return-epipe-when-hub-is-disconnected.patch b/queue-4.9/usb-ehci-do-not-return-epipe-when-hub-is-disconnected.patch new file mode 100644 index 00000000000..b070aff9dfe --- /dev/null +++ b/queue-4.9/usb-ehci-do-not-return-epipe-when-hub-is-disconnected.patch @@ -0,0 +1,85 @@ +From 64cc3f12d1c7dd054a215bc1ff9cc2abcfe35832 Mon Sep 17 00:00:00 2001 +From: Erkka Talvitie +Date: Wed, 11 Dec 2019 10:08:39 +0200 +Subject: USB: EHCI: Do not return -EPIPE when hub is disconnected + +From: Erkka Talvitie + +commit 64cc3f12d1c7dd054a215bc1ff9cc2abcfe35832 upstream. + +When disconnecting a USB hub that has some child device(s) connected to it +(such as a USB mouse), then the stack tries to clear halt and +reset device(s) which are _already_ physically disconnected. + +The issue has been reproduced with: + +CPU: IMX6D5EYM10AD or MCIMX6D5EYM10AE. +SW: U-Boot 2019.07 and kernel 4.19.40. + +CPU: HP Proliant Microserver Gen8. +SW: Linux version 4.2.3-300.fc23.x86_64 + +In this situation there will be error bit for MMF active yet the +CERR equals EHCI_TUNE_CERR + halt. Existing implementation +interprets this as a stall [1] (chapter 8.4.5). + +The possible conditions when the MMF will be active + halt +can be found from [2] (Table 4-13). + +Fix for the issue is to check whether MMF is active and PID Code is +IN before checking for the stall. If these conditions are true then +it is not a stall. + +What happens after the fix is that when disconnecting a hub with +attached device(s) the situation is not interpret as a stall. + +[1] [https://www.usb.org/document-library/usb-20-specification, usb_20.pdf] +[2] [https://www.intel.com/content/dam/www/public/us/en/documents/ + technical-specifications/ehci-specification-for-usb.pdf] + +Signed-off-by: Erkka Talvitie +Reviewed-by: Alan Stern +Cc: stable +Link: https://lore.kernel.org/r/ef70941d5f349767f19c0ed26b0dd9eed8ad81bb.1576050523.git.erkka.talvitie@vincit.fi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/host/ehci-q.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/drivers/usb/host/ehci-q.c ++++ b/drivers/usb/host/ehci-q.c +@@ -40,6 +40,10 @@ + + /*-------------------------------------------------------------------------*/ + ++/* PID Codes that are used here, from EHCI specification, Table 3-16. */ ++#define PID_CODE_IN 1 ++#define PID_CODE_SETUP 2 ++ + /* fill a qtd, returning how much of the buffer we were able to queue up */ + + static int +@@ -203,7 +207,7 @@ static int qtd_copy_status ( + int status = -EINPROGRESS; + + /* count IN/OUT bytes, not SETUP (even short packets) */ +- if (likely (QTD_PID (token) != 2)) ++ if (likely(QTD_PID(token) != PID_CODE_SETUP)) + urb->actual_length += length - QTD_LENGTH (token); + + /* don't modify error codes */ +@@ -219,6 +223,13 @@ static int qtd_copy_status ( + if (token & QTD_STS_BABBLE) { + /* FIXME "must" disable babbling device's port too */ + status = -EOVERFLOW; ++ /* ++ * When MMF is active and PID Code is IN, queue is halted. ++ * EHCI Specification, Table 4-13. ++ */ ++ } else if ((token & QTD_STS_MMF) && ++ (QTD_PID(token) == PID_CODE_IN)) { ++ status = -EPROTO; + /* CERR nonzero + halt --> stall */ + } else if (QTD_CERR(token)) { + status = -EPIPE; diff --git a/queue-4.9/usbip-fix-error-path-of-vhci_recv_ret_submit.patch b/queue-4.9/usbip-fix-error-path-of-vhci_recv_ret_submit.patch new file mode 100644 index 00000000000..3bed339adbf --- /dev/null +++ b/queue-4.9/usbip-fix-error-path-of-vhci_recv_ret_submit.patch @@ -0,0 +1,70 @@ +From aabb5b833872524eaf28f52187e5987984982264 Mon Sep 17 00:00:00 2001 +From: Suwan Kim +Date: Fri, 13 Dec 2019 11:30:55 +0900 +Subject: usbip: Fix error path of vhci_recv_ret_submit() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Suwan Kim + +commit aabb5b833872524eaf28f52187e5987984982264 upstream. + +If a transaction error happens in vhci_recv_ret_submit(), event +handler closes connection and changes port status to kick hub_event. +Then hub tries to flush the endpoint URBs, but that causes infinite +loop between usb_hub_flush_endpoint() and vhci_urb_dequeue() because +"vhci_priv" in vhci_urb_dequeue() was already released by +vhci_recv_ret_submit() before a transmission error occurred. Thus, +vhci_urb_dequeue() terminates early and usb_hub_flush_endpoint() +continuously calls vhci_urb_dequeue(). + +The root cause of this issue is that vhci_recv_ret_submit() +terminates early without giving back URB when transaction error +occurs in vhci_recv_ret_submit(). That causes the error URB to still +be linked at endpoint list without “vhci_priv". + +So, in the case of transaction error in vhci_recv_ret_submit(), +unlink URB from the endpoint, insert proper error code in +urb->status and give back URB. + +Reported-by: Marek Marczykowski-Górecki +Tested-by: Marek Marczykowski-Górecki +Signed-off-by: Suwan Kim +Cc: stable +Acked-by: Shuah Khan +Link: https://lore.kernel.org/r/20191213023055.19933-3-suwan.kim027@gmail.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/usbip/vhci_rx.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +--- a/drivers/usb/usbip/vhci_rx.c ++++ b/drivers/usb/usbip/vhci_rx.c +@@ -90,16 +90,21 @@ static void vhci_recv_ret_submit(struct + usbip_pack_pdu(pdu, urb, USBIP_RET_SUBMIT, 0); + + /* recv transfer buffer */ +- if (usbip_recv_xbuff(ud, urb) < 0) +- return; ++ if (usbip_recv_xbuff(ud, urb) < 0) { ++ urb->status = -EPROTO; ++ goto error; ++ } + + /* recv iso_packet_descriptor */ +- if (usbip_recv_iso(ud, urb) < 0) +- return; ++ if (usbip_recv_iso(ud, urb) < 0) { ++ urb->status = -EPROTO; ++ goto error; ++ } + + /* restore the padding in iso packets */ + usbip_pad_iso(ud, urb); + ++error: + if (usbip_dbg_flag_vhci_rx) + usbip_dump_urb(urb); + -- 2.47.3