Skip to content

Commit 551ac0f

Browse files
committed
lib: sbi: Improve the alignment of boot-time prints
Addition of "Experimental SBI Extensions" to the boot-time prints disturbs the alignment of other prints so adjust all boot-time prints accordingly. Signed-off-by: Anup Patel <[email protected]>
1 parent 0675461 commit 551ac0f

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

lib/sbi/sbi_init.c

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -83,56 +83,56 @@ static void sbi_boot_print_general(struct sbi_scratch *scratch)
8383
return;
8484

8585
/* Platform details */
86-
sbi_printf("Platform Name : %s\n",
86+
sbi_printf("Platform Name : %s\n",
8787
sbi_platform_name(plat));
8888
sbi_platform_get_features_str(plat, str, sizeof(str));
89-
sbi_printf("Platform Features : %s\n", str);
90-
sbi_printf("Platform HART Count : %u\n",
89+
sbi_printf("Platform Features : %s\n", str);
90+
sbi_printf("Platform HART Count : %u\n",
9191
sbi_platform_hart_count(plat));
9292
idev = sbi_ipi_get_device();
93-
sbi_printf("Platform IPI Device : %s\n",
93+
sbi_printf("Platform IPI Device : %s\n",
9494
(idev) ? idev->name : "---");
9595
tdev = sbi_timer_get_device();
96-
sbi_printf("Platform Timer Device : %s @ %luHz\n",
96+
sbi_printf("Platform Timer Device : %s @ %luHz\n",
9797
(tdev) ? tdev->name : "---",
9898
(tdev) ? tdev->timer_freq : 0);
9999
cdev = sbi_console_get_device();
100-
sbi_printf("Platform Console Device : %s\n",
100+
sbi_printf("Platform Console Device : %s\n",
101101
(cdev) ? cdev->name : "---");
102102
hdev = sbi_hsm_get_device();
103-
sbi_printf("Platform HSM Device : %s\n",
103+
sbi_printf("Platform HSM Device : %s\n",
104104
(hdev) ? hdev->name : "---");
105105
pdev = sbi_pmu_get_device();
106-
sbi_printf("Platform PMU Device : %s\n",
106+
sbi_printf("Platform PMU Device : %s\n",
107107
(pdev) ? pdev->name : "---");
108108
srdev = sbi_system_reset_get_device(SBI_SRST_RESET_TYPE_COLD_REBOOT, 0);
109-
sbi_printf("Platform Reboot Device : %s\n",
109+
sbi_printf("Platform Reboot Device : %s\n",
110110
(srdev) ? srdev->name : "---");
111111
srdev = sbi_system_reset_get_device(SBI_SRST_RESET_TYPE_SHUTDOWN, 0);
112-
sbi_printf("Platform Shutdown Device : %s\n",
112+
sbi_printf("Platform Shutdown Device : %s\n",
113113
(srdev) ? srdev->name : "---");
114114
susp_dev = sbi_system_suspend_get_device();
115-
sbi_printf("Platform Suspend Device : %s\n",
115+
sbi_printf("Platform Suspend Device : %s\n",
116116
(susp_dev) ? susp_dev->name : "---");
117117
cppc_dev = sbi_cppc_get_device();
118-
sbi_printf("Platform CPPC Device : %s\n",
118+
sbi_printf("Platform CPPC Device : %s\n",
119119
(cppc_dev) ? cppc_dev->name : "---");
120120

121121
/* Firmware details */
122-
sbi_printf("Firmware Base : 0x%lx\n", scratch->fw_start);
123-
sbi_printf("Firmware Size : %d KB\n",
122+
sbi_printf("Firmware Base : 0x%lx\n", scratch->fw_start);
123+
sbi_printf("Firmware Size : %d KB\n",
124124
(u32)(scratch->fw_size / 1024));
125-
sbi_printf("Firmware RW Offset : 0x%lx\n", scratch->fw_rw_offset);
126-
sbi_printf("Firmware RW Size : %d KB\n",
125+
sbi_printf("Firmware RW Offset : 0x%lx\n", scratch->fw_rw_offset);
126+
sbi_printf("Firmware RW Size : %d KB\n",
127127
(u32)((scratch->fw_size - scratch->fw_rw_offset) / 1024));
128-
sbi_printf("Firmware Heap Offset : 0x%lx\n", scratch->fw_heap_offset);
129-
sbi_printf("Firmware Heap Size : "
128+
sbi_printf("Firmware Heap Offset : 0x%lx\n", scratch->fw_heap_offset);
129+
sbi_printf("Firmware Heap Size : "
130130
"%d KB (total), %d KB (reserved), %d KB (used), %d KB (free)\n",
131131
(u32)(scratch->fw_heap_size / 1024),
132132
(u32)(sbi_heap_reserved_space() / 1024),
133133
(u32)(sbi_heap_used_space() / 1024),
134134
(u32)(sbi_heap_free_space() / 1024));
135-
sbi_printf("Firmware Scratch Size : "
135+
sbi_printf("Firmware Scratch Size : "
136136
"%d B (total), %d B (used), %d B (free)\n",
137137
SBI_SCRATCH_SIZE,
138138
(u32)sbi_scratch_used_space(),
@@ -154,7 +154,7 @@ static void sbi_boot_print_domains(struct sbi_scratch *scratch)
154154
return;
155155

156156
/* Domain details */
157-
sbi_domain_dump_all(" ");
157+
sbi_domain_dump_all(" ");
158158
}
159159

160160
static void sbi_boot_print_hart(struct sbi_scratch *scratch, u32 hartid)
@@ -174,26 +174,26 @@ static void sbi_boot_print_hart(struct sbi_scratch *scratch, u32 hartid)
174174
}
175175

176176
/* Boot HART details */
177-
sbi_printf("Boot HART ID : %u\n", hartid);
178-
sbi_printf("Boot HART Domain : %s\n", dom->name);
177+
sbi_printf("Boot HART ID : %u\n", hartid);
178+
sbi_printf("Boot HART Domain : %s\n", dom->name);
179179
sbi_hart_get_priv_version_str(scratch, str, sizeof(str));
180-
sbi_printf("Boot HART Priv Version : %s\n", str);
180+
sbi_printf("Boot HART Priv Version : %s\n", str);
181181
misa_string(xlen, str, sizeof(str));
182-
sbi_printf("Boot HART Base ISA : %s\n", str);
182+
sbi_printf("Boot HART Base ISA : %s\n", str);
183183
sbi_hart_get_extensions_str(scratch, str, sizeof(str));
184-
sbi_printf("Boot HART ISA Extensions : %s\n", str);
185-
sbi_printf("Boot HART PMP Count : %d\n",
184+
sbi_printf("Boot HART ISA Extensions : %s\n", str);
185+
sbi_printf("Boot HART PMP Count : %d\n",
186186
sbi_hart_pmp_count(scratch));
187-
sbi_printf("Boot HART PMP Granularity : %u bits\n",
187+
sbi_printf("Boot HART PMP Granularity : %u bits\n",
188188
sbi_hart_pmp_log2gran(scratch));
189-
sbi_printf("Boot HART PMP Address Bits: %d\n",
189+
sbi_printf("Boot HART PMP Address Bits : %d\n",
190190
sbi_hart_pmp_addrbits(scratch));
191-
sbi_printf("Boot HART MHPM Info : %lu (0x%08x)\n",
191+
sbi_printf("Boot HART MHPM Info : %lu (0x%08x)\n",
192192
sbi_popcount(sbi_hart_mhpm_mask(scratch)),
193193
sbi_hart_mhpm_mask(scratch));
194-
sbi_printf("Boot HART Debug Triggers : %d triggers\n",
194+
sbi_printf("Boot HART Debug Triggers : %d triggers\n",
195195
sbi_dbtr_get_total_triggers());
196-
sbi_hart_delegation_dump(scratch, "Boot HART ", " ");
196+
sbi_hart_delegation_dump(scratch, "Boot HART ", " ");
197197
}
198198

199199
static unsigned long coldboot_done;

0 commit comments

Comments
 (0)