From 947fbc66183d022fe3de7871dfb262d2b87af826 Mon Sep 17 00:00:00 2001 From: YunQiang Su Date: Thu, 19 Dec 2019 03:39:31 -0800 Subject: [PATCH] mips: enable O32_FP64 and MSA CONFIG_MIPS_O32_FP64_SUPPORT is required to support MSA for O32. It requires CPU >= mips32r1. It is OK for us: currently our baseline is mips32r2/mips64r2. Malta can use different CPUs, some of them may support MSA. Loongson 3A/B 4000 will support MSA. The only CPU currently we support has no MSA is octeon. Commit-ID in master: b1d08a0cffbe181cbb94e3fc72a91c2e8a8a38e7 --- debian/changelog | 7 +++++++ debian/config/kernelarch-mips/config | 2 ++ debian/config/kernelarch-mips/config.boston | 1 - debian/config/kernelarch-mips/config.octeon | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a63cb0d4e..885bac4e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.19.87-2) UNRELEASED; urgency=medium + + * [mips*] enable CONFIG_MIPS_O32_FP64_SUPPORT. + * [mips*] enable CONFIG_CPU_HAS_MSA except octeon. + + -- YunQiang Su Fri, 27 Dec 2019 17:30:55 +0800 + linux (4.19.87-1) buster; urgency=medium * New upstream stable update: diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config index e6fc5a3b4..683a871b7 100644 --- a/debian/config/kernelarch-mips/config +++ b/debian/config/kernelarch-mips/config @@ -1,6 +1,7 @@ ## ## file: arch/mips/Kconfig ## +CONFIG_CPU_HAS_MSA=y CONFIG_RELOCATABLE=y CONFIG_RELOCATION_TABLE_SIZE=0x00140000 CONFIG_RANDOMIZE_BASE=y @@ -8,6 +9,7 @@ CONFIG_KEXEC=y CONFIG_SECCOMP=y CONFIG_PCI=y # CONFIG_RAPIDIO is not set +CONFIG_MIPS_O32_FP64_SUPPORT=y #. Ignored in 32-bit configurations CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y diff --git a/debian/config/kernelarch-mips/config.boston b/debian/config/kernelarch-mips/config.boston index ef96201f2..20178e150 100644 --- a/debian/config/kernelarch-mips/config.boston +++ b/debian/config/kernelarch-mips/config.boston @@ -5,7 +5,6 @@ CONFIG_MIPS_GENERIC=y ## end choice CONFIG_MIPS_CPS=y -CONFIG_CPU_HAS_MSA=y CONFIG_HIGHMEM=y CONFIG_NR_CPUS=16 diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon index 7b05c4ba4..dbd98f0b5 100644 --- a/debian/config/kernelarch-mips/config.octeon +++ b/debian/config/kernelarch-mips/config.octeon @@ -8,6 +8,7 @@ CONFIG_CAVIUM_OCTEON_SOC=y # CONFIG_32BIT is not set CONFIG_64BIT=y ## end choice +# CONFIG_CPU_HAS_MSA is not set CONFIG_SMP=y # CONFIG_HOTPLUG_CPU is not set CONFIG_NR_CPUS=64