D36980.id111770.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D36980.id111770.diff
View Options

	diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c
	--- a/sys/riscv/riscv/mp_machdep.c
	+++ b/sys/riscv/riscv/mp_machdep.c
	@@ -403,6 +403,20 @@
	}

	#ifdef FDT
	+static boolean_t
	+cpu_check_mmu(u_int id __unused, phandle_t node, u_int addr_size __unused,
	+ pcell_t *reg __unused)
	+{
	+ char type[32];
	+
	+ /* Check if this hart supports MMU. */
	+ if (OF_getprop(node, "mmu-type", (void *)type, sizeof(type)) == -1 \|\|
	+ strncmp(type, "riscv,none", 10) == 0)
	+ return (0);
	+
	+ return (1);
	+}
	+
	static boolean_t
	cpu_init_fdt(u_int id, phandle_t node, u_int addr_size, pcell_t *reg)
	{
	@@ -413,8 +427,7 @@
	int naps;
	int error;

	- /* Check if this hart supports MMU. */
	- if (OF_getproplen(node, "mmu-type") < 0)
	+ if (!cpu_check_mmu(id, node, addr_size, reg))
	return (0);

	KASSERT(id < MAXCPU, ("Too many CPUs"));
	@@ -521,17 +534,6 @@
	{
	}

	-static boolean_t
	-cpu_check_mmu(u_int id, phandle_t node, u_int addr_size, pcell_t *reg)
	-{
	-
	- /* Check if this hart supports MMU. */
	- if (OF_getproplen(node, "mmu-type") < 0)
	- return (0);
	-
	- return (1);
	-}
	-
	void
	cpu_mp_setmaxid(void)
	{