aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.19
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-05 12:55:32 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-06 11:52:47 +0200
commit42d9bccadb4b5dcb1a598fb99867ede5499605c4 (patch)
tree2e1a932bb5e01da8b71691824a6eb38d77747200 /target/linux/brcm2708/patches-4.19
parent96f1d4b02b29fa6153dfa96a8672af97b139cbbc (diff)
downloadupstream-42d9bccadb4b5dcb1a598fb99867ede5499605c4.tar.gz
upstream-42d9bccadb4b5dcb1a598fb99867ede5499605c4.tar.bz2
upstream-42d9bccadb4b5dcb1a598fb99867ede5499605c4.zip
kernel: bump 4.19 to 4.19.64
Refreshed all patches. Remove upstreamed: - 100-powerpc-4xx-uic-clear-pending-interrupt-after-irq-ty.patch - 950-0309-usb-dwc2-Disable-all-EP-s-on-disconnect.patch - 950-0310-usb-dwc2-Fix-disable-all-EP-s-on-disconnect.patch Fixes: - CVE-2019-13648 - CVE-2019-3900 - CVE-2019-10207 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19')
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch2
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0309-usb-dwc2-Disable-all-EP-s-on-disconnect.patch107
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0310-usb-dwc2-Fix-disable-all-EP-s-on-disconnect.patch152
3 files changed, 1 insertions, 260 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch
index b481a12f80..31c3055a08 100644
--- a/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0040-Add-dwc_otg-driver.patch
@@ -917,7 +917,7 @@ Fixes https://github.com/raspberrypi/linux/issues/2408
}
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5210,7 +5210,7 @@ static void port_event(struct usb_hub *h
+@@ -5214,7 +5214,7 @@ static void port_event(struct usb_hub *h
u16 status = 0, unused;
port_dev->over_current_count++;
diff --git a/target/linux/brcm2708/patches-4.19/950-0309-usb-dwc2-Disable-all-EP-s-on-disconnect.patch b/target/linux/brcm2708/patches-4.19/950-0309-usb-dwc2-Disable-all-EP-s-on-disconnect.patch
deleted file mode 100644
index 22fc8dc279..0000000000
--- a/target/linux/brcm2708/patches-4.19/950-0309-usb-dwc2-Disable-all-EP-s-on-disconnect.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 635c5ee81a0595cf3504e7ae4fce5e91d7e17da4 Mon Sep 17 00:00:00 2001
-From: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
-Date: Wed, 19 Sep 2018 18:13:52 +0400
-Subject: [PATCH 309/725] usb: dwc2: Disable all EP's on disconnect
-
-commit dccf1bad4be7eaa096c1f3697bd37883f9a08ecb upstream.
-
-Disabling all EP's allow to reset EP's to initial state.
-On disconnect disable all EP's instead of just killing
-all requests. Because of some platform didn't catch
-disconnect event, same stuff added to
-dwc2_hsotg_core_init_disconnected() function when USB
-reset detected on the bus.
-
-Changed from version 1:
-Changed lock acquire flow in dwc2_hsotg_ep_disable()
-function.
-
-Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>
-Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
----
- drivers/usb/dwc2/gadget.c | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
---- a/drivers/usb/dwc2/gadget.c
-+++ b/drivers/usb/dwc2/gadget.c
-@@ -3107,6 +3107,8 @@ static void kill_all_requests(struct dwc
- dwc2_hsotg_txfifo_flush(hsotg, ep->fifo_index);
- }
-
-+static int dwc2_hsotg_ep_disable(struct usb_ep *ep);
-+
- /**
- * dwc2_hsotg_disconnect - disconnect service
- * @hsotg: The device state.
-@@ -3125,13 +3127,12 @@ void dwc2_hsotg_disconnect(struct dwc2_h
- hsotg->connected = 0;
- hsotg->test_mode = 0;
-
-+ /* all endpoints should be shutdown */
- for (ep = 0; ep < hsotg->num_of_eps; ep++) {
- if (hsotg->eps_in[ep])
-- kill_all_requests(hsotg, hsotg->eps_in[ep],
-- -ESHUTDOWN);
-+ dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
- if (hsotg->eps_out[ep])
-- kill_all_requests(hsotg, hsotg->eps_out[ep],
-- -ESHUTDOWN);
-+ dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
- }
-
- call_gadget(hsotg, disconnect);
-@@ -3189,13 +3190,23 @@ void dwc2_hsotg_core_init_disconnected(s
- u32 val;
- u32 usbcfg;
- u32 dcfg = 0;
-+ int ep;
-
- /* Kill any ep0 requests as controller will be reinitialized */
- kill_all_requests(hsotg, hsotg->eps_out[0], -ECONNRESET);
-
-- if (!is_usb_reset)
-+ if (!is_usb_reset) {
- if (dwc2_core_reset(hsotg, true))
- return;
-+ } else {
-+ /* all endpoints should be shutdown */
-+ for (ep = 1; ep < hsotg->num_of_eps; ep++) {
-+ if (hsotg->eps_in[ep])
-+ dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
-+ if (hsotg->eps_out[ep])
-+ dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
-+ }
-+ }
-
- /*
- * we must now enable ep0 ready for host detection and then
-@@ -3996,6 +4007,7 @@ static int dwc2_hsotg_ep_disable(struct
- unsigned long flags;
- u32 epctrl_reg;
- u32 ctrl;
-+ int locked;
-
- dev_dbg(hsotg->dev, "%s(ep %p)\n", __func__, ep);
-
-@@ -4011,7 +4023,9 @@ static int dwc2_hsotg_ep_disable(struct
-
- epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index);
-
-- spin_lock_irqsave(&hsotg->lock, flags);
-+ locked = spin_is_locked(&hsotg->lock);
-+ if (!locked)
-+ spin_lock_irqsave(&hsotg->lock, flags);
-
- ctrl = dwc2_readl(hsotg, epctrl_reg);
-
-@@ -4035,7 +4049,9 @@ static int dwc2_hsotg_ep_disable(struct
- hs_ep->fifo_index = 0;
- hs_ep->fifo_size = 0;
-
-- spin_unlock_irqrestore(&hsotg->lock, flags);
-+ if (!locked)
-+ spin_unlock_irqrestore(&hsotg->lock, flags);
-+
- return 0;
- }
-
diff --git a/target/linux/brcm2708/patches-4.19/950-0310-usb-dwc2-Fix-disable-all-EP-s-on-disconnect.patch b/target/linux/brcm2708/patches-4.19/950-0310-usb-dwc2-Fix-disable-all-EP-s-on-disconnect.patch
deleted file mode 100644
index 5336d6e6af..0000000000
--- a/target/linux/brcm2708/patches-4.19/950-0310-usb-dwc2-Fix-disable-all-EP-s-on-disconnect.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From ef5163a16655fba7490d8853172ecf91e8c8cc1a Mon Sep 17 00:00:00 2001
-From: Minas Harutyunyan <minas.harutyunyan@synopsys.com>
-Date: Mon, 10 Dec 2018 18:09:32 +0400
-Subject: [PATCH 310/725] usb: dwc2: Fix disable all EP's on disconnect
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 4fe4f9fecc36956fd53c8edf96dd0c691ef98ff9 upstream.
-
-Disabling all EP's allow to reset EP's to initial state.
-Introduced new function dwc2_hsotg_ep_disable_lock() which
-before calling dwc2_hsotg_ep_disable() function acquire
-hsotg->lock and release on exiting.
-From dwc2_hsotg_ep_disable() function removed acquiring
-hsotg->lock.
-In dwc2_hsotg_core_init_disconnected() function when USB
-reset interrupt asserted disabling all ep’s by
-dwc2_hsotg_ep_disable() function.
-This updates eliminating sparse imbalance warnings.
-
-Reverted changes in dwc2_hostg_disconnect() function.
-Introduced new function dwc2_hsotg_ep_disable_lock().
-Changed dwc2_hsotg_ep_ops. Now disable point to
-dwc2_hsotg_ep_disable_lock() function.
-In functions dwc2_hsotg_udc_stop() and dwc2_hsotg_suspend()
-dwc2_hsotg_ep_disable() function replaced by
-dwc2_hsotg_ep_disable_lock() function.
-In dwc2_hsotg_ep_disable() function removed acquiring
-of hsotg->lock.
-
-Fixes: dccf1bad4be7 ("usb: dwc2: Disable all EP's on disconnect")
-Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>
-Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
----
- drivers/usb/dwc2/gadget.c | 41 ++++++++++++++++++++++-----------------
- 1 file changed, 23 insertions(+), 18 deletions(-)
-
---- a/drivers/usb/dwc2/gadget.c
-+++ b/drivers/usb/dwc2/gadget.c
-@@ -3107,8 +3107,6 @@ static void kill_all_requests(struct dwc
- dwc2_hsotg_txfifo_flush(hsotg, ep->fifo_index);
- }
-
--static int dwc2_hsotg_ep_disable(struct usb_ep *ep);
--
- /**
- * dwc2_hsotg_disconnect - disconnect service
- * @hsotg: The device state.
-@@ -3130,9 +3128,11 @@ void dwc2_hsotg_disconnect(struct dwc2_h
- /* all endpoints should be shutdown */
- for (ep = 0; ep < hsotg->num_of_eps; ep++) {
- if (hsotg->eps_in[ep])
-- dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
-+ kill_all_requests(hsotg, hsotg->eps_in[ep],
-+ -ESHUTDOWN);
- if (hsotg->eps_out[ep])
-- dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
-+ kill_all_requests(hsotg, hsotg->eps_out[ep],
-+ -ESHUTDOWN);
- }
-
- call_gadget(hsotg, disconnect);
-@@ -3176,6 +3176,7 @@ static void dwc2_hsotg_irq_fifoempty(str
- GINTSTS_PTXFEMP | \
- GINTSTS_RXFLVL)
-
-+static int dwc2_hsotg_ep_disable(struct usb_ep *ep);
- /**
- * dwc2_hsotg_core_init - issue softreset to the core
- * @hsotg: The device state
-@@ -4004,10 +4005,8 @@ static int dwc2_hsotg_ep_disable(struct
- struct dwc2_hsotg *hsotg = hs_ep->parent;
- int dir_in = hs_ep->dir_in;
- int index = hs_ep->index;
-- unsigned long flags;
- u32 epctrl_reg;
- u32 ctrl;
-- int locked;
-
- dev_dbg(hsotg->dev, "%s(ep %p)\n", __func__, ep);
-
-@@ -4023,10 +4022,6 @@ static int dwc2_hsotg_ep_disable(struct
-
- epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index);
-
-- locked = spin_is_locked(&hsotg->lock);
-- if (!locked)
-- spin_lock_irqsave(&hsotg->lock, flags);
--
- ctrl = dwc2_readl(hsotg, epctrl_reg);
-
- if (ctrl & DXEPCTL_EPENA)
-@@ -4049,12 +4044,22 @@ static int dwc2_hsotg_ep_disable(struct
- hs_ep->fifo_index = 0;
- hs_ep->fifo_size = 0;
-
-- if (!locked)
-- spin_unlock_irqrestore(&hsotg->lock, flags);
--
- return 0;
- }
-
-+static int dwc2_hsotg_ep_disable_lock(struct usb_ep *ep)
-+{
-+ struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
-+ struct dwc2_hsotg *hsotg = hs_ep->parent;
-+ unsigned long flags;
-+ int ret;
-+
-+ spin_lock_irqsave(&hsotg->lock, flags);
-+ ret = dwc2_hsotg_ep_disable(ep);
-+ spin_unlock_irqrestore(&hsotg->lock, flags);
-+ return ret;
-+}
-+
- /**
- * on_list - check request is on the given endpoint
- * @ep: The endpoint to check.
-@@ -4202,7 +4207,7 @@ static int dwc2_hsotg_ep_sethalt_lock(st
-
- static const struct usb_ep_ops dwc2_hsotg_ep_ops = {
- .enable = dwc2_hsotg_ep_enable,
-- .disable = dwc2_hsotg_ep_disable,
-+ .disable = dwc2_hsotg_ep_disable_lock,
- .alloc_request = dwc2_hsotg_ep_alloc_request,
- .free_request = dwc2_hsotg_ep_free_request,
- .queue = dwc2_hsotg_ep_queue_lock,
-@@ -4342,9 +4347,9 @@ static int dwc2_hsotg_udc_stop(struct us
- /* all endpoints should be shutdown */
- for (ep = 1; ep < hsotg->num_of_eps; ep++) {
- if (hsotg->eps_in[ep])
-- dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
-+ dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep);
- if (hsotg->eps_out[ep])
-- dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
-+ dwc2_hsotg_ep_disable_lock(&hsotg->eps_out[ep]->ep);
- }
-
- spin_lock_irqsave(&hsotg->lock, flags);
-@@ -4792,9 +4797,9 @@ int dwc2_hsotg_suspend(struct dwc2_hsotg
-
- for (ep = 0; ep < hsotg->num_of_eps; ep++) {
- if (hsotg->eps_in[ep])
-- dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
-+ dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep);
- if (hsotg->eps_out[ep])
-- dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
-+ dwc2_hsotg_ep_disable_lock(&hsotg->eps_out[ep]->ep);
- }
- }
-