Re: [PATCH] MIPS: Fix boot on Fuloong2 systems

[Philippe Mathieu-DaudÃ]

On Wed, Nov 27, 2019 at 4:28 PM Guenter Roeck <linux@xxxxxxxxxxxx> wrote:
> Commit 268a2d60013049 ("MIPS: Loongson64: Rename CPU TYPES") changed
> Kconfig symbols as follows:
>         CPU_LOONGSON2 to CPU_LOONGSON2EF
>         CPU_LOONGSON3 to CPU_LOONGSON64
>         SYS_HAS_CPU_LOONGSON3 to SYS_HAS_CPU_LOONGSON64
>
> It did not touch SYS_HAS_CPU_LOONGSON2E or SYS_HAS_CPU_LOONGSON2F.
> However, the patch changed a conditional from
>
>  #if defined(CONFIG_SYS_HAS_CPU_LOONGSON2E) || \
>      defined(CONFIG_SYS_HAS_CPU_LOONGSON2F)
>
> to
>
>  #if defined(CONFIG_SYS_HAS_CPU_LOONGSON2EF)
>
> SYS_HAS_CPU_LOONGSON2EF does not exist, resulting in boot failures
> with the qemu fulong2e emulation. Revert to the original code.

Thanks Guenter for running your test suite and catching this!

Reviewed-by: Philippe Mathieu-Daudà <f4bug@xxxxxxxxx>

> Fixes: 268a2d60013049 ("MIPS: Loongson64: Rename CPU TYPES")
> Cc: Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx>
> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
>  arch/mips/include/asm/cpu-type.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h
> index c46c59b0f1b4..49f0061a6051 100644
> --- a/arch/mips/include/asm/cpu-type.h
> +++ b/arch/mips/include/asm/cpu-type.h
> @@ -15,7 +15,8 @@
>  static inline int __pure __get_cpu_type(const int cpu_type)
>  {
>         switch (cpu_type) {
> -#if defined(CONFIG_SYS_HAS_CPU_LOONGSON2EF)
> +#if defined(CONFIG_SYS_HAS_CPU_LOONGSON2E) || \
> +    defined(CONFIG_SYS_HAS_CPU_LOONGSON2F)
>         case CPU_LOONGSON2EF:
>  #endif
>
> --
> 2.17.1
>