diff options
| author | Jessica Clarke <[email protected]> | 2023-01-26 21:10:03 +0530 |
|---|---|---|
| committer | Anup Patel <[email protected]> | 2023-01-27 08:39:49 +0530 |
| commit | c8ea836ee33eb778f48f780412e147386dac5301 (patch) | |
| tree | b489571d9473a46de62fff6dc422821313f1a4f5 | |
| parent | c45992cc2b121e05c74b438462b8066de3e7d999 (diff) | |
firmware: Fix fw_rw_offset computation in fw_base.S
It seems BFD just does totally nonsensical things for SHN_ABS symbols
when producing position-independent outputs (both -pie and -shared)
for various historical reasons, and so SHN_ABS symbols are still
subject to relocation as far as BFD is concerned (except AArch64,
which fixes it in limited cases that don’t apply here...).
The above affects the _fw_rw_offset provided through fw_base.ldS
linker script which results in OpenSBI firmware failing to boot
when loaded at an address different from FW_TEXT_START.
Fixes: c10e3fe5f9a1 ("firmware: Add RW section offset in scratch")
Signed-off-by: Jessica Clarke <[email protected]>
Reported-by: Lad Prabhakar <[email protected]>
Tested-by: Lad Prabhakar <[email protected]>
Tested-by: Anup Patel <[email protected]>
Signed-off-by: Anup Patel <[email protected]>
| -rw-r--r-- | firmware/fw_base.S | 2 | ||||
| -rw-r--r-- | firmware/fw_base.ldS | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/fw_base.S b/firmware/fw_base.S index e04b6833..fb6ac926 100644 --- a/firmware/fw_base.S +++ b/firmware/fw_base.S @@ -526,7 +526,7 @@ _link_start: _link_end: RISCV_PTR _fw_reloc_end __fw_rw_offset: - RISCV_PTR _fw_rw_offset + RISCV_PTR _fw_rw_start - _fw_start .section .entry, "ax", %progbits .align 3 diff --git a/firmware/fw_base.ldS b/firmware/fw_base.ldS index 9a1304e9..3d68484b 100644 --- a/firmware/fw_base.ldS +++ b/firmware/fw_base.ldS @@ -64,7 +64,7 @@ . = ALIGN(1 << LOG2CEIL((SIZEOF(.rodata) + SIZEOF(.text) + SIZEOF(.dynsym) + SIZEOF(.rela.dyn)))); - PROVIDE(_fw_rw_offset = (. - _fw_start)); + PROVIDE(_fw_rw_start = .); /* Beginning of the read-write data sections */ |