mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-22 04:56:15 +00:00
01d8e41c16
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.51 Removed upstreamed: generic/backport-6.6/200-regmap-maple-work-around-false-positive-warning.patch generic/backport-6.6/822-v6.11-0012-nvmem-Fix-return-type-of-devm_nvmem_device_get-in-ke.patch bcm27xx/patches-6.6/950-1018-drivers-mmc-apply-SD-quirks-earlier-during-probe.patch Manually rebased: bcm27xx/patches-6.6/950-0993-drivers-mmc-cqhci-clear-CQHCI_CTL-if-halt-fails.patch ramips/patches-6.6/311-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch[4] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.51&id=e42ea96d6d36a16526cb82b8aa2e5422814c3250 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.51&id=3d1baf322a3a69b38b6b2d511cfe0d611d1b5462 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.51&id=115a755bb38db5a1175be44e6a9a93a0a8233885 4. Adapted the changes from Hauke Mehrtens' modification in PR#16366 to 5.15.167 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16370 Signed-off-by: Robert Marko <robimarko@gmail.com>
119 lines
3.0 KiB
Diff
119 lines
3.0 KiB
Diff
From ce3d4a4111a5f7e6b4e74bceae5faa6ce388e8ec Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Sun, 14 Jul 2013 23:08:11 +0200
|
|
Subject: [PATCH 05/53] MIPS: use set_mode() to enable/disable the cevt-r4k
|
|
irq
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
arch/mips/kernel/cevt-r4k.c | 43 +++++++++++++++++++++++++++++++++++++
|
|
arch/mips/ralink/Kconfig | 5 +++++
|
|
2 files changed, 48 insertions(+)
|
|
|
|
--- a/arch/mips/kernel/cevt-r4k.c
|
|
+++ b/arch/mips/kernel/cevt-r4k.c
|
|
@@ -16,6 +16,31 @@
|
|
#include <asm/time.h>
|
|
#include <asm/cevt-r4k.h>
|
|
|
|
+#ifdef CONFIG_CEVT_SYSTICK_QUIRK
|
|
+static int mips_state_oneshot(struct clock_event_device *evt)
|
|
+{
|
|
+ unsigned long flags = IRQF_PERCPU | IRQF_TIMER | IRQF_SHARED;
|
|
+ if (!cp0_timer_irq_installed) {
|
|
+ cp0_timer_irq_installed = 1;
|
|
+ if (request_irq(evt->irq, c0_compare_interrupt, flags, "timer",
|
|
+ c0_compare_interrupt))
|
|
+ pr_err("Failed to request irq %d (timer)\n", evt->irq);
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int mips_state_shutdown(struct clock_event_device *evt)
|
|
+{
|
|
+ if (cp0_timer_irq_installed) {
|
|
+ cp0_timer_irq_installed = 0;
|
|
+ free_irq(evt->irq, NULL);
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+#endif
|
|
+
|
|
static int mips_next_event(unsigned long delta,
|
|
struct clock_event_device *evt)
|
|
{
|
|
@@ -292,7 +317,9 @@ core_initcall(r4k_register_cpufreq_notif
|
|
|
|
int r4k_clockevent_init(void)
|
|
{
|
|
+#ifndef CONFIG_CEVT_SYSTICK_QUIRK
|
|
unsigned long flags = IRQF_PERCPU | IRQF_TIMER | IRQF_SHARED;
|
|
+#endif
|
|
unsigned int cpu = smp_processor_id();
|
|
struct clock_event_device *cd;
|
|
unsigned int irq, min_delta;
|
|
@@ -303,6 +330,15 @@ int r4k_clockevent_init(void)
|
|
if (!c0_compare_int_usable())
|
|
return -ENXIO;
|
|
|
|
+#ifdef CONFIG_CEVT_SYSTICK_QUIRK
|
|
+ /*
|
|
+ * With vectored interrupts things are getting platform specific.
|
|
+ * get_c0_compare_int is a hook to allow a platform to return the
|
|
+ * interrupt number of its liking.
|
|
+ */
|
|
+ irq = get_c0_compare_int();
|
|
+#endif
|
|
+
|
|
cd = &per_cpu(mips_clockevent_device, cpu);
|
|
|
|
cd->name = "MIPS";
|
|
@@ -314,11 +350,17 @@ int r4k_clockevent_init(void)
|
|
|
|
cd->rating = 300;
|
|
cd->cpumask = cpumask_of(cpu);
|
|
+#ifdef CONFIG_CEVT_SYSTICK_QUIRK
|
|
+ cd->irq = irq;
|
|
+ cd->set_state_shutdown = mips_state_shutdown;
|
|
+ cd->set_state_oneshot = mips_state_oneshot;
|
|
+#endif
|
|
cd->set_next_event = mips_next_event;
|
|
cd->event_handler = mips_event_handler;
|
|
|
|
clockevents_config_and_register(cd, mips_hpt_frequency, min_delta, 0x7fffffff);
|
|
|
|
+#ifndef CONFIG_CEVT_SYSTICK_QUIRK
|
|
if (cp0_timer_irq_installed)
|
|
return 0;
|
|
|
|
@@ -334,6 +376,7 @@ int r4k_clockevent_init(void)
|
|
if (request_irq(irq, c0_compare_interrupt, flags, "timer",
|
|
c0_compare_interrupt))
|
|
pr_err("Failed to request irq %d (timer)\n", irq);
|
|
+#endif
|
|
|
|
return 0;
|
|
}
|
|
--- a/arch/mips/ralink/Kconfig
|
|
+++ b/arch/mips/ralink/Kconfig
|
|
@@ -1,12 +1,17 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
if RALINK
|
|
|
|
+config CEVT_SYSTICK_QUIRK
|
|
+ bool
|
|
+ default n
|
|
+
|
|
config CLKEVT_RT3352
|
|
bool
|
|
depends on SOC_RT305X || SOC_MT7620
|
|
default y
|
|
select TIMER_OF
|
|
select CLKSRC_MMIO
|
|
+ select CEVT_SYSTICK_QUIRK
|
|
|
|
config RALINK_ILL_ACC
|
|
bool
|