2019-04-30 13:17:11

by Andrew Murray

Subject: [PATCH] clocksource/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 #ifdef's in this file when
setting/testing for the EVTSTRM hwcap.

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

Signed-off-by: Andrew Murray <[email protected]>
---
arch/arm/include/asm/arch_timer.h | 13 +++++++++++++
arch/arm64/include/asm/arch_timer.h | 13 +++++++++++++
drivers/clocksource/arm_arch_timer.c | 15 ++-------------
3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index 0a8d7bba2cb0..f21e038dc9f3 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -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>
@@ -110,6 +111,18 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
isb();
}

+static inline bool arch_timer_set_evtstrm_feature(void)
+{
+ elf_hwcap |= HWCAP_EVTSTRM;
+#ifdef CONFIG_COMPAT
+ compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM;
+#endif
+}
+
+static inline bool arch_timer_have_evtstrm_feature(void)
+{
+ return elf_hwcap & HWCAP_EVTSTRM;
+}
#endif

#endif
diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h
index f2a234d6516c..f371d4a94f06 100644
--- a/arch/arm64/include/asm/arch_timer.h
+++ b/arch/arm64/include/asm/arch_timer.h
@@ -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>
@@ -165,4 +166,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
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 6cc8aff83805..5e507e81515f 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -833,14 +833,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);
}

@@ -1059,11 +1052,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;
--
2.21.0

2019-05-01 10:54:35

by Mark Rutland

Subject: Re: [PATCH] clocksource/arm_arch_timer: extract elf_hwcap use to arch-helper

On Tue, Apr 30, 2019 at 02:14:13PM +0100, Andrew Murray wrote:
> Different mechanisms are used to test and set elf_hwcaps between ARM
> and ARM64, this results in the use of #ifdef's in this file when

Nit: greengrocer's apostrophe -- you can say "use of ifdeferry" to clean
that up.

> setting/testing for the EVTSTRM hwcap.
>
> Let's improve readability by extracting this to an arch helper.
>
> Signed-off-by: Andrew Murray <[email protected]>
> ---
> arch/arm/include/asm/arch_timer.h | 13 +++++++++++++
> arch/arm64/include/asm/arch_timer.h | 13 +++++++++++++
> drivers/clocksource/arm_arch_timer.c | 15 ++-------------
> 3 files changed, 28 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
> index 0a8d7bba2cb0..f21e038dc9f3 100644
> --- a/arch/arm/include/asm/arch_timer.h
> +++ b/arch/arm/include/asm/arch_timer.h
> @@ -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>
> @@ -110,6 +111,18 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
> isb();
> }
>
> +static inline bool arch_timer_set_evtstrm_feature(void)
> +{
> + elf_hwcap |= HWCAP_EVTSTRM;
> +#ifdef CONFIG_COMPAT
> + compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM;
> +#endif

This can go; 32-bit arm doesn't have COMPAT.

Otherwise, this looks good to me, so with those changes:

Acked-by: Mark Rutland <[email protected]>

Thanks,
Mark.

> +}
> +
> +static inline bool arch_timer_have_evtstrm_feature(void)
> +{
> + return elf_hwcap & HWCAP_EVTSTRM;
> +}
> #endif
>
> #endif
> diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h
> index f2a234d6516c..f371d4a94f06 100644
> --- a/arch/arm64/include/asm/arch_timer.h
> +++ b/arch/arm64/include/asm/arch_timer.h
> @@ -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>
> @@ -165,4 +166,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
> diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
> index 6cc8aff83805..5e507e81515f 100644
> --- a/drivers/clocksource/arm_arch_timer.c
> +++ b/drivers/clocksource/arm_arch_timer.c
> @@ -833,14 +833,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);
> }
>
> @@ -1059,11 +1052,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;
> --
> 2.21.0
>

2019-06-10 12:19:43

by Will Deacon

Subject: Re: [PATCH] clocksource/arm_arch_timer: extract elf_hwcap use to arch-helper

On Tue, Apr 30, 2019 at 02:14:13PM +0100, Andrew Murray wrote:
> Different mechanisms are used to test and set elf_hwcaps between ARM
> and ARM64, this results in the use of #ifdef's in this file when
> setting/testing for the EVTSTRM hwcap.
>
> Let's improve readability by extracting this to an arch helper.
>
> Signed-off-by: Andrew Murray <[email protected]>
> ---
> arch/arm/include/asm/arch_timer.h | 13 +++++++++++++
> arch/arm64/include/asm/arch_timer.h | 13 +++++++++++++
> drivers/clocksource/arm_arch_timer.c | 15 ++-------------
> 3 files changed, 28 insertions(+), 13 deletions(-)

Acked-by: Will Deacon <[email protected]>

I assume this is going via Marc Z.

Will

2019-06-10 12:21:30

by Marc Zyngier

Subject: Re: [PATCH] clocksource/arm_arch_timer: extract elf_hwcap use to arch-helper

On 10/06/2019 13:08, Will Deacon wrote:
> On Tue, Apr 30, 2019 at 02:14:13PM +0100, Andrew Murray wrote:
>> Different mechanisms are used to test and set elf_hwcaps between ARM
>> and ARM64, this results in the use of #ifdef's in this file when
>> setting/testing for the EVTSTRM hwcap.
>>
>> Let's improve readability by extracting this to an arch helper.
>>
>> Signed-off-by: Andrew Murray <[email protected]>
>> ---
>> arch/arm/include/asm/arch_timer.h | 13 +++++++++++++
>> arch/arm64/include/asm/arch_timer.h | 13 +++++++++++++
>> drivers/clocksource/arm_arch_timer.c | 15 ++-------------
>> 3 files changed, 28 insertions(+), 13 deletions(-)
>
> Acked-by: Will Deacon <[email protected]>
>
> I assume this is going via Marc Z.

More likely Daniel Lezcano. I'll ack the patch once reposted to take
Mark's remarks into account.

Thanks,

M.
--
Jazz is not dead. It just smells funny...

2019-06-10 13:31:28

by Catalin Marinas

Subject: Re: [PATCH] clocksource/arm_arch_timer: extract elf_hwcap use to arch-helper

On Tue, Apr 30, 2019 at 02:14:13PM +0100, Andrew Murray wrote:
> diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
> index 0a8d7bba2cb0..f21e038dc9f3 100644
> --- a/arch/arm/include/asm/arch_timer.h
> +++ b/arch/arm/include/asm/arch_timer.h
> @@ -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>
> @@ -110,6 +111,18 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
> isb();
> }
>
> +static inline bool arch_timer_set_evtstrm_feature(void)
> +{
> + elf_hwcap |= HWCAP_EVTSTRM;
> +#ifdef CONFIG_COMPAT
> + compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM;
> +#endif
> +}

There is no COMPAT support on arm32.

--
Catalin