Commit 9830afca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-4.21-mw1' of... 

Merge tag 'riscv-for-linus-4.21-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux

Pull RISC-V updates from Palmer Dabbelt:
 "We don't have many patches for this merge window, probably because
  everything has been a bit busy with the holidays and conferences. The
  only big user-visible change is to move over to an SBI-based earlycon
  instead of our arch-specific early printk support.

  The only outstanding patch set I know of is the audit patch set, which
  I've managed to make a mess of and will attempt to clean up"

* tag 'riscv-for-linus-4.21-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  RISC-V: Select GENERIC_SCHED_CLOCK for clocksource drivers
  RISC-V: lib: minor asm cleanup
  RISC-V: Update Kconfig to better handle CMDLINE
  riscv: remove unused variable in ftrace
  RISC-V: add of_node_put()
  RISC-V: Fix of_node_* refcount
  riscv, atomic: Add #define's for the atomic_{cmp,}xchg_*() variants
  RISC-V: Remove EARLY_PRINTK support
  RISC-V: defconfig: Enable RISC-V SBI earlycon support
parents 30807ef2 9b9afe4a

arch/riscv/Kconfig

+34 −24
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config RISCV 
	select GENERIC_CPU_DEVICES

	select GENERIC_IRQ_SHOW

	select GENERIC_PCI_IOMAP

	select GENERIC_SCHED_CLOCK

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	select GENERIC_SMP_IDLE_THREAD
@@ -227,39 +228,48 @@ endmenu 


menu "Boot options"



config CMDLINE_BOOL

	bool "Built-in kernel command line"

config CMDLINE

	string "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 most platforms, the arguments for the kernel's command line

	  are provided at run-time, during boot. However, there are cases

	  where either no arguments are being provided or the provided

	  arguments are insufficient or even invalid.



	  For that, choose 'Y' here and fill in the extra boot parameters

	  in CONFIG_CMDLINE.

	  When that occurs, it is possible to define a built-in command

	  line here and choose how the kernel should use it later on.



	  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.

choice

	prompt "Built-in command line usage" if CMDLINE != ""

	default CMDLINE_FALLBACK

	help

	  Choose how the kernel will handle the provided built-in command

	  line.



config CMDLINE

	string "Built-in kernel command string"

	depends on CMDLINE_BOOL

	default ""

config CMDLINE_FALLBACK

	bool "Use bootloader kernel arguments if available"

	help

	  Supply command-line options at build time by entering them here.

	  Use the built-in command line as fallback in case we get nothing

	  during boot. This is the default behaviour.



config CMDLINE_EXTEND

	bool "Extend bootloader kernel arguments"

	help

	  The command-line arguments provided during boot will be

	  appended to the built-in command line. This is useful in

	  cases where the provided arguments are insufficient and

	  you don't want to or cannot modify them.





config CMDLINE_FORCE

	bool "Built-in command line overrides bootloader arguments"

	depends on CMDLINE_BOOL

	bool "Always use the default kernel command string"

	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.

	  Always use the built-in command line, even if we get one during

	  boot. This is useful in case you need to override the provided

	  command line on systems where you don't have or want control

	  over it.



	  If you don't know what to do here, say N.

endchoice



endmenu

arch/riscv/Kconfig.debug

+0 −2
Original line number Diff line number Diff line 
config EARLY_PRINTK

	def_bool y

arch/riscv/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ CONFIG_INPUT_MOUSEDEV=y 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_EARLYCON_RISCV_SBI=y

CONFIG_HVC_RISCV_SBI=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_DRM=y

arch/riscv/include/asm/atomic.h

+9 −0
Original line number Diff line number Diff line
@@ -303,6 +303,15 @@ c_t atomic##prefix##_cmpxchg(atomic##prefix##_t *v, c_t o, c_t n) \ 


ATOMIC_OPS()



#define atomic_xchg_relaxed atomic_xchg_relaxed

#define atomic_xchg_acquire atomic_xchg_acquire

#define atomic_xchg_release atomic_xchg_release

#define atomic_xchg atomic_xchg

#define atomic_cmpxchg_relaxed atomic_cmpxchg_relaxed

#define atomic_cmpxchg_acquire atomic_cmpxchg_acquire

#define atomic_cmpxchg_release atomic_cmpxchg_release

#define atomic_cmpxchg atomic_cmpxchg



#undef ATOMIC_OPS

#undef ATOMIC_OP

arch/riscv/kernel/cacheinfo.c

+11 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static int __init_cache_level(unsigned int cpu) 
{

	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);

	struct device_node *np = of_cpu_device_node_get(cpu);

	struct device_node *prev = NULL;

	int levels = 0, leaves = 0, level;



	if (of_property_read_bool(np, "cache-size"))
@@ -39,7 +40,10 @@ static int __init_cache_level(unsigned int cpu) 
	if (leaves > 0)

		levels = 1;



	prev = np;

	while ((np = of_find_next_cache_node(np))) {

		of_node_put(prev);

		prev = np;

		if (!of_device_is_compatible(np, "cache"))

			break;

		if (of_property_read_u32(np, "cache-level", &level))
@@ -55,8 +59,10 @@ static int __init_cache_level(unsigned int cpu) 
		levels = level;

	}



	of_node_put(np);

	this_cpu_ci->num_levels = levels;

	this_cpu_ci->num_leaves = leaves;



	return 0;

}
@@ -65,6 +71,7 @@ static int __populate_cache_leaves(unsigned int cpu) 
	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);

	struct cacheinfo *this_leaf = this_cpu_ci->info_list;

	struct device_node *np = of_cpu_device_node_get(cpu);

	struct device_node *prev = NULL;

	int levels = 1, level = 1;



	if (of_property_read_bool(np, "cache-size"))
@@ -74,7 +81,10 @@ static int __populate_cache_leaves(unsigned int cpu) 
	if (of_property_read_bool(np, "d-cache-size"))

		ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);



	prev = np;

	while ((np = of_find_next_cache_node(np))) {

		of_node_put(prev);

		prev = np;

		if (!of_device_is_compatible(np, "cache"))

			break;

		if (of_property_read_u32(np, "cache-level", &level))
@@ -89,6 +99,7 @@ static int __populate_cache_leaves(unsigned int cpu) 
			ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);

		levels = level;

	}

	of_node_put(np);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE