From: Greg Kroah-Hartman Date: Tue, 27 Oct 2020 13:45:41 +0000 (+0100) Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... X-Git-Tag: v4.4.241~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=284afee602e6382619b66ce75c5c8aa3264bad5f;p=thirdparty%2Fkernel%2Fstable-queue.git Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue --- 284afee602e6382619b66ce75c5c8aa3264bad5f diff --cc queue-4.14/series index dcd8ab42c40,9edb056dc0b..6ef9348e825 --- a/queue-4.14/series +++ b/queue-4.14/series @@@ -184,7 -184,4 +184,8 @@@ usb-core-solve-race-condition-in-anchor scsi-ufs-ufs-qcom-fix-race-conditions-caused-by-ufs_.patch ath10k-check-idx-validity-in-__ath10k_htt_rx_ring_fi.patch net-korina-cast-kseg0-address-to-pointer-in-kfree.patch +tty-serial-fsl_lpuart-fix-lpuart32_poll_get_char.patch +usb-cdc-acm-add-quirk-to-blacklist-etas-es58x-devices.patch +usb-cdc-wdm-make-wdm_flush-interruptible-and-add-wdm_fsync.patch +eeprom-at25-set-minimum-read-write-access-stride-to-1.patch + usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch diff --cc queue-4.19/series index eb025c0a60f,bebd4ddfeeb..d1ebaee3978 --- a/queue-4.19/series +++ b/queue-4.19/series @@@ -258,7 -258,4 +258,8 @@@ usb-core-solve-race-condition-in-anchor scsi-ufs-ufs-qcom-fix-race-conditions-caused-by-ufs_.patch ath10k-check-idx-validity-in-__ath10k_htt_rx_ring_fi.patch net-korina-cast-kseg0-address-to-pointer-in-kfree.patch +tty-serial-fsl_lpuart-fix-lpuart32_poll_get_char.patch +usb-cdc-acm-add-quirk-to-blacklist-etas-es58x-devices.patch +usb-cdc-wdm-make-wdm_flush-interruptible-and-add-wdm_fsync.patch +eeprom-at25-set-minimum-read-write-access-stride-to-1.patch + usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch diff --cc queue-4.9/series index 941883f0536,fdb5dde7fb0..08f1cd60c8d --- a/queue-4.9/series +++ b/queue-4.9/series @@@ -133,6 -133,4 +133,7 @@@ brcm80211-fix-possible-memleak-in-brcmf usb-core-solve-race-condition-in-anchor-cleanup-func.patch ath10k-check-idx-validity-in-__ath10k_htt_rx_ring_fi.patch net-korina-cast-kseg0-address-to-pointer-in-kfree.patch +usb-cdc-acm-add-quirk-to-blacklist-etas-es58x-devices.patch +usb-cdc-wdm-make-wdm_flush-interruptible-and-add-wdm_fsync.patch +eeprom-at25-set-minimum-read-write-access-stride-to-1.patch + usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch diff --cc queue-5.4/series index f1fcaf79f8b,b239deb133e..4cfc94cc4c7 --- a/queue-5.4/series +++ b/queue-5.4/series @@@ -400,9 -400,4 +400,10 @@@ dmaengine-dw-activate-fifo-mode-for-mem ath10k-check-idx-validity-in-__ath10k_htt_rx_ring_fi.patch net-korina-cast-kseg0-address-to-pointer-in-kfree.patch s390-qeth-don-t-let-hw-override-the-configured-port-.patch +tty-serial-lpuart-fix-lpuart32_write-usage.patch +tty-serial-fsl_lpuart-fix-lpuart32_poll_get_char.patch +usb-cdc-acm-add-quirk-to-blacklist-etas-es58x-devices.patch +usb-cdc-wdm-make-wdm_flush-interruptible-and-add-wdm_fsync.patch +usb-cdns3-gadget-free-interrupt-after-gadget-has-deleted.patch +eeprom-at25-set-minimum-read-write-access-stride-to-1.patch + usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch diff --cc queue-5.8/series index 801fe35c799,774db9f8854..9d7010916e6 --- a/queue-5.8/series +++ b/queue-5.8/series @@@ -624,10 -624,4 +624,11 @@@ dmaengine-dw-activate-fifo-mode-for-mem ath10k-check-idx-validity-in-__ath10k_htt_rx_ring_fi.patch net-korina-cast-kseg0-address-to-pointer-in-kfree.patch s390-qeth-don-t-let-hw-override-the-configured-port-.patch +tty-serial-lpuart-fix-lpuart32_write-usage.patch +tty-serial-fsl_lpuart-fix-lpuart32_poll_get_char.patch +usb-gadget-bcm63xx_udc-fix-up-the-error-of-undeclared-usb_debug_root.patch +usb-cdc-acm-add-quirk-to-blacklist-etas-es58x-devices.patch +usb-cdc-wdm-make-wdm_flush-interruptible-and-add-wdm_fsync.patch +usb-cdns3-gadget-free-interrupt-after-gadget-has-deleted.patch +eeprom-at25-set-minimum-read-write-access-stride-to-1.patch + usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch diff --cc queue-5.9/series index 74850833f62,408e69317a2..375fd13ad41 --- a/queue-5.9/series +++ b/queue-5.9/series @@@ -748,10 -748,4 +748,11 @@@ drm-panfrost-perfcnt-fix-ref-count-leak ath10k-check-idx-validity-in-__ath10k_htt_rx_ring_fi.patch net-korina-cast-kseg0-address-to-pointer-in-kfree.patch s390-qeth-don-t-let-hw-override-the-configured-port-.patch +tty-serial-lpuart-fix-lpuart32_write-usage.patch +tty-serial-fsl_lpuart-fix-lpuart32_poll_get_char.patch +usb-gadget-bcm63xx_udc-fix-up-the-error-of-undeclared-usb_debug_root.patch +usb-cdc-acm-add-quirk-to-blacklist-etas-es58x-devices.patch +usb-cdc-wdm-make-wdm_flush-interruptible-and-add-wdm_fsync.patch +usb-cdns3-gadget-free-interrupt-after-gadget-has-deleted.patch +eeprom-at25-set-minimum-read-write-access-stride-to-1.patch + usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch diff --cc queue-5.9/usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch index 00000000000,1f98bcf2b1d..f396b611b4b mode 000000,100644..100644 --- a/queue-5.9/usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch +++ b/queue-5.9/usb-gadget-f_ncm-allow-using-ncm-in-superspeed-plus-.patch @@@ -1,0 -1,43 +1,38 @@@ + From 33acac54982527bbb07b889f680c66e9933d6181 Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Tue, 25 Aug 2020 14:55:05 +0900 + Subject: usb: gadget: f_ncm: allow using NCM in SuperSpeed Plus gadgets. + MIME-Version: 1.0 + Content-Type: text/plain; charset=UTF-8 + Content-Transfer-Encoding: 8bit + + From: Lorenzo Colitti + + [ Upstream commit 7974ecd7d3c0f42a98566f281e44ea8573a2ad88 ] + + Currently, enabling f_ncm at SuperSpeed Plus speeds results in an + oops in config_ep_by_speed because ncm_set_alt passes in NULL + ssp_descriptors. Fix this by re-using the SuperSpeed descriptors. + This is safe because usb_assign_descriptors calls + usb_copy_descriptors. + + Tested: enabled f_ncm on a dwc3 gadget and 10Gbps link, ran iperf + Reviewed-by: Maciej Żenczykowski + Signed-off-by: Lorenzo Colitti + Signed-off-by: Felipe Balbi + Signed-off-by: Sasha Levin + --- - drivers/usb/gadget/function/f_ncm.c | 2 +- ++ drivers/usb/gadget/function/f_ncm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + -diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c -index 7672fa25085b0..92a7c3a839454 100644 + --- a/drivers/usb/gadget/function/f_ncm.c + +++ b/drivers/usb/gadget/function/f_ncm.c -@@ -1536,7 +1536,7 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f) ++@@ -1536,7 +1536,7 @@ static int ncm_bind(struct usb_configura + fs_ncm_notify_desc.bEndpointAddress; + + status = usb_assign_descriptors(f, ncm_fs_function, ncm_hs_function, + - ncm_ss_function, NULL); + + ncm_ss_function, ncm_ss_function); + if (status) + goto fail; + --- -2.25.1 -