aboutsummaryrefslogtreecommitdiff
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-11-20 07:15:50 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2023-11-23 22:51:52 +0100
commit2b75f108fba3e0a9bf6e4566912fc300fdc21a4c (patch)
tree119ea319c85829a8bca4dfdd69c14636c8d40edb /target/linux/ixp4xx
parenta39a49e323e6731215bd2654e68d91a2df4672c7 (diff)
kernel: bump 6.1 to 6.1.63
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.63 Removed upstreamed: generic/backport-6.1/815-v6.6-2-leds-turris-omnia-Drop-unnecessary-mutex-locking.patch generic/backport-6.1/815-v6.7-1-leds-turris-omnia-Do-not-use-SMBUS-calls.patch ixp4xx/patches-6.1/0007-watchdog-ixp4xx-Make-sure-restart-always-works.patch Manually rebased: bcm27xx/patches-6.1/950-0606-hwrng-bcm2835-sleep-more-intelligently.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.63&id=7d0e60e4ff840e97fb18afb2a7344442c10a6fdf 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.63&id=63cdeb20ee3bfef820b045b8d3b8395f9f815a74 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.63&id=8803da01fe1b4ca3d37745283f7e73c6c2558c0c Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-6.1/0007-watchdog-ixp4xx-Make-sure-restart-always-works.patch79
1 files changed, 0 insertions, 79 deletions
diff --git a/target/linux/ixp4xx/patches-6.1/0007-watchdog-ixp4xx-Make-sure-restart-always-works.patch b/target/linux/ixp4xx/patches-6.1/0007-watchdog-ixp4xx-Make-sure-restart-always-works.patch
deleted file mode 100644
index 8eae06deb6..0000000000
--- a/target/linux/ixp4xx/patches-6.1/0007-watchdog-ixp4xx-Make-sure-restart-always-works.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From b09e5ea32e099821b1cddc1e26e625ad994ba11e Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Sun, 24 Sep 2023 21:20:24 +0200
-Subject: [PATCH] watchdog: ixp4xx: Make sure restart always works
-
-The IXP4xx watchdog in early "A0" silicon is unreliable and
-cannot be registered, however for some systems such as the
-USRobotics USR8200 the watchdog is the only restart option,
-so implement a "dummy" watchdog that can only support restart
-in this case.
-
-Fixes: 1aea522809e6 ("watchdog: ixp4xx: Implement restart")
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
-Other solutions like implementing a pure restart notifier
-callback catch in the driver is possible, but this method
-will minimize the amount of code and reuse infrastructure
-in the core.
----
- drivers/watchdog/ixp4xx_wdt.c | 28 +++++++++++++++++++++++++---
- 1 file changed, 25 insertions(+), 3 deletions(-)
-
---- a/drivers/watchdog/ixp4xx_wdt.c
-+++ b/drivers/watchdog/ixp4xx_wdt.c
-@@ -105,6 +105,25 @@ static const struct watchdog_ops ixp4xx_
- .owner = THIS_MODULE,
- };
-
-+/*
-+ * The A0 version of the IXP422 had a bug in the watchdog making
-+ * is useless, but we still need to use it to restart the system
-+ * as it is the only way, so in this special case we register a
-+ * "dummy" watchdog that doesn't really work, but will support
-+ * the restart operation.
-+ */
-+static int ixp4xx_wdt_dummy(struct watchdog_device *wdd)
-+{
-+ return 0;
-+}
-+
-+static const struct watchdog_ops ixp4xx_wdt_restart_only_ops = {
-+ .start = ixp4xx_wdt_dummy,
-+ .stop = ixp4xx_wdt_dummy,
-+ .restart = ixp4xx_wdt_restart,
-+ .owner = THIS_MODULE,
-+};
-+
- static const struct watchdog_info ixp4xx_wdt_info = {
- .options = WDIOF_KEEPALIVEPING
- | WDIOF_MAGICCLOSE
-@@ -120,14 +139,17 @@ static void ixp4xx_clock_action(void *d)
-
- static int ixp4xx_wdt_probe(struct platform_device *pdev)
- {
-+ static const struct watchdog_ops *iwdt_ops;
- struct device *dev = &pdev->dev;
- struct ixp4xx_wdt *iwdt;
- struct clk *clk;
- int ret;
-
- if (!(read_cpuid_id() & 0xf) && !cpu_is_ixp46x()) {
-- dev_err(dev, "Rev. A0 IXP42x CPU detected - watchdog disabled\n");
-- return -ENODEV;
-+ dev_err(dev, "Rev. A0 IXP42x CPU detected - only restart supported\n");
-+ iwdt_ops = &ixp4xx_wdt_restart_only_ops;
-+ } else {
-+ iwdt_ops = &ixp4xx_wdt_ops;
- }
-
- iwdt = devm_kzalloc(dev, sizeof(*iwdt), GFP_KERNEL);
-@@ -153,7 +175,7 @@ static int ixp4xx_wdt_probe(struct platf
- iwdt->rate = IXP4XX_TIMER_FREQ;
-
- iwdt->wdd.info = &ixp4xx_wdt_info;
-- iwdt->wdd.ops = &ixp4xx_wdt_ops;
-+ iwdt->wdd.ops = iwdt_ops;
- iwdt->wdd.min_timeout = 1;
- iwdt->wdd.max_timeout = U32_MAX / iwdt->rate;
- iwdt->wdd.parent = dev;