lkml.org 
[lkml]   [2019]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 054/119] arm64: capabilities: Split the processing of errata work arounds
    Date
    From: Suzuki K Poulose <suzuki.poulose@arm.com>

    [ Upstream commit d69fe9a7e7214d49fe157ec20889892388d0fe23 ]

    Right now we run through the errata workarounds check on all boot
    active CPUs, with SCOPE_ALL. This wouldn't help for detecting erratum
    workarounds with a SYSTEM_SCOPE. There are none yet, but we plan to
    introduce some: let us clean this up so that such workarounds can be
    detected and enabled correctly.

    So, we run the checks with SCOPE_LOCAL_CPU on all CPUs and SCOPE_SYSTEM
    checks are run only once after all the boot time CPUs are active.

    Reviewed-by: Dave Martin <dave.martin@arm.com>
    Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/arm64/kernel/cpufeature.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/arch/arm64/kernel/cpufeature.c
    +++ b/arch/arm64/kernel/cpufeature.c
    @@ -529,7 +529,7 @@ void __init init_cpu_features(struct cpu
    * Run the errata work around checks on the boot CPU, once we have
    * initialised the cpu feature infrastructure.
    */
    - update_cpu_capabilities(arm64_errata, SCOPE_ALL,
    + update_cpu_capabilities(arm64_errata, SCOPE_LOCAL_CPU,
    "enabling workaround for");
    }

    @@ -1354,7 +1354,7 @@ void check_local_cpu_capabilities(void)
    * advertised capabilities.
    */
    if (!sys_caps_initialised)
    - update_cpu_capabilities(arm64_errata, SCOPE_ALL,
    + update_cpu_capabilities(arm64_errata, SCOPE_LOCAL_CPU,
    "enabling workaround for");
    else
    verify_local_cpu_capabilities();
    @@ -1383,6 +1383,8 @@ void __init setup_cpu_features(void)

    /* Set the CPU feature capabilies */
    update_cpu_capabilities(arm64_features, SCOPE_ALL, "detected:");
    + update_cpu_capabilities(arm64_errata, SCOPE_SYSTEM,
    + "enabling workaround for");
    enable_cpu_capabilities(arm64_features, SCOPE_ALL);
    enable_cpu_capabilities(arm64_errata, SCOPE_ALL);
    mark_const_caps_ready();

    \
     
     \ /
      Last update: 2019-10-27 22:34    [W:2.034 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site