From: Kefeng Wang <wangkefeng.wang@huawei.com>
Date: Wed, 25 Nov 2020 11:44:15 +0000 (+0800)
Subject: riscv: Add machine name to kernel boot log and stack dump output
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=46ad48e8a28da7cc37a16c7e7fc632ecf906e4bf;p=linux.git

riscv: Add machine name to kernel boot log and stack dump output

Add the machine name to kernel boot-up log, and install
the machine name to stack dump for DT boot mode.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
---

diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index 90a4e06886a68..4945b5085241f 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -214,8 +214,15 @@ static void __init init_resources(void)
 static void __init parse_dtb(void)
 {
 	/* Early scan of device tree from init memory */
-	if (early_init_dt_scan(dtb_early_va))
+	if (early_init_dt_scan(dtb_early_va)) {
+		const char *name = of_flat_dt_get_machine_name();
+
+		if (name) {
+			pr_info("Machine model: %s\n", name);
+			dump_stack_set_arch_desc("%s (DT)", name);
+		}
 		return;
+	}
 
 	pr_err("No DTB passed to the kernel\n");
 #ifdef CONFIG_CMDLINE_FORCE