From cb23d3ef636c058820a49ca6036a4a7ce3d23773 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 May 2021 15:48:24 +0200 Subject: [PATCH] Revert "clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940" This reverts commit 6d5fda434b1f46c22ce3cde04729005dfb2eb2d6 as it breaks the kernel abi at the moment. It will be restored at a later point in time. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: Iea57a9d0a515147279ca20077501179ff18b5ee2 --- arch/arm/boot/dts/dra7-l4.dtsi | 4 +- arch/arm/boot/dts/dra7.dtsi | 20 ------ drivers/clocksource/timer-ti-dm-systimer.c | 76 ---------------------- include/linux/cpuhotplug.h | 1 - 4 files changed, 2 insertions(+), 99 deletions(-) diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi index a294a02f2d23..3bf90d9e3335 100644 --- a/arch/arm/boot/dts/dra7-l4.dtsi +++ b/arch/arm/boot/dts/dra7-l4.dtsi @@ -1168,7 +1168,7 @@ timer2: timer@0 { }; }; - timer3_target: target-module@34000 { /* 0x48034000, ap 7 46.0 */ + target-module@34000 { /* 0x48034000, ap 7 46.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; reg = <0x34000 0x4>, <0x34010 0x4>; @@ -1195,7 +1195,7 @@ timer3: timer@0 { }; }; - timer4_target: target-module@36000 { /* 0x48036000, ap 9 4e.0 */ + target-module@36000 { /* 0x48036000, ap 9 4e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; reg = <0x36000 0x4>, <0x36010 0x4>; diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 7ecf8f86ac74..4e1bbc0198eb 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -46,7 +46,6 @@ aliases { timer { compatible = "arm,armv7-timer"; - status = "disabled"; /* See ARM architected timer wrap erratum i940 */ interrupts = , , , @@ -1091,22 +1090,3 @@ timer@0 { assigned-clock-parents = <&sys_32k_ck>; }; }; - -/* Local timers, see ARM architected timer wrap erratum i940 */ -&timer3_target { - ti,no-reset-on-init; - ti,no-idle; - timer@0 { - assigned-clocks = <&l4per_clkctrl DRA7_L4PER_TIMER3_CLKCTRL 24>; - assigned-clock-parents = <&timer_sys_clk_div>; - }; -}; - -&timer4_target { - ti,no-reset-on-init; - ti,no-idle; - timer@0 { - assigned-clocks = <&l4per_clkctrl DRA7_L4PER_TIMER4_CLKCTRL 24>; - assigned-clock-parents = <&timer_sys_clk_div>; - }; -}; diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksource/timer-ti-dm-systimer.c index b6f97960d8ee..330803150d85 100644 --- a/drivers/clocksource/timer-ti-dm-systimer.c +++ b/drivers/clocksource/timer-ti-dm-systimer.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -631,78 +630,6 @@ static int __init dmtimer_clockevent_init(struct device_node *np) return error; } -/* Dmtimer as percpu timer. See dra7 ARM architected timer wrap erratum i940 */ -static DEFINE_PER_CPU(struct dmtimer_clockevent, dmtimer_percpu_timer); - -static int __init dmtimer_percpu_timer_init(struct device_node *np, int cpu) -{ - struct dmtimer_clockevent *clkevt; - int error; - - if (!cpu_possible(cpu)) - return -EINVAL; - - if (!of_property_read_bool(np->parent, "ti,no-reset-on-init") || - !of_property_read_bool(np->parent, "ti,no-idle")) - pr_warn("Incomplete dtb for percpu dmtimer %pOF\n", np->parent); - - clkevt = per_cpu_ptr(&dmtimer_percpu_timer, cpu); - - error = dmtimer_clkevt_init_common(clkevt, np, CLOCK_EVT_FEAT_ONESHOT, - cpumask_of(cpu), "percpu-dmtimer", - 500); - if (error) - return error; - - return 0; -} - -/* See TRM for timer internal resynch latency */ -static int omap_dmtimer_starting_cpu(unsigned int cpu) -{ - struct dmtimer_clockevent *clkevt = per_cpu_ptr(&dmtimer_percpu_timer, cpu); - struct clock_event_device *dev = &clkevt->dev; - struct dmtimer_systimer *t = &clkevt->t; - - clockevents_config_and_register(dev, t->rate, 3, ULONG_MAX); - irq_force_affinity(dev->irq, cpumask_of(cpu)); - - return 0; -} - -static int __init dmtimer_percpu_timer_startup(void) -{ - struct dmtimer_clockevent *clkevt = per_cpu_ptr(&dmtimer_percpu_timer, 0); - struct dmtimer_systimer *t = &clkevt->t; - - if (t->sysc) { - cpuhp_setup_state(CPUHP_AP_TI_GP_TIMER_STARTING, - "clockevents/omap/gptimer:starting", - omap_dmtimer_starting_cpu, NULL); - } - - return 0; -} -subsys_initcall(dmtimer_percpu_timer_startup); - -static int __init dmtimer_percpu_quirk_init(struct device_node *np, u32 pa) -{ - struct device_node *arm_timer; - - arm_timer = of_find_compatible_node(NULL, NULL, "arm,armv7-timer"); - if (of_device_is_available(arm_timer)) { - pr_warn_once("ARM architected timer wrap issue i940 detected\n"); - return 0; - } - - if (pa == 0x48034000) /* dra7 dmtimer3 */ - return dmtimer_percpu_timer_init(np, 0); - else if (pa == 0x48036000) /* dra7 dmtimer4 */ - return dmtimer_percpu_timer_init(np, 1); - - return 0; -} - /* Clocksource */ static struct dmtimer_clocksource * to_dmtimer_clocksource(struct clocksource *cs) @@ -836,9 +763,6 @@ static int __init dmtimer_systimer_init(struct device_node *np) if (clockevent == pa) return dmtimer_clockevent_init(np); - if (of_machine_is_compatible("ti,dra7")) - return dmtimer_percpu_quirk_init(np, pa); - return 0; } diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 1366cfbfdc78..72fd8db62342 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -135,7 +135,6 @@ enum cpuhp_state { CPUHP_AP_RISCV_TIMER_STARTING, CPUHP_AP_CLINT_TIMER_STARTING, CPUHP_AP_CSKY_TIMER_STARTING, - CPUHP_AP_TI_GP_TIMER_STARTING, CPUHP_AP_HYPERV_TIMER_STARTING, CPUHP_AP_KVM_STARTING, CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING,