Unverified Commit ba9c0141 authored Apr 15, 2019 by Christoph Hellwig Committed by Palmer Dabbelt Apr 25, 2019

riscv: cleanup the parse_dtb calling conventions



No need to pass the hartid, and the dtb address passed is a physical
address, so don't pretend it is a kernel pointer.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>

parent c637b911

arch/riscv/kernel/head.S

+1 −2

Original line number	Diff line number	Diff line
		@@ -72,8 +72,7 @@ clear_bss_done:
		la sp, init_thread_union + THREAD_SIZE

		/* Start the kernel */
		mv a0, s0
		mv a1, s1
		mv a0, s1
		call parse_dtb
		tail start_kernel

arch/riscv/kernel/setup.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -52,9 +52,11 @@ struct screen_info screen_info = {
		atomic_t hart_lottery;
		unsigned long boot_cpu_hartid;

		void __init parse_dtb(unsigned int hartid, void *dtb)
		void __init parse_dtb(phys_addr_t dtb_phys)
		{
		if (early_init_dt_scan(__va(dtb)))
		void *dtb = __va(dtb_phys);

		if (early_init_dt_scan(dtb))
		return;

		pr_err("No DTB passed to the kernel\n");