Mirrors/opensbi
3
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2026-06-14 15:11:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: sbi: Drop fw_rw_offset alignment requirement for single fw region

Browse Source 
In a single fw region scheme, there is no separate PMP created for RW
memory. The checks that opensbi does for the alignment between fw_start
and fw_rw_start (using fw_rw_offset) and the power of 2 check for
fw_rw_offset are no longer necessary.

Update sbi_domain_init so that these checks are only done in the non
single fw region scheme.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Co-developed-by: Anirudh Srinivasan <asrinivasan@oss.tenstorrent.com>
Signed-off-by: Anirudh Srinivasan <asrinivasan@oss.tenstorrent.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20260522-fw_rw_start_alignment-v1-1-362c17331541@oss.tenstorrent.com
Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Nicholas Piggin
2026-05-22 17:54:17 -05:00
committed by Anup Patel
parent 3d29f380a6
commit 9c9767504d
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sbi/sbi_domain.c
+5 -2
View File
@@ -874,21 +874,24 @@ int sbi_domain_init(struct sbi_scratch *scratch, u32 cold_hartid)
struct sbi_hartmask *root_hmask; struct sbi_hartmask *root_hmask;
struct sbi_domain_memregion *root_memregs; struct sbi_domain_memregion *root_memregs;
int root_memregs_count = 0; int root_memregs_count = 0;
const struct sbi_platform *plat = sbi_platform_ptr(scratch);
bool fw_single_region = sbi_platform_single_fw_region(plat);
SBI_INIT_LIST_HEAD(&domain_list); SBI_INIT_LIST_HEAD(&domain_list);
if (!fw_single_region) {
if (scratch->fw_rw_offset == 0 || if (scratch->fw_rw_offset == 0 ||
(scratch->fw_rw_offset & (scratch->fw_rw_offset - 1)) != 0) { (scratch->fw_rw_offset & (scratch->fw_rw_offset - 1)) != 0) {
sbi_printf("%s: fw_rw_offset is not a power of 2 (0x%lx)\n", sbi_printf("%s: fw_rw_offset is not a power of 2 (0x%lx)\n",
__func__, scratch->fw_rw_offset); __func__, scratch->fw_rw_offset);
return SBI_EINVAL; return SBI_EINVAL;
} }
if ((scratch->fw_start & (scratch->fw_rw_offset - 1)) != 0) { if ((scratch->fw_start & (scratch->fw_rw_offset - 1)) != 0) {
sbi_printf("%s: fw_start and fw_rw_offset not aligned\n", sbi_printf("%s: fw_start and fw_rw_offset not aligned\n",
__func__); __func__);
return SBI_EINVAL; return SBI_EINVAL;
} }
}
domain_hart_ptr_offset = sbi_scratch_alloc_type_offset(void *); domain_hart_ptr_offset = sbi_scratch_alloc_type_offset(void *);
if (!domain_hart_ptr_offset) if (!domain_hart_ptr_offset)
@@ -916,7 +919,7 @@ int sbi_domain_init(struct sbi_scratch *scratch, u32 cold_hartid)
root.possible_harts = root_hmask; root.possible_harts = root_hmask;
/* Root domain firmware memory region */ /* Root domain firmware memory region */
if (sbi_platform_single_fw_region(sbi_platform_ptr(scratch))) { if (fw_single_region) {
sbi_domain_memregion_init(scratch->fw_start, scratch->fw_size, sbi_domain_memregion_init(scratch->fw_start, scratch->fw_size,
(SBI_DOMAIN_MEMREGION_M_READABLE | (SBI_DOMAIN_MEMREGION_M_READABLE |
SBI_DOMAIN_MEMREGION_M_WRITABLE | SBI_DOMAIN_MEMREGION_M_WRITABLE |