[PATCH] arm64: Run enable method for errata work arounds on late CPUs
Robin Murphy
robin.murphy at arm.com
Wed Jan 17 05:20:42 PST 2018
On 17/01/18 12:25, Dave Martin wrote:
> On Wed, Jan 17, 2018 at 10:05:56AM +0000, Suzuki K Poulose wrote:
>> When a CPU is brought up after we have finalised the system
>> wide capabilities (i.e, features and errata), we make sure the
>> new CPU doesn't need a new errata work around which has not been
>> detected already. However we don't run enable() method on the new
>> CPU for the errata work arounds already detected. This could
>> cause the new CPU running without potential work arounds.
>> It is upto the "enable()" method to decide if this CPU should
>> do something about the errata.
>>
>> Fixes: commit 6a6efbb45b7d95c84 ("arm64: Verify CPU errata work arounds on hotplugged CPU")
>> Cc: Will Deacon <will.deacon at arm.com>
>> Cc: Mark Rutland <mark.rutland at arm.com>
>> Cc: Andre Przywara <andre.przywara at arm.com>
>> Cc: Catalin Marinas <catalin.marinas at arm.com>
>> Cc: Dave Martin <dave.martin at arm.com>
>> Signed-off-by: Suzuki K Poulose <suzuki.poulose at arm.com>
>> ---
>> arch/arm64/kernel/cpu_errata.c | 9 ++++++---
>> 1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
>> index 90a9e465339c..54e41dfe41f6 100644
>> --- a/arch/arm64/kernel/cpu_errata.c
>> +++ b/arch/arm64/kernel/cpu_errata.c
>> @@ -373,15 +373,18 @@ void verify_local_cpu_errata_workarounds(void)
>> {
>> const struct arm64_cpu_capabilities *caps = arm64_errata;
>>
>> - for (; caps->matches; caps++)
>> - if (!cpus_have_cap(caps->capability) &&
>> - caps->matches(caps, SCOPE_LOCAL_CPU)) {
>> + for (; caps->matches; caps++) {
>> + if (cpus_have_cap(caps->capability)) {
>> + if (caps->enable)
>> + caps->enable((void *)caps);
>
> Do we really need this cast?
Seems to me like the prototype for .enable needs updating. If any
existing callback was actually using the (non-const) void* for some
purpose (thankfully nothing seems to be), then passing the capability
pointer into that would be unlikely to end well anyway.
We probably want to replace or append that with a proper const struct
arm64_cpu_capabilities* argument, to make it more of a method call.
Robin.
> Can enable() fail, or do we already guarantee that it succeeds (by
> having detected the cap in the first place)?
>
>> + } else if (caps->matches(caps, SCOPE_LOCAL_CPU)) {
>
> [...]
>
> Cheers
> ---Dave
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
More information about the linux-arm-kernel
mailing list