Linux-MIPS Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] MIPS: Fix boot on Fuloong2 systems
@ 2019-11-27 15:26 Guenter Roeck
  2019-11-27 17:25 ` Philippe Mathieu-Daudé
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Guenter Roeck @ 2019-11-27 15:26 UTC (permalink / raw)
  To: Paul Burton
  Cc: Ralf Baechle, James Hogan, linux-mips, linux-kernel,
	Guenter Roeck, Jiaxun Yang

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] MIPS: Fix boot on Fuloong2 systems
  2019-11-27 15:26 [PATCH] MIPS: Fix boot on Fuloong2 systems Guenter Roeck
@ 2019-11-27 17:25 ` Philippe Mathieu-Daudé
  2019-11-27 18:28 ` Paul Burton
  2019-11-28  0:42 ` Jiaxun Yang
  2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-11-27 17:25 UTC (permalink / raw)
  To: Guenter Roeck
  Cc: Paul Burton, Ralf Baechle, James Hogan,
	open list:BROADCOM NVRAM DRIVER, open list, Jiaxun Yang

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
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] MIPS: Fix boot on Fuloong2 systems
  2019-11-27 15:26 [PATCH] MIPS: Fix boot on Fuloong2 systems Guenter Roeck
  2019-11-27 17:25 ` Philippe Mathieu-Daudé
@ 2019-11-27 18:28 ` Paul Burton
  2019-11-28  0:42 ` Jiaxun Yang
  2 siblings, 0 replies; 4+ messages in thread
From: Paul Burton @ 2019-11-27 18:28 UTC (permalink / raw)
  To: Guenter Roeck
  Cc: Paul Burton, Ralf Baechle, James Hogan, linux-mips, linux-kernel,
	Guenter Roeck, Jiaxun Yang, linux-mips

[-- Warning: decoded text below may be mangled --]
[-- Attachment #0: 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. ]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] MIPS: Fix boot on Fuloong2 systems
  2019-11-27 15:26 [PATCH] MIPS: Fix boot on Fuloong2 systems Guenter Roeck
  2019-11-27 17:25 ` Philippe Mathieu-Daudé
  2019-11-27 18:28 ` Paul Burton
@ 2019-11-28  0:42 ` Jiaxun Yang
  2 siblings, 0 replies; 4+ messages in thread
From: Jiaxun Yang @ 2019-11-28  0:42 UTC (permalink / raw)
  To: Guenter Roeck, Paul Burton
  Cc: Ralf Baechle, James Hogan, linux-mips, linux-kernel



于 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-27 15:26 [PATCH] MIPS: Fix boot on Fuloong2 systems Guenter Roeck
2019-11-27 17:25 ` Philippe Mathieu-Daudé
2019-11-27 18:28 ` Paul Burton
2019-11-28  0:42 ` Jiaxun Yang

Linux-MIPS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-mips/0 linux-mips/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-mips linux-mips/ https://lore.kernel.org/linux-mips \
		linux-mips@vger.kernel.org
	public-inbox-index linux-mips

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-mips


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git