arm64: kernel: Add cpufeature 'enable' callback

This patch adds an 'enable()' callback to cpu capability/feature
detection, allowing features that require some setup or configuration
to get this opportunity once the feature has been detected.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index 9fafa7537997615e4996f992e7410c025cd679fb..484fa9425314110f70a9a25e722b5e29930465ad 100644 (file)
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -34,6 +34,7 @@ struct arm64_cpu_capabilities {
        const char *desc;
        u16 capability;
        bool (*matches)(const struct arm64_cpu_capabilities *);
+       void (*enable)(void);
        union {
                struct {        /* To be used for erratum handling only */
                        u32 midr_model;

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 5ad86ceac010167870ac8b3354f2711094b3864f..650ffc28bedcf96f89522a612a34dc2bebd86b47 100644 (file)
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -55,6 +55,12 @@ void check_cpu_capabilities(const struct arm64_cpu_capabilities *caps,
                        pr_info("%s %s\n", info, caps[i].desc);
                cpus_set_cap(caps[i].capability);
        }
+
+       /* second pass allows enable() to consider interacting capabilities */
+       for (i = 0; caps[i].desc; i++) {
+               if (cpus_have_cap(caps[i].capability) && caps[i].enable)
+                       caps[i].enable();
+       }
 }
 
 void check_local_cpu_features(void)