From: Greg Kroah-Hartman Date: Mon, 26 Jul 2021 08:43:09 +0000 (+0200) Subject: drop dwc2 patch from 4.4 and 4.9 X-Git-Tag: v4.4.277~49 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89f907249d697a8c2637d00735a1504559806c84;p=thirdparty%2Fkernel%2Fstable-queue.git drop dwc2 patch from 4.4 and 4.9 --- diff --git a/queue-4.4/series b/queue-4.4/series index 0786b417e95..3fe3fc4f2bd 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -39,4 +39,3 @@ usb-renesas_usbhs-fix-superfluous-irqs-happen-after-usb_pkt_pop.patch usb-serial-option-add-support-for-u-blox-lara-r6-family.patch usb-serial-cp210x-fix-comments-for-ge-cs1000.patch usb-serial-cp210x-add-id-for-cel-em3588-usb-zigbee-stick.patch -usb-dwc2-gadget-fix-sending-zero-length-packet-in-ddma-mode.patch diff --git a/queue-4.4/usb-dwc2-gadget-fix-sending-zero-length-packet-in-ddma-mode.patch b/queue-4.4/usb-dwc2-gadget-fix-sending-zero-length-packet-in-ddma-mode.patch deleted file mode 100644 index 20021e07381..00000000000 --- a/queue-4.4/usb-dwc2-gadget-fix-sending-zero-length-packet-in-ddma-mode.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d53dc38857f6dbefabd9eecfcbf67b6eac9a1ef4 Mon Sep 17 00:00:00 2001 -From: Minas Harutyunyan -Date: Tue, 20 Jul 2021 05:41:24 -0700 -Subject: usb: dwc2: gadget: Fix sending zero length packet in DDMA mode. - -From: Minas Harutyunyan - -commit d53dc38857f6dbefabd9eecfcbf67b6eac9a1ef4 upstream. - -Sending zero length packet in DDMA mode perform by DMA descriptor -by setting SP (short packet) flag. - -For DDMA in function dwc2_hsotg_complete_in() does not need to send -zlp. - -Tested by USBCV MSC tests. - -Fixes: f71b5e2533de ("usb: dwc2: gadget: fix zero length packet transfers") -Cc: stable -Signed-off-by: Minas Harutyunyan -Link: https://lore.kernel.org/r/967bad78c55dd2db1c19714eee3d0a17cf99d74a.1626777738.git.Minas.Harutyunyan@synopsys.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/dwc2/gadget.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - ---- a/drivers/usb/dwc2/gadget.c -+++ b/drivers/usb/dwc2/gadget.c -@@ -1914,12 +1914,14 @@ static void dwc2_hsotg_complete_in(struc - return; - } - -- /* Zlp for all endpoints, for ep0 only in DATA IN stage */ -+ /* Zlp for all endpoints in non DDMA, for ep0 only in DATA IN stage */ - if (hs_ep->send_zlp) { -- dwc2_hsotg_program_zlp(hsotg, hs_ep); - hs_ep->send_zlp = 0; -- /* transfer will be completed on next complete interrupt */ -- return; -+ if (!using_desc_dma(hsotg)) { -+ dwc2_hsotg_program_zlp(hsotg, hs_ep); -+ /* transfer will be completed on next complete interrupt */ -+ return; -+ } - } - - if (hs_ep->index == 0 && hsotg->ep0_state == DWC2_EP0_DATA_IN) { diff --git a/queue-4.9/series b/queue-4.9/series index 3ab8ab18cc1..e68e7f9381d 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -52,4 +52,3 @@ usb-renesas_usbhs-fix-superfluous-irqs-happen-after-usb_pkt_pop.patch usb-serial-option-add-support-for-u-blox-lara-r6-family.patch usb-serial-cp210x-fix-comments-for-ge-cs1000.patch usb-serial-cp210x-add-id-for-cel-em3588-usb-zigbee-stick.patch -usb-dwc2-gadget-fix-sending-zero-length-packet-in-ddma-mode.patch diff --git a/queue-4.9/usb-dwc2-gadget-fix-sending-zero-length-packet-in-ddma-mode.patch b/queue-4.9/usb-dwc2-gadget-fix-sending-zero-length-packet-in-ddma-mode.patch deleted file mode 100644 index bbc4d49d679..00000000000 --- a/queue-4.9/usb-dwc2-gadget-fix-sending-zero-length-packet-in-ddma-mode.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d53dc38857f6dbefabd9eecfcbf67b6eac9a1ef4 Mon Sep 17 00:00:00 2001 -From: Minas Harutyunyan -Date: Tue, 20 Jul 2021 05:41:24 -0700 -Subject: usb: dwc2: gadget: Fix sending zero length packet in DDMA mode. - -From: Minas Harutyunyan - -commit d53dc38857f6dbefabd9eecfcbf67b6eac9a1ef4 upstream. - -Sending zero length packet in DDMA mode perform by DMA descriptor -by setting SP (short packet) flag. - -For DDMA in function dwc2_hsotg_complete_in() does not need to send -zlp. - -Tested by USBCV MSC tests. - -Fixes: f71b5e2533de ("usb: dwc2: gadget: fix zero length packet transfers") -Cc: stable -Signed-off-by: Minas Harutyunyan -Link: https://lore.kernel.org/r/967bad78c55dd2db1c19714eee3d0a17cf99d74a.1626777738.git.Minas.Harutyunyan@synopsys.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/dwc2/gadget.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - ---- a/drivers/usb/dwc2/gadget.c -+++ b/drivers/usb/dwc2/gadget.c -@@ -1994,12 +1994,14 @@ static void dwc2_hsotg_complete_in(struc - return; - } - -- /* Zlp for all endpoints, for ep0 only in DATA IN stage */ -+ /* Zlp for all endpoints in non DDMA, for ep0 only in DATA IN stage */ - if (hs_ep->send_zlp) { -- dwc2_hsotg_program_zlp(hsotg, hs_ep); - hs_ep->send_zlp = 0; -- /* transfer will be completed on next complete interrupt */ -- return; -+ if (!using_desc_dma(hsotg)) { -+ dwc2_hsotg_program_zlp(hsotg, hs_ep); -+ /* transfer will be completed on next complete interrupt */ -+ return; -+ } - } - - if (hs_ep->index == 0 && hsotg->ep0_state == DWC2_EP0_DATA_IN) {