target/linux/generic/backport-5.10/103-v5.13-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch

   1 From 6523061868212473f63812a0c477a161742bed42 Mon Sep 17 00:00:00 2001
   2 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
   3 Date: Sat, 27 Feb 2021 13:20:24 +0100
   4 Subject: [PATCH] MIPS: select CPU_MIPS64 for remaining MIPS64 CPUs
   5
   6 The CPU_MIPS64 and CPU_MIPS32 variables are supposed to be able to
   7 distinguish broadly between 64-bit and 32-bit MIPS CPUs. However, they
   8 weren't selected by the specialty CPUs, Octeon and Loongson, which meant
   9 it was possible to hit a weird state of:
  10
  11     MIPS=y, CONFIG_64BIT=y, CPU_MIPS64=n
  12
  13 This commit rectifies the issue by having CPU_MIPS64 be selected when
  14 the missing Octeon or Loongson models are selected.
  15
  16 Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  17 Cc: Ralf Baechle <ralf@linux-mips.org>
  18 Cc: George Cherian <gcherian@marvell.com>
  19 Cc: Huacai Chen <chenhuacai@kernel.org>
  20 Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
  21 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  22 ---
  23  arch/mips/Kconfig | 2 +-
  24  1 file changed, 1 insertion(+), 1 deletion(-)
  25
  26 --- a/arch/mips/Kconfig
  27 +++ b/arch/mips/Kconfig
  28 @@ -2088,7 +2088,7 @@ config CPU_MIPS32
  29  config CPU_MIPS64
  30         bool
  31         default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
  32 -                    CPU_MIPS64_R6
  33 +                    CPU_MIPS64_R6 || CPU_LOONGSON64 || CPU_CAVIUM_OCTEON
  34
  35  #
  36  # These indicate the revision of the architecture