[SRU][Zesty][PATCH 2/3] powerpc/mce: Move 64-bit machine check code into mce.c
Mauricio Faria de Oliveira
mauricfo at linux.vnet.ibm.com
Mon Oct 9 15:12:34 UTC 2017
Hi Joseph,
> --- a/arch/powerpc/include/asm/reg.h
> +++ b/arch/powerpc/include/asm/reg.h
> @@ -1225,6 +1225,7 @@
> #define PVR_POWER8E 0x004B
> #define PVR_POWER8NVL 0x004C
> #define PVR_POWER8 0x004D
> +#define PVR_POWER9 0x004E
> #define PVR_BE 0x0070
> #define PVR_PA6T 0x0090
I recall this chunk is originally part of another, unrelated patch, but it's required for
the next patch (the vector workaround itself), so perhaps it's more contained to just move
it over there, so it stays where it is actually used for?
And between your backport and mine, there's this difference, which can be removed
(then this patch applies cleanly) by adding this small patch, which is actually a fix:
d93b0ac01a9c powerpc/book3s/mce: Move add_taint() later in virtual mode
> @@ -108,8 +85,6 @@ index e3655d7..f984ace 100644
> -
> - __this_cpu_inc(irq_stat.mce_exceptions);
> -
> -- add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);
> --
> - if (cur_cpu_spec && cur_cpu_spec->machine_check_early)
> - handled = cur_cpu_spec->machine_check_early(regs);
> - return handled;
Thanks,
Mauricio
More information about the kernel-team
mailing list