Commit aa073d8b authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-v5.16-rc4' of... 

Merge tag 'timers-v5.16-rc4' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull timer fixes from Daniel Lezcano:

  - Fix build error with clang and some kernel configuration on the
    arm64 architected timer by inlining the
    erratum_set_next_event_generic() function (Marc Zyngier)

  - Fix probe error on the dw_apb_timer_of driver by fixing the
    incorrect condition previously introduced (Alexey Sheplyakov)

Link: https://lore.kernel.org/r/429b796d-9395-4ca8-81f3-30911f80a9a9@linaro.org
parents 0fcfb00b 1edb7e74

drivers/clocksource/arm_arch_timer.c

+7 −2
Original line number Diff line number Diff line
@@ -394,7 +394,12 @@ EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround); 


static atomic_t timer_unstable_counter_workaround_in_use = ATOMIC_INIT(0);



static void erratum_set_next_event_generic(const int access, unsigned long evt,

/*

 * Force the inlining of this function so that the register accesses

 * can be themselves correctly inlined.

 */

static __always_inline

void erratum_set_next_event_generic(const int access, unsigned long evt,

				    struct clock_event_device *clk)

{

	unsigned long ctrl;

drivers/clocksource/dw_apb_timer_of.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static int __init timer_get_base_and_rate(struct device_node *np, 
			pr_warn("pclk for %pOFn is present, but could not be activated\n",

				np);



	if (!of_property_read_u32(np, "clock-freq", rate) &&

	if (!of_property_read_u32(np, "clock-freq", rate) ||

	    !of_property_read_u32(np, "clock-frequency", rate))

		return 0;