From a2ee7cb28cdff5fe2ecf325d6ebb27f84c1cf0b3 Mon Sep 17 00:00:00 2001 From: Zihao Yu Date: Tue, 26 Nov 2019 10:03:50 +0800 Subject: [PATCH] riscv: do not enable SMP * SMP requires IPI to work, but noop does not implement IPI yet. --- arch/riscv/configs/emu_defconfig | 20 +++++++------------- arch/riscv/configs/fpga_defconfig | 27 +++++++-------------------- 2 files changed, 14 insertions(+), 33 deletions(-) diff --git a/arch/riscv/configs/emu_defconfig b/arch/riscv/configs/emu_defconfig index 7c0450b8d8e0..7c6b9c4ebdd8 100644 --- a/arch/riscv/configs/emu_defconfig +++ b/arch/riscv/configs/emu_defconfig @@ -4,7 +4,7 @@ # # -# Compiler: riscv64-unknown-linux-gnu-gcc (GCC) 7.2.0 +# Compiler: riscv64-unknown-linux-gnu-gcc (GCC) 9.2.0 # CONFIG_64BIT=y CONFIG_RISCV=y @@ -29,8 +29,7 @@ CONFIG_ARCH_RV64I=y CONFIG_CMODEL_MEDLOW=y # CONFIG_CMODEL_MEDANY is not set CONFIG_MAXPHYSMEM_2GB=y -CONFIG_SMP=y -CONFIG_NR_CPUS=8 +# CONFIG_SMP is not set CONFIG_TUNE_GENERIC=y CONFIG_RISCV_ISA_C=y CONFIG_RISCV_ISA_A=y @@ -48,6 +47,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_PHYS_ADDR_T_64BIT=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y # CONFIG_CLEANCACHE is not set # CONFIG_CMA is not set # CONFIG_ZPOOL is not set @@ -76,7 +76,7 @@ CONFIG_HZ=100 # # CONFIG_PCI_ENDPOINT is not set CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70200 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_THREAD_INFO_IN_TASK=y @@ -84,6 +84,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # # General setup # +CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set CONFIG_LOCALVERSION="" @@ -114,20 +115,16 @@ CONFIG_HZ_PERIODIC=y # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_CPU_ISOLATION is not set # # RCU Subsystem # -CONFIG_TREE_RCU=y +CONFIG_TINY_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_SRCU=y -CONFIG_TREE_SRCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_NEED_SEGCBLIST=y +CONFIG_TINY_SRCU=y # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=15 -CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=11 # CONFIG_CGROUPS is not set # CONFIG_SCHED_AUTOGROUP is not set @@ -184,7 +181,6 @@ CONFIG_SLUB=y # CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLAB_FREELIST_RANDOM is not set # CONFIG_SLAB_FREELIST_HARDENED is not set -# CONFIG_SLUB_CPU_PARTIAL is not set # CONFIG_PROFILING is not set CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y CONFIG_HAVE_ARCH_TRACEHOOK=y @@ -642,7 +638,6 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_MEMORY_INIT is not set -# CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_CC_HAS_SANCOV_TRACE_PC=y # CONFIG_DEBUG_SHIRQ is not set @@ -682,7 +677,6 @@ CONFIG_PANIC_TIMEOUT=0 # # CONFIG_RCU_PERF_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=21 # CONFIG_RCU_TRACE is not set # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set diff --git a/arch/riscv/configs/fpga_defconfig b/arch/riscv/configs/fpga_defconfig index d2f214fe9055..e6309b35e933 100644 --- a/arch/riscv/configs/fpga_defconfig +++ b/arch/riscv/configs/fpga_defconfig @@ -4,7 +4,7 @@ # # -# Compiler: riscv64-unknown-linux-gnu-gcc (GCC) 7.2.0 +# Compiler: riscv64-unknown-linux-gnu-gcc (GCC) 9.2.0 # CONFIG_64BIT=y CONFIG_RISCV=y @@ -31,8 +31,7 @@ CONFIG_CMODEL_MEDANY=y CONFIG_MODULE_SECTIONS=y # CONFIG_MAXPHYSMEM_2GB is not set CONFIG_MAXPHYSMEM_128GB=y -CONFIG_SMP=y -CONFIG_NR_CPUS=8 +# CONFIG_SMP is not set CONFIG_TUNE_GENERIC=y CONFIG_RISCV_ISA_C=y CONFIG_RISCV_ISA_A=y @@ -56,6 +55,7 @@ CONFIG_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y # CONFIG_CLEANCACHE is not set # CONFIG_FRONTSWAP is not set # CONFIG_CMA is not set @@ -86,7 +86,7 @@ CONFIG_ETH_XILINX_RV=y # # CONFIG_PCI_ENDPOINT is not set CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70200 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_THREAD_INFO_IN_TASK=y @@ -94,6 +94,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # # General setup # +CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set CONFIG_LOCALVERSION="" @@ -131,22 +132,18 @@ CONFIG_HZ_PERIODIC=y CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set -CONFIG_CPU_ISOLATION=y # # RCU Subsystem # -CONFIG_TREE_RCU=y +CONFIG_TINY_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_SRCU=y -CONFIG_TREE_SRCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_NEED_SEGCBLIST=y +CONFIG_TINY_SRCU=y CONFIG_BUILD_BIN2C=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 -CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 CONFIG_CGROUPS=y # CONFIG_MEMCG is not set @@ -158,7 +155,6 @@ CONFIG_CFS_BANDWIDTH=y # CONFIG_CGROUP_PIDS is not set # CONFIG_CGROUP_RDMA is not set # CONFIG_CGROUP_FREEZER is not set -# CONFIG_CPUSETS is not set # CONFIG_CGROUP_DEVICE is not set # CONFIG_CGROUP_CPUACCT is not set # CONFIG_CGROUP_PERF is not set @@ -237,7 +233,6 @@ CONFIG_SLUB=y CONFIG_SLAB_MERGE_DEFAULT=y # CONFIG_SLAB_FREELIST_RANDOM is not set # CONFIG_SLAB_FREELIST_HARDENED is not set -CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_PROFILING is not set CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y CONFIG_HAVE_ARCH_TRACEHOOK=y @@ -399,15 +394,11 @@ CONFIG_NETLINK_DIAG=y # CONFIG_NET_SWITCHDEV is not set # CONFIG_NET_L3_MASTER_DEV is not set # CONFIG_NET_NCSI is not set -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y # CONFIG_CGROUP_NET_PRIO is not set # CONFIG_CGROUP_NET_CLASSID is not set CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y # CONFIG_BPF_STREAM_PARSER is not set -CONFIG_NET_FLOW_LIMIT=y # # Network testing @@ -1329,7 +1320,6 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_MEMORY_INIT is not set -# CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_CC_HAS_SANCOV_TRACE_PC=y # CONFIG_DEBUG_SHIRQ is not set @@ -1372,7 +1362,6 @@ CONFIG_DEBUG_BUGVERBOSE=y # # CONFIG_RCU_PERF_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=21 # CONFIG_RCU_TRACE is not set # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set @@ -1474,7 +1463,6 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_NULL2=y -# CONFIG_CRYPTO_PCRYPT is not set CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_MCRYPTD is not set @@ -1647,7 +1635,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_DMA_DIRECT_OPS=y CONFIG_SWIOTLB=y CONFIG_SGL_ALLOC=y -CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y # CONFIG_CORDIC is not set -- GitLab