On Fri, May 25, 2018 at 08:47:42AM -0700, Tony Lindgren wrote:
> * Russell King <rmk+kernel@xxxxxxxxxxxxxxx> [180525 15:10]:
> > +static void cpu_v7_spectre_init(void)
> > +{
> > + const char *spectre_v2_method = NULL;
> > + int cpu = smp_processor_id();
> > +
> > + if (per_cpu(harden_branch_predictor_fn, cpu))
> > + return;
> > +
> > + switch (read_cpuid_part()) {
> > + case ARM_CPU_PART_CORTEX_A8:
> > + case ARM_CPU_PART_CORTEX_A9:
> > + case ARM_CPU_PART_CORTEX_A12:
> > + case ARM_CPU_PART_CORTEX_A17:
> > + case ARM_CPU_PART_CORTEX_A73:
> > + case ARM_CPU_PART_CORTEX_A75:
> > + per_cpu(harden_branch_predictor_fn, cpu) =
> > + harden_branch_predictor_bpiall;
> > + spectre_v2_method = "BPIALL";
> > + break;
> > +
> > + case ARM_CPU_PART_CORTEX_A15:
> > + case ARM_CPU_PART_BRAHMA_B15:
> > + per_cpu(harden_branch_predictor_fn, cpu) =
> > + harden_branch_predictor_iciallu;
> > + spectre_v2_method = "ICIALLU";
> > + break;
> > + }
> > + if (spectre_v2_method)
> > + pr_info("CPU%u: Spectre v2: using %s workaround\n",
> > + smp_processor_id(), spectre_v2_method);
> > +}
>
> We can now get this with the whole series applied:
>
> CPU0: Spectre v2: firmware did not set auxiliary control register
> IBE bit, system vulnerable
> CPU: Spectre v2: using ICIALLU workaround
>
> So maybe change the wording from "using %s workaround" to
> "chosen workaround %s"?
>
> Or I guess disabling the pr_info when not functional can
> be done in the later patches based on some variable set
> by check_spectre_auxcr() would be doable too.
You should not be getting both messages. It looks like you're using
an older series - I assumed you pulled my git tree rather than the
patches? The public git tree isn't up to date with these changes.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
