| Message ID | 20240117104212.1055737-8-wxjstz@126.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Improvements to fw_base.S | expand |
On Wed, Jan 17, 2024 at 4:12 PM Xiang W <wxjstz@126.com> wrote: > > _bad_dynamic_info is same as _start_hang, so remove it. > > Signed-off-by: Xiang W <wxjstz@126.com> Looks good to me. Reviewed-by: Anup Patel <anup@brainfault.org> Regards, Anup > --- > firmware/fw_dynamic.S | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/firmware/fw_dynamic.S b/firmware/fw_dynamic.S > index 7ff1c6a..5ee2883 100644 > --- a/firmware/fw_dynamic.S > +++ b/firmware/fw_dynamic.S > @@ -11,12 +11,6 @@ > > #include "fw_base.S" > > - .section .entry, "ax", %progbits > - .align 3 > -_bad_dynamic_info: > - wfi > - j _bad_dynamic_info > - > .section .entry, "ax", %progbits > .align 3 > .global fw_boot_hart > @@ -30,10 +24,10 @@ fw_boot_hart: > /* Sanity checks */ > li a1, FW_DYNAMIC_INFO_MAGIC_VALUE > REG_L a0, FW_DYNAMIC_INFO_MAGIC_OFFSET(a2) > - bne a0, a1, _bad_dynamic_info > + bne a0, a1, _start_hang > li a1, FW_DYNAMIC_INFO_VERSION_MAX > REG_L a0, FW_DYNAMIC_INFO_VERSION_OFFSET(a2) > - bgt a0, a1, _bad_dynamic_info > + bgt a0, a1, _start_hang > > /* Read boot HART id */ > li a1, FW_DYNAMIC_INFO_VERSION_2 > -- > 2.43.0 > > > -- > opensbi mailing list > opensbi@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/opensbi
diff --git a/firmware/fw_dynamic.S b/firmware/fw_dynamic.S index 7ff1c6a..5ee2883 100644 --- a/firmware/fw_dynamic.S +++ b/firmware/fw_dynamic.S @@ -11,12 +11,6 @@ #include "fw_base.S" - .section .entry, "ax", %progbits - .align 3 -_bad_dynamic_info: - wfi - j _bad_dynamic_info - .section .entry, "ax", %progbits .align 3 .global fw_boot_hart @@ -30,10 +24,10 @@ fw_boot_hart: /* Sanity checks */ li a1, FW_DYNAMIC_INFO_MAGIC_VALUE REG_L a0, FW_DYNAMIC_INFO_MAGIC_OFFSET(a2) - bne a0, a1, _bad_dynamic_info + bne a0, a1, _start_hang li a1, FW_DYNAMIC_INFO_VERSION_MAX REG_L a0, FW_DYNAMIC_INFO_VERSION_OFFSET(a2) - bgt a0, a1, _bad_dynamic_info + bgt a0, a1, _start_hang /* Read boot HART id */ li a1, FW_DYNAMIC_INFO_VERSION_2
_bad_dynamic_info is same as _start_hang, so remove it. Signed-off-by: Xiang W <wxjstz@126.com> --- firmware/fw_dynamic.S | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)