summaryrefslogtreecommitdiffstats
path: root/configs/platform-v7a/patches
diff options
context:
space:
mode:
Diffstat (limited to 'configs/platform-v7a/patches')
-rw-r--r--configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch30
-rw-r--r--configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch35
-rw-r--r--configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch40
-rw-r--r--configs/platform-v7a/patches/barebox-2021.02.0/series6
-rw-r--r--configs/platform-v7a/patches/barebox-2021.04.0/0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch67
-rw-r--r--configs/platform-v7a/patches/barebox-2021.04.0/series1
6 files changed, 68 insertions, 111 deletions
diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch b/configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch
deleted file mode 100644
index 8b08428..0000000
--- a/configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Thu, 11 Mar 2021 13:10:47 +0100
-Subject: [PATCH] bcm283X: Select OF clock providers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This makes available the fixed clock needed on rpi3 for USB.
-
-USB stopped working when the dwc driver started to require an otg clock.
-
-Fixes: f73ca701bb85 ("usb: dwc2: add clk dependency for probe via oftree")
-Signed-off-by: Uwe Kleine-K├Ânig <u.kleine-koenig@pengutronix.de>
-Link: https://lore.pengutronix.de/20210312133030.521569-1-u.kleine-koenig@pengutronix.de
----
- arch/arm/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index ab0bf030131c..f9be9d42ecff 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -44,6 +44,7 @@ config ARCH_BCM283X
- select GPIOLIB
- select CLKDEV_LOOKUP
- select COMMON_CLK
-+ select COMMON_CLK_OF_PROVIDER
- select CLOCKSOURCE_BCM283X
- select ARM_AMBA
- select HAS_DEBUG_LL
diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch b/configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch
deleted file mode 100644
index cf42798..0000000
--- a/configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Sascha Hauer <s.hauer@pengutronix.de>
-Date: Fri, 12 Mar 2021 11:13:09 +0100
-Subject: [PATCH] net: phy: fix waiting for link
-
-phydev->adjust_link() is called only from phy_update_status() when the
-link status changes during that function. phydev->link is also updated
-in genphy_update_link() called from phy_wait_aneg_done(), so it can
-happen that phydev->link changes outside of phy_update_status(), thus
-phydev->adjust_link is never called and no link change notice is
-printed.
-
-Instead of calling genphy_update_link() from phy_wait_aneg_done(), call
-phy_update_status(). This makes sure that a link change is properly
-noticed.
-
-Fixes: 8f75aa496dcb ("net: reply to ping requests")
-Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-Link: https://lore.pengutronix.de/20210312101309.29650-1-s.hauer@pengutronix.de
----
- drivers/net/phy/phy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
-index 622acbe40dd9..e8e8dad5bd25 100644
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -571,7 +571,7 @@ int phy_wait_aneg_done(struct phy_device *phydev)
- }
-
- do {
-- genphy_update_link(phydev);
-+ phy_update_status(phydev);
- if (phydev->link == 1)
- return 0;
- } while (!is_timeout(start, PHY_AN_TIMEOUT * SECOND));
diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch b/configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch
deleted file mode 100644
index 7873666..0000000
--- a/configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Fri, 12 Mar 2021 08:27:46 +0100
-Subject: [PATCH] of: base: probe simple-pm-bus children as well
-
-Upstream is migrating device trees like those of the am33xx to use
-simple-pm-bus, where applicable. These are buses that reference a clock
-or a power domain that needs to be enabled in order to use devices on it.
-
-As we didn't yet support this binding, this broke the Beaglebone
-and all other am33xx board since v2021.02.0.
-
-Fix this by adding simple-pm-bus to the of_default_bus_match_table.
-Note that this is only an adequate solution for when the power domain
-and clocks referenced are already enabled prior to barebox startup.
-
-For all other cases, driver support must be available for the clock
-and power domains in questions and this driver must be extended to
-make use of them. For the am33xx, the relevant buses are powered
-and clocked on boot up, so we leave general support to another day..
-
-Fixes: 6ea3de1b8ce7 ("dts: update to v5.11-rc1")
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Link: https://lore.pengutronix.de/20210312082218.17058-1-a.fatoum@pengutronix.de
----
- drivers/of/base.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/of/base.c b/drivers/of/base.c
-index 8759099d7480..6fe02649ee53 100644
---- a/drivers/of/base.c
-+++ b/drivers/of/base.c
-@@ -2272,6 +2272,8 @@ const char *of_get_model(void)
- const struct of_device_id of_default_bus_match_table[] = {
- {
- .compatible = "simple-bus",
-+ }, {
-+ .compatible = "simple-pm-bus",
- }, {
- .compatible = "simple-mfd",
- }, {
diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/series b/configs/platform-v7a/patches/barebox-2021.02.0/series
deleted file mode 100644
index 0654fa5..0000000
--- a/configs/platform-v7a/patches/barebox-2021.02.0/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-of-base-probe-simple-pm-bus-children-as-well.patch
-net-phy-fix-waiting-for-link.patch
-bcm283X-Select-OF-clock-providers.patch
-# ad5056773d1eb319e6b321f55c67cc0c - git-ptx-patches magic
diff --git a/configs/platform-v7a/patches/barebox-2021.04.0/0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch b/configs/platform-v7a/patches/barebox-2021.04.0/0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch
new file mode 100644
index 0000000..06908ca
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2021.04.0/0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch
@@ -0,0 +1,67 @@
+From 91d5f4dfeaa72957bb8349c8af2da36a615b05a4 Mon Sep 17 00:00:00 2001
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Wed, 21 Apr 2021 09:27:04 +0200
+Subject: [PATCH master] usb: dwc2: increase timeout for waiting on host mode
+
+Commit 26459ab7803a ("usb: dwc2: Rework wait for host mode during
+core reset") effectively reduced the timeout on switch to host mode
+from 200ms to 110 us, which is insufficient for the IP on the Raspberry
+Pi 3b, leading to:
+
+ dwc2 3f980000.usb@7e980000.of: dwc2_wait_for_mode: Couldn't set host mode
+
+and an unusable USB (and Ethernet) after.
+
+Bump up the timeout to 200ms and help future debugging by logging how
+much time it actually took. For the Raspberry 3b I got a value of 49ms.
+
+Note that this is also called from dwc2_force_mode, so worst case is
+that a stuck IP delays barebox startup by 200ms.
+An error message would alert to this fact, so it can be corrected.
+
+Fixes: 26459ab7803a ("usb: dwc2: Rework wait for host mode during core reset")
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Link: https://lore.pengutronix.de/20210421072704.520-1-a.fatoum@pengutronix.de
+---
+ drivers/usb/dwc2/core.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
+index 5d04a07b0393..7813344ffa65 100644
+--- a/drivers/usb/dwc2/core.c
++++ b/drivers/usb/dwc2/core.c
+@@ -688,19 +688,23 @@ int dwc2_get_dr_mode(struct dwc2 *dwc2)
+ */
+ void dwc2_wait_for_mode(struct dwc2 *dwc2, bool host_mode)
+ {
+- unsigned int timeout = 110 * USECOND;
+- int ret;
++ unsigned int timeout = 200 * MSECOND;
++ uint64_t start;
+
+ dev_vdbg(dwc2->dev, "Waiting for %s mode\n",
+ host_mode ? "host" : "device");
+
+- ret = wait_on_timeout(timeout, dwc2_is_host_mode(dwc2) == host_mode);
+- if (ret)
+- dev_err(dwc2->dev, "%s: Couldn't set %s mode\n",
+- __func__, host_mode ? "host" : "device");
++ start = get_time_ns();
++ while (dwc2_is_host_mode(dwc2) != host_mode) {
++ if (is_timeout(start, timeout)) {
++ dev_err(dwc2->dev, "%s: Couldn't set %s mode\n",
++ __func__, host_mode ? "host" : "device");
++ return;
++ }
++ }
+
+- dev_vdbg(dwc2->dev, "%s mode set\n",
+- host_mode ? "Host" : "Device");
++ dev_vdbg(dwc2->dev, "%s mode set after %lluns\n",
++ host_mode ? "Host" : "Device", get_time_ns() - start);
+ }
+
+ /**
+--
+2.29.2
+
diff --git a/configs/platform-v7a/patches/barebox-2021.04.0/series b/configs/platform-v7a/patches/barebox-2021.04.0/series
new file mode 100644
index 0000000..69f6558
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2021.04.0/series
@@ -0,0 +1 @@
+0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch