mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
This tag contains some small RISC-V updates I'd like to target for 4.18. They are all fairly small this time. Here's a short summary, there's more info in the commits/merges. * A fix to __clear_user to respect the passed arguments. * Enough support for the perf subsystem to work with RISC-V's ISA defined performance counters. * Support for sparse and cleanups suggested by it. * Support for R_RISCV_32 (a relocation, not the 32-bit ISA). * Some MAINTAINERS cleanups. * The addition of CONFIG_HVC_RISCV_SBI to our defconfig, as it's always present. I've given these a simple build+boot test. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEAM520YNJYN/OiG3470yhUCzLq0EFAlsezeQTHHBhbG1lckBk YWJiZWx0LmNvbQAKCRDvTKFQLMurQSjWD/999J5HKkHQfHJi4/RQh0SEFNnRv32U 1O7zwqA5PkeoxWqq1y+dKcPGwZTZncwWp8yn8xipVYTYmYgGNZj9CYdEYkO119y5 OVcyUZdHlSdXgKkpVDJ0+MrZ60LY6tS66b6oJqQKmB/N4rYvu5L6ctRtyHRQe4nb rXNVbnaouiwrFJs9iZaCyaaGAGXKg81C5xCvvr8P0CYzVD4Jx+AmD6c7GohGWJS3 PLttEsmPaiaV9pzWK18yeFLaIgAqNEo2/s7/QsR1sHo4dUEJyFu9nMHvmjlJucCu imrkRwlhsCKxa4ob9D6UPh0qBXDmbSQA1U6M9RKY1jdt7Gul5eMuZIz2r/45752D z3YCITgTih2dzWO0zw4GCicCcJoD39IVTrsRCIqxF7jmAfBV8s/U+irMjEMkYhz6 wKVM9L3/6Z4bPAEztqKMjSw1/nNSavyn6wWACYIj5SDtFqNkvxwSahg1nGTuuoNx JqRa0r+lxsbunSwpEVtRROLYE3ZYa/KPrKhKEr+7vkiPlNNv82TZ5T/wkObhVfKp S6tZ0/Wb0tchm//LurfLAOV4aZxDlOLfukZ3eSdgBqSfILA3T98zS9FpuCmjiUfG 6S5GdNvjc3jLLZvPwtofIZmKUSpRSj545J1RRkEcgoEFjXdzxOWFLETsIOIt4nFf 7Nwjw/Th1hzuyQ== =D+sb -----END PGP SIGNATURE----- Merge tag 'riscv-for-linus-4.18-merge_window' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux Pull RISC-V updates from Palmer Dabbelt: "This contains some small RISC-V updates I'd like to target for 4.18. They are all fairly small this time. Here's a short summary, there's more info in the commits/merges: - a fix to __clear_user to respect the passed arguments. - enough support for the perf subsystem to work with RISC-V's ISA defined performance counters. - support for sparse and cleanups suggested by it. - support for R_RISCV_32 (a relocation, not the 32-bit ISA). - some MAINTAINERS cleanups. - the addition of CONFIG_HVC_RISCV_SBI to our defconfig, as it's always present. I've given these a simple build+boot test" * tag 'riscv-for-linus-4.18-merge_window' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux: RISC-V: Add CONFIG_HVC_RISCV_SBI=y to defconfig RISC-V: Handle R_RISCV_32 in modules riscv/ftrace: Export _mcount when DYNAMIC_FTRACE isn't set riscv: add riscv-specific predefines to CHECKFLAGS riscv: split the declaration of __copy_user riscv: no __user for probe_kernel_address() riscv: use NULL instead of a plain 0 perf: riscv: Add Document for Future Porting Guide perf: riscv: preliminary RISC-V support MAINTAINERS: Update Albert's email, he's back at Berkeley MAINTAINERS: Add myself as a maintainer for SiFive's drivers riscv: Fix the bug in memory access fixup code
315 lines
6.6 KiB
Text
315 lines
6.6 KiB
Text
#
|
|
# For a description of the syntax of this configuration file,
|
|
# see Documentation/kbuild/kconfig-language.txt.
|
|
#
|
|
|
|
config 64BIT
|
|
bool
|
|
|
|
config 32BIT
|
|
bool
|
|
|
|
config RISCV
|
|
def_bool y
|
|
# even on 32-bit, physical (and DMA) addresses are > 32-bits
|
|
select PHYS_ADDR_T_64BIT
|
|
select OF
|
|
select OF_EARLY_FLATTREE
|
|
select OF_IRQ
|
|
select ARCH_WANT_FRAME_POINTERS
|
|
select CLONE_BACKWARDS
|
|
select COMMON_CLK
|
|
select DMA_DIRECT_OPS
|
|
select GENERIC_CLOCKEVENTS
|
|
select GENERIC_CPU_DEVICES
|
|
select GENERIC_IRQ_SHOW
|
|
select GENERIC_PCI_IOMAP
|
|
select GENERIC_STRNCPY_FROM_USER
|
|
select GENERIC_STRNLEN_USER
|
|
select GENERIC_SMP_IDLE_THREAD
|
|
select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A
|
|
select HAVE_MEMBLOCK
|
|
select HAVE_MEMBLOCK_NODE_MAP
|
|
select HAVE_DMA_CONTIGUOUS
|
|
select HAVE_GENERIC_DMA_COHERENT
|
|
select HAVE_PERF_EVENTS
|
|
select IRQ_DOMAIN
|
|
select NO_BOOTMEM
|
|
select RISCV_ISA_A if SMP
|
|
select SPARSE_IRQ
|
|
select SYSCTL_EXCEPTION_TRACE
|
|
select HAVE_ARCH_TRACEHOOK
|
|
select MODULES_USE_ELF_RELA if MODULES
|
|
select THREAD_INFO_IN_TASK
|
|
select RISCV_TIMER
|
|
select GENERIC_IRQ_MULTI_HANDLER
|
|
select ARCH_HAS_PTE_SPECIAL
|
|
|
|
config MMU
|
|
def_bool y
|
|
|
|
config ZONE_DMA32
|
|
bool
|
|
default y if 64BIT
|
|
|
|
config PAGE_OFFSET
|
|
hex
|
|
default 0xC0000000 if 32BIT && MAXPHYSMEM_2GB
|
|
default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB
|
|
default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB
|
|
|
|
config STACKTRACE_SUPPORT
|
|
def_bool y
|
|
|
|
config TRACE_IRQFLAGS_SUPPORT
|
|
def_bool y
|
|
|
|
config RWSEM_GENERIC_SPINLOCK
|
|
def_bool y
|
|
|
|
config GENERIC_BUG
|
|
def_bool y
|
|
depends on BUG
|
|
select GENERIC_BUG_RELATIVE_POINTERS if 64BIT
|
|
|
|
config GENERIC_BUG_RELATIVE_POINTERS
|
|
bool
|
|
|
|
config GENERIC_CALIBRATE_DELAY
|
|
def_bool y
|
|
|
|
config GENERIC_CSUM
|
|
def_bool y
|
|
|
|
config GENERIC_HWEIGHT
|
|
def_bool y
|
|
|
|
config PGTABLE_LEVELS
|
|
int
|
|
default 3 if 64BIT
|
|
default 2
|
|
|
|
config HAVE_KPROBES
|
|
def_bool n
|
|
|
|
menu "Platform type"
|
|
|
|
choice
|
|
prompt "Base ISA"
|
|
default ARCH_RV64I
|
|
help
|
|
This selects the base ISA that this kernel will traget and must match
|
|
the target platform.
|
|
|
|
config ARCH_RV32I
|
|
bool "RV32I"
|
|
select 32BIT
|
|
select GENERIC_LIB_ASHLDI3
|
|
select GENERIC_LIB_ASHRDI3
|
|
select GENERIC_LIB_LSHRDI3
|
|
|
|
config ARCH_RV64I
|
|
bool "RV64I"
|
|
select 64BIT
|
|
select HAVE_FUNCTION_TRACER
|
|
select HAVE_FUNCTION_GRAPH_TRACER
|
|
select HAVE_FTRACE_MCOUNT_RECORD
|
|
select HAVE_DYNAMIC_FTRACE
|
|
select HAVE_DYNAMIC_FTRACE_WITH_REGS
|
|
select SWIOTLB
|
|
|
|
endchoice
|
|
|
|
# We must be able to map all physical memory into the kernel, but the compiler
|
|
# is still a bit more efficient when generating code if it's setup in a manner
|
|
# such that it can only map 2GiB of memory.
|
|
choice
|
|
prompt "Kernel Code Model"
|
|
default CMODEL_MEDLOW if 32BIT
|
|
default CMODEL_MEDANY if 64BIT
|
|
|
|
config CMODEL_MEDLOW
|
|
bool "medium low code model"
|
|
config CMODEL_MEDANY
|
|
bool "medium any code model"
|
|
endchoice
|
|
|
|
config MODULE_SECTIONS
|
|
bool
|
|
select HAVE_MOD_ARCH_SPECIFIC
|
|
|
|
choice
|
|
prompt "Maximum Physical Memory"
|
|
default MAXPHYSMEM_2GB if 32BIT
|
|
default MAXPHYSMEM_2GB if 64BIT && CMODEL_MEDLOW
|
|
default MAXPHYSMEM_128GB if 64BIT && CMODEL_MEDANY
|
|
|
|
config MAXPHYSMEM_2GB
|
|
bool "2GiB"
|
|
config MAXPHYSMEM_128GB
|
|
depends on 64BIT && CMODEL_MEDANY
|
|
select MODULE_SECTIONS if MODULES
|
|
bool "128GiB"
|
|
endchoice
|
|
|
|
|
|
config SMP
|
|
bool "Symmetric Multi-Processing"
|
|
help
|
|
This enables support for systems with more than one CPU. If
|
|
you say N here, the kernel will run on single and
|
|
multiprocessor machines, but will use only one CPU of a
|
|
multiprocessor machine. If you say Y here, the kernel will run
|
|
on many, but not all, single processor machines. On a single
|
|
processor machine, the kernel will run faster if you say N
|
|
here.
|
|
|
|
If you don't know what to do here, say N.
|
|
|
|
config NR_CPUS
|
|
int "Maximum number of CPUs (2-32)"
|
|
range 2 32
|
|
depends on SMP
|
|
default "8"
|
|
|
|
choice
|
|
prompt "CPU Tuning"
|
|
default TUNE_GENERIC
|
|
|
|
config TUNE_GENERIC
|
|
bool "generic"
|
|
|
|
endchoice
|
|
|
|
config RISCV_ISA_C
|
|
bool "Emit compressed instructions when building Linux"
|
|
default y
|
|
help
|
|
Adds "C" to the ISA subsets that the toolchain is allowed to emit
|
|
when building Linux, which results in compressed instructions in the
|
|
Linux binary.
|
|
|
|
If you don't know what to do here, say Y.
|
|
|
|
config RISCV_ISA_A
|
|
def_bool y
|
|
|
|
menu "supported PMU type"
|
|
depends on PERF_EVENTS
|
|
|
|
config RISCV_BASE_PMU
|
|
bool "Base Performance Monitoring Unit"
|
|
def_bool y
|
|
help
|
|
A base PMU that serves as a reference implementation and has limited
|
|
feature of perf. It can run on any RISC-V machines so serves as the
|
|
fallback, but this option can also be disable to reduce kernel size.
|
|
|
|
endmenu
|
|
|
|
endmenu
|
|
|
|
menu "Kernel type"
|
|
|
|
source "mm/Kconfig"
|
|
|
|
source "kernel/Kconfig.preempt"
|
|
|
|
source "kernel/Kconfig.hz"
|
|
|
|
endmenu
|
|
|
|
menu "Bus support"
|
|
|
|
config PCI
|
|
bool "PCI support"
|
|
select PCI_MSI
|
|
help
|
|
This feature enables support for PCI bus system. If you say Y
|
|
here, the kernel will include drivers and infrastructure code
|
|
to support PCI bus devices.
|
|
|
|
If you don't know what to do here, say Y.
|
|
|
|
config PCI_DOMAINS
|
|
def_bool PCI
|
|
|
|
config PCI_DOMAINS_GENERIC
|
|
def_bool PCI
|
|
|
|
source "drivers/pci/Kconfig"
|
|
|
|
endmenu
|
|
|
|
source "init/Kconfig"
|
|
|
|
source "kernel/Kconfig.freezer"
|
|
|
|
menu "Executable file formats"
|
|
|
|
source "fs/Kconfig.binfmt"
|
|
|
|
endmenu
|
|
|
|
menu "Power management options"
|
|
|
|
source kernel/power/Kconfig
|
|
|
|
endmenu
|
|
|
|
source "net/Kconfig"
|
|
|
|
source "drivers/Kconfig"
|
|
|
|
source "fs/Kconfig"
|
|
|
|
menu "Kernel hacking"
|
|
|
|
config CMDLINE_BOOL
|
|
bool "Built-in kernel command line"
|
|
help
|
|
For most platforms, it is firmware or second stage bootloader
|
|
that by default specifies the kernel command line options.
|
|
However, it might be necessary or advantageous to either override
|
|
the default kernel command line or add a few extra options to it.
|
|
For such cases, this option allows hardcoding command line options
|
|
directly into the kernel.
|
|
|
|
For that, choose 'Y' here and fill in the extra boot parameters
|
|
in CONFIG_CMDLINE.
|
|
|
|
The built-in options will be concatenated to the default command
|
|
line if CMDLINE_FORCE is set to 'N'. Otherwise, the default
|
|
command line will be ignored and replaced by the built-in string.
|
|
|
|
config CMDLINE
|
|
string "Built-in kernel command string"
|
|
depends on CMDLINE_BOOL
|
|
default ""
|
|
help
|
|
Supply command-line options at build time by entering them here.
|
|
|
|
config CMDLINE_FORCE
|
|
bool "Built-in command line overrides bootloader arguments"
|
|
depends on CMDLINE_BOOL
|
|
help
|
|
Set this option to 'Y' to have the kernel ignore the bootloader
|
|
or firmware command line. Instead, the built-in command line
|
|
will be used exclusively.
|
|
|
|
If you don't know what to do here, say N.
|
|
|
|
config EARLY_PRINTK
|
|
def_bool y
|
|
|
|
source "lib/Kconfig.debug"
|
|
|
|
config CMDLINE_BOOL
|
|
bool
|
|
endmenu
|
|
|
|
source "security/Kconfig"
|
|
|
|
source "crypto/Kconfig"
|
|
|
|
source "lib/Kconfig"
|