[PATCH] MIPS: Fix boot on Fuloong2 systems

[PATCH] MIPS: Fix boot on Fuloong2 systems

[Guenter Roeck]

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.

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

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

[Philippe Mathieu-Daudé]

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
>

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

[Paul Burton]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]

Hello,

Guenter Roeck 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.

Applied to mips-fixes.

> commit 87f67cc4c7b8
> https://git.kernel.org/mips/c/87f67cc4c7b8
> 
> Fixes: 268a2d60013049 ("MIPS: Loongson64: Rename CPU TYPES")
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Paul Burton <paulburton@kernel.org>

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email paulburton@kernel.org to report it. ]

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

[Jiaxun Yang]

于 2019年11月27日 GMT+08:00 下午11:26:12, Guenter Roeck <linux@roeck-us.net> 写到:
>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.
>
>Fixes: 268a2d60013049 ("MIPS: Loongson64: Rename CPU TYPES")
>Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
>Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jiaxun Yang <jiaxun.yang@flygoat.com>

Apologies for the mistake. I ran some tests before sending the
patch but probably get this missed due to
difference between my local tree and next tree.

Thanks for catching that!
>---

-- 
Jiaxun Yang