From 00467c718d797c1bc4b548c728379692a1da4ea2 Mon Sep 17 00:00:00 2001 From: Chen Pei Date: Wed, 13 Nov 2024 09:25:00 +0800 Subject: [PATCH 1/2] riscv:defconfig: Remove TH1520-specific CONFIG in defconfig These CONFIGs have been provided by th1520_defconfig. Signed-off-by: Chen Pei --- arch/riscv/configs/defconfig | 39 ------------------------------------ 1 file changed, 39 deletions(-) diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index 84636302e37c4..63c7405ca90fa 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -273,42 +273,3 @@ CONFIG_STRICT_KERNEL_RWX=n CONFIG_BPF_JIT=y CONFIG_RUNTIME_TESTING_MENU=y CONFIG_TEST_BPF=m -# TH1520 -CONFIG_PINCTRL_TH1520=y -# TH1520 PWM -CONFIG_PWM=y -CONFIG_PWM_XUANTIE=m -# TH1520 dwmac -CONFIG_DWMAC_XUANTIE=m -# TH1520 GPIO -CONFIG_GPIO_DWAPB=y -CONFIG_GPIO_PCA953X=y -CONFIG_GPIO_PCA953X_IRQ=y -# TH1520 cpu thermal -CONFIG_CPU_THERMAL=y -CONFIG_THERMAL_EMULATION=y -CONFIG_SENSORS_MR75203=m -CONFIG_SENSORS_PWM_FAN=m -# TH1520 USB -CONFIG_USB_DWC3=m -CONFIG_USB_DWC3_HOST=y -CONFIG_USB_ONBOARD_HUB=m -CONFIG_USB_GADGET=m -CONFIG_TYPEC=m -CONFIG_USB_ROLE_SWITCH=m -CONFIG_IIO=y -CONFIG_XUANTIE_TH1520_ADC=m -# TH1520 CLOCK -CONFIG_CLK_TH1520_FM=y -CONFIG_MTD=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_BLOCK=y -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -CONFIG_MTD_SPI_NAND=y -CONFIG_MTD_SPI_NOR=y -CONFIG_MTD_UBI=y -# TH1520 MAILBOX -CONFIG_MAILBOX=y -# TH1520 PMIC_WDT -CONFIG_TH1520_PMIC_WATCHDOG=y From 01a18836e59d23f8a65d870a20bb39c1bebfed87 Mon Sep 17 00:00:00 2001 From: Chen Pei Date: Wed, 13 Nov 2024 09:56:36 +0800 Subject: [PATCH 2/2] riscv:configs: Add xuantie related defconfig and configs Added some fragment configs to combine into different types of defconfig for xuantie processor testing. Signed-off-by: Chen Pei --- arch/riscv/Makefile | 8 ++++++++ arch/riscv/configs/12HZ.config | 1 + arch/riscv/configs/debug.config | 2 ++ arch/riscv/configs/ebpf.config | 18 ++++++++++++++++++ arch/riscv/configs/fs.config | 8 ++++++++ arch/riscv/configs/ftrace.config | 15 +++++++++++++++ arch/riscv/configs/kdump.config | 3 +++ arch/riscv/configs/sched.config | 5 +++++ arch/riscv/configs/thp.config | 1 + 9 files changed, 61 insertions(+) create mode 100644 arch/riscv/configs/12HZ.config create mode 100644 arch/riscv/configs/debug.config create mode 100644 arch/riscv/configs/ebpf.config create mode 100644 arch/riscv/configs/fs.config create mode 100644 arch/riscv/configs/ftrace.config create mode 100644 arch/riscv/configs/kdump.config create mode 100644 arch/riscv/configs/sched.config create mode 100644 arch/riscv/configs/thp.config diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 2b208d37e9726..df7d11150b9d5 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -212,3 +212,11 @@ rv32_nommu_virt_defconfig: PHONY += rv64ilp32_defconfig rv64ilp32_defconfig: $(Q)$(MAKE) -f $(srctree)/Makefile defconfig 64ilp32.config + +PHONY += xuantie_defconfig +xuantie_defconfig: + $(Q)$(MAKE) -f $(srctree)/Makefile defconfig 12HZ.config thp.config fs.config + +PHONY += xuantie_debug_defconfig +xuantie_debug_defconfig: + $(Q)$(MAKE) -f $(srctree)/Makefile defconfig thp.config fs.config debug.config ftrace.config ebpf.config kdump.config sched.config diff --git a/arch/riscv/configs/12HZ.config b/arch/riscv/configs/12HZ.config new file mode 100644 index 0000000000000..a2c74e43bd22e --- /dev/null +++ b/arch/riscv/configs/12HZ.config @@ -0,0 +1 @@ +CONFIG_HZ_12=y diff --git a/arch/riscv/configs/debug.config b/arch/riscv/configs/debug.config new file mode 100644 index 0000000000000..7b08a5f421b15 --- /dev/null +++ b/arch/riscv/configs/debug.config @@ -0,0 +1,2 @@ +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y diff --git a/arch/riscv/configs/ebpf.config b/arch/riscv/configs/ebpf.config new file mode 100644 index 0000000000000..8da6bdb6a9577 --- /dev/null +++ b/arch/riscv/configs/ebpf.config @@ -0,0 +1,18 @@ +CONFIG_UPROBES=y +CONFIG_UPROBE_EVENTS=y +CONFIG_KPROBES=y +CONFIG_KPROBE_EVENTS=y +CONFIG_KPROBES_ON_FTRACE=y +CONFIG_KRETPROBES=y +CONFIG_BPF_KPROBE_OVERRIDE=y +CONFIG_FUNCTION_ERROR_INJECTION=y +CONFIG_CGROUP_BPF=y +CONFIG_NET_CLS_BPF=y +CONFIG_BPF_JIT=y +CONFIG_BPF_SYSCALL=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_BTF=y +CONFIG_DEBUG_INFO_BTF_MODULES=y +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y +CONFIG_IKHEADERS=y +CONFIG_KALLSYMS_ALL=y diff --git a/arch/riscv/configs/fs.config b/arch/riscv/configs/fs.config new file mode 100644 index 0000000000000..c765b10fae491 --- /dev/null +++ b/arch/riscv/configs/fs.config @@ -0,0 +1,8 @@ +CONFIG_BLK_DEV_NBD=y +CONFIG_FUSE_FS=y +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y +CONFIG_NET_9P_DEBUG=y +CONFIG_9P_FS=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y diff --git a/arch/riscv/configs/ftrace.config b/arch/riscv/configs/ftrace.config new file mode 100644 index 0000000000000..4aeac6141bee1 --- /dev/null +++ b/arch/riscv/configs/ftrace.config @@ -0,0 +1,15 @@ +CONFIG_FTRACE=y +CONFIG_TASKS_RUDE_RCU=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_GENERIC_TRACER=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_STACK_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y +CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y +CONFIG_FTRACE_MCOUNT_RECORD=y +CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y diff --git a/arch/riscv/configs/kdump.config b/arch/riscv/configs/kdump.config new file mode 100644 index 0000000000000..18d4cccff63b5 --- /dev/null +++ b/arch/riscv/configs/kdump.config @@ -0,0 +1,3 @@ +CONFIG_KEXEC=y +CONFIG_CRASH_DUMP=y +CONFIG_MAGIC_SYSRQ=y diff --git a/arch/riscv/configs/sched.config b/arch/riscv/configs/sched.config new file mode 100644 index 0000000000000..dc762d62ee829 --- /dev/null +++ b/arch/riscv/configs/sched.config @@ -0,0 +1,5 @@ +CONFIG_SCHED_MC=y +CONFIG_SCHEDSTATS=y +CONFIG_SCHED_DEBUG=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y diff --git a/arch/riscv/configs/thp.config b/arch/riscv/configs/thp.config new file mode 100644 index 0000000000000..75d999c665c9c --- /dev/null +++ b/arch/riscv/configs/thp.config @@ -0,0 +1 @@ +CONFIG_TRANSPARENT_HUGEPAGE=y