Unverified Commit d5805af9 authored by Damien Le Moal's avatar Damien Le Moal Committed by Palmer Dabbelt
Browse files

riscv: Fix builtin DTB handling 



All SiPeed K210 MAIX boards have the exact same vendor, arch and
implementation IDs, preventing differentiation to select the correct
device tree to use through the SOC_BUILTIN_DTB_DECLARE() macro. This
result in this macro to be useless and mandates changing the code of
the sysctl driver to change the builtin device tree suitable for the
target board.

Fix this problem by removing the SOC_BUILTIN_DTB_DECLARE() macro since
it is used only for the K210 support. The code searching the builtin
DTBs using the vendor, arch an implementation IDs is also removed.
Support for builtin DTB falls back to the simpler and more traditional
handling of builtin DTB using the CONFIG_BUILTIN_DTB option, similarly
to other architectures.

Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent d573b555

arch/riscv/Kconfig.socs

+14 −5
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ config SOC_KENDRYTE 
	help

	  This enables support for Kendryte K210 SoC platform hardware.



config SOC_KENDRYTE_K210_DTB

	def_bool y

	depends on SOC_KENDRYTE_K210_DTB_BUILTIN

if SOC_KENDRYTE



config SOC_KENDRYTE_K210_DTB_BUILTIN

	bool "Builtin device tree for the Kendryte K210"
@@ -42,10 +40,21 @@ config SOC_KENDRYTE_K210_DTB_BUILTIN 
	default y

	select OF

	select BUILTIN_DTB

	select SOC_KENDRYTE_K210_DTB

	help

	  Builds a device tree for the Kendryte K210 into the Linux image.

	  Build a device tree for the Kendryte K210 into the Linux image.

	  This option should be selected if no bootloader is being used.

	  If unsure, say Y.



config SOC_KENDRYTE_K210_DTB_SOURCE

	string "Source file for the Kendryte K210 builtin DTB"

	depends on SOC_KENDRYTE

	depends on SOC_KENDRYTE_K210_DTB_BUILTIN

	default "k210"

	help

	  Base name (without suffix, relative to arch/riscv/boot/dts/kendryte)

	  for the DTS file that will be used to produce the DTB linked into the

	  kernel.



endif



endmenu

arch/riscv/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

subdir-y += sifive

subdir-y += kendryte

subdir-$(CONFIG_SOC_KENDRYTE) += kendryte



obj-$(CONFIG_BUILTIN_DTB) := $(addsuffix /, $(subdir-y))

arch/riscv/boot/dts/kendryte/Makefile

+3 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_SOC_KENDRYTE_K210_DTB) += k210.dtb



ifneq ($(CONFIG_SOC_KENDRYTE_K210_DTB_SOURCE),"")

dtb-y += $(strip $(shell echo $(CONFIG_SOC_KENDRYTE_K210_DTB_SOURCE))).dtb

obj-$(CONFIG_SOC_KENDRYTE_K210_DTB_BUILTIN) += $(addsuffix .o, $(dtb-y))

endif

arch/riscv/include/asm/soc.h

+0 −38
Original line number Diff line number Diff line
@@ -21,42 +21,4 @@ void soc_early_init(void); 
extern unsigned long __soc_early_init_table_start;

extern unsigned long __soc_early_init_table_end;



/*

 * Allows Linux to provide a device tree, which is necessary for SOCs that

 * don't provide a useful one on their own.

 */

struct soc_builtin_dtb {

	unsigned long vendor_id;

	unsigned long arch_id;

	unsigned long imp_id;

	void *(*dtb_func)(void);

};



/*

 * The argument name must specify a valid DTS file name without the dts

 * extension.

 */

#define SOC_BUILTIN_DTB_DECLARE(name, vendor, arch, impl)		\

	extern void *__dtb_##name##_begin;				\

									\

	static __init __used						\

	void *__soc_builtin_dtb_f__##name(void)				\

	{								\

		return (void *)&__dtb_##name##_begin;			\

	}								\

									\

	static const struct soc_builtin_dtb __soc_builtin_dtb__##name	\

		__used __section("__soc_builtin_dtb_table") =		\

	{								\

		.vendor_id = vendor,					\

		.arch_id   = arch,					\

		.imp_id    = impl,					\

		.dtb_func  = __soc_builtin_dtb_f__##name,		\

	}



extern unsigned long __soc_builtin_dtb_table_start;

extern unsigned long __soc_builtin_dtb_table_end;



void *soc_lookup_builtin_dtb(void);



#endif

arch/riscv/kernel/soc.c

+0 −27
Original line number Diff line number Diff line
@@ -26,30 +26,3 @@ void __init soc_early_init(void) 
		}

	}

}
 


static bool soc_builtin_dtb_match(unsigned long vendor_id,

				unsigned long arch_id, unsigned long imp_id,

				const struct soc_builtin_dtb *entry)

{

	return entry->vendor_id == vendor_id &&

	       entry->arch_id == arch_id &&

	       entry->imp_id == imp_id;

}



void * __init soc_lookup_builtin_dtb(void)

{

	unsigned long vendor_id, arch_id, imp_id;

	const struct soc_builtin_dtb *s;



	__asm__ ("csrr %0, mvendorid" : "=r"(vendor_id));

	__asm__ ("csrr %0, marchid" : "=r"(arch_id));

	__asm__ ("csrr %0, mimpid" : "=r"(imp_id));



	for (s = (void *)&__soc_builtin_dtb_table_start;

	     (void *)s < (void *)&__soc_builtin_dtb_table_end; s++) {

		if (soc_builtin_dtb_match(vendor_id, arch_id, imp_id, s))

			return s->dtb_func();

	}



	return NULL;

}