Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20191127152612.21945-1-linux@roeck-us.net>
In-Reply-To: <20191127152612.21945-1-linux@roeck-us.net>
From:   =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= <f4bug@amsat.org>
Date:   Wed, 27 Nov 2019 18:25:47 +0100
Message-ID: <CAAdtpL7UVqY6LSbCBeB9FXGDt499xUV072ndXxZuiahTN6UU+A@mail.gmail.com>
Subject: Re: [PATCH] MIPS: Fix boot on Fuloong2 systems
To:     Guenter Roeck <linux@roeck-us.net>
Cc:     Paul Burton <paulburton@kernel.org>,
        Ralf Baechle <ralf@linux-mips.org>,
        James Hogan <jhogan@kernel.org>,
        "open list:BROADCOM NVRAM DRIVER" <linux-mips@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        Jiaxun Yang <jiaxun.yang@flygoat.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, Nov 27, 2019 at 4:28 PM Guenter Roeck <linux@roeck-us.net> 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@amsat.org>

> Fixes: 268a2d60013049 ("MIPS: Loongson64: Rename CPU TYPES")
> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
>  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
>