diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2019-03-27 22:39:08 +0800 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2019-03-29 15:49:11 +0530 |
| commit | 215c200ccbf39d834dfb64771c8fa5a06ad5b4e0 (patch) | |
| tree | 9c6f2ccb1de12dfcdc5afefd0a430e57245f5dca | |
| parent | 132f3e024b3c773000ef4dac3f6cae57eb335e1b (diff) | |
lib: Group all prints during boot into sbi_boot_prints()
Refactor the codes a little bit to put all prints during boot into
sbi_boot_prints().
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | lib/sbi_init.c | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/lib/sbi_init.c b/lib/sbi_init.c index edcc365..bc27436 100644 --- a/lib/sbi_init.c +++ b/lib/sbi_init.c @@ -28,10 +28,39 @@ " | |\n" \ " |_|\n\n" +static void sbi_boot_prints(struct sbi_scratch *scratch, u32 hartid) +{ + char str[64]; + const struct sbi_platform *plat = sbi_platform_ptr(scratch); + + misa_string(str, sizeof(str)); + sbi_printf("\nOpenSBI v%d.%d (%s %s)\n", + OPENSBI_VERSION_MAJOR, OPENSBI_VERSION_MINOR, + __DATE__, __TIME__); + + sbi_printf(BANNER); + + /* Platform details */ + sbi_printf("Platform Name : %s\n", sbi_platform_name(plat)); + sbi_printf("Platform HART Features : RV%d%s\n", misa_xlen(), str); + sbi_printf("Platform Max HARTs : %d\n", + sbi_platform_hart_count(plat)); + sbi_printf("Current Hart : %u\n", hartid); + /* Firmware details */ + sbi_printf("Firmware Base : 0x%lx\n", scratch->fw_start); + sbi_printf("Firmware Size : %d KB\n", + (u32)(scratch->fw_size / 1024)); + /* Generic details */ + sbi_printf("Runtime SBI Version : %d.%d\n", + sbi_ecall_version_major(), sbi_ecall_version_minor()); + sbi_printf("\n"); + + sbi_hart_pmp_dump(scratch); +} + static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid) { int rc; - char str[64]; const struct sbi_platform *plat = sbi_platform_ptr(scratch); rc = sbi_system_early_init(scratch, TRUE); @@ -62,29 +91,7 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid) if (rc) sbi_hart_hang(); - misa_string(str, sizeof(str)); - sbi_printf("\nOpenSBI v%d.%d (%s %s)\n", - OPENSBI_VERSION_MAJOR, OPENSBI_VERSION_MINOR, - __DATE__, __TIME__); - - sbi_printf(BANNER); - - /* Platform details */ - sbi_printf("Platform Name : %s\n", sbi_platform_name(plat)); - sbi_printf("Platform HART Features : RV%d%s\n", misa_xlen(), str); - sbi_printf("Platform Max HARTs : %d\n", - sbi_platform_hart_count(plat)); - sbi_printf("Current Hart : %u\n", hartid); - /* Firmware details */ - sbi_printf("Firmware Base : 0x%lx\n", scratch->fw_start); - sbi_printf("Firmware Size : %d KB\n", - (u32)(scratch->fw_size / 1024)); - /* Generic details */ - sbi_printf("Runtime SBI Version : %d.%d\n", - sbi_ecall_version_major(), sbi_ecall_version_minor()); - sbi_printf("\n"); - - sbi_hart_pmp_dump(scratch); + sbi_boot_prints(scratch, hartid); if (!sbi_platform_has_hart_hotplug(plat)) sbi_hart_wake_coldboot_harts(scratch, hartid); |