Commit 5a354412 authored by Andrew Murray's avatar Andrew Murray Committed by Daniel Lezcano
Browse files

clocksource/drivers/arm_arch_timer: Extract elf_hwcap use to arch-helper 



Different mechanisms are used to test and set elf_hwcaps between ARM
and ARM64, this results in the use of ifdeferry in this file when
setting/testing for the EVTSTRM hwcap.

Let's improve readability by extracting this to an arch helper.

Signed-off-by: default avatarAndrew Murray <andrew.murray@arm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 7117a44b

arch/arm/include/asm/arch_timer.h

+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include <asm/barrier.h>

#include <asm/errno.h>

#include <asm/hwcap.h>

#include <linux/clocksource.h>

#include <linux/init.h>

#include <linux/types.h>
@@ -124,6 +125,15 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl) 
	isb();

}



static inline void arch_timer_set_evtstrm_feature(void)

{

	elf_hwcap |= HWCAP_EVTSTRM;

}



static inline bool arch_timer_have_evtstrm_feature(void)

{

	return elf_hwcap & HWCAP_EVTSTRM;

}

#endif



#endif

arch/arm64/include/asm/arch_timer.h

+13 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define __ASM_ARCH_TIMER_H



#include <asm/barrier.h>

#include <asm/hwcap.h>

#include <asm/sysreg.h>



#include <linux/bug.h>
@@ -240,4 +241,16 @@ static inline int arch_timer_arch_init(void) 
	return 0;

}



static inline void arch_timer_set_evtstrm_feature(void)

{

	cpu_set_named_feature(EVTSTRM);

#ifdef CONFIG_COMPAT

	compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM;

#endif

}



static inline bool arch_timer_have_evtstrm_feature(void)

{

	return cpu_have_named_feature(EVTSTRM);

}

#endif

drivers/clocksource/arm_arch_timer.c

+2 −13
Original line number Diff line number Diff line
@@ -804,14 +804,7 @@ static void arch_timer_evtstrm_enable(int divider) 
	cntkctl |= (divider << ARCH_TIMER_EVT_TRIGGER_SHIFT)

			| ARCH_TIMER_VIRT_EVT_EN;

	arch_timer_set_cntkctl(cntkctl);

#ifdef CONFIG_ARM64

	cpu_set_named_feature(EVTSTRM);

#else

	elf_hwcap |= HWCAP_EVTSTRM;

#endif

#ifdef CONFIG_COMPAT

	compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM;

#endif

	arch_timer_set_evtstrm_feature();

	cpumask_set_cpu(smp_processor_id(), &evtstrm_available);

}
@@ -1040,11 +1033,7 @@ static int arch_timer_cpu_pm_notify(struct notifier_block *self, 
	} else if (action == CPU_PM_ENTER_FAILED || action == CPU_PM_EXIT) {

		arch_timer_set_cntkctl(__this_cpu_read(saved_cntkctl));



#ifdef CONFIG_ARM64

		if (cpu_have_named_feature(EVTSTRM))

#else

		if (elf_hwcap & HWCAP_EVTSTRM)

#endif

		if (arch_timer_have_evtstrm_feature())

			cpumask_set_cpu(smp_processor_id(), &evtstrm_available);

	}

	return NOTIFY_OK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE