Skip to contentSkip to conversation

firmware: Remove the sanity checks in fw_save_info()

PATCH New Bin Meng 3 participants 3 messages Jul 7, 2021 – Jul 11, 2021

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/1 firmware: Remove the sanity checks in fw_save_info()

The sanity checks on the magic and version was already done in fw_boot_hart(), which happens before fw_save_info() is called.

Signed-off-by Bin Meng <[email protected]>

---

 firmware/fw_dynamic.S | 8 --------
 1 file changed, 8 deletions(-)
firmware/fw_dynamic.S +0 -8
index 2b7ec3b..2b60196 100644
@@ -57,14 +57,6 @@ fw_save_info:
 	lla	a4, _dynamic_next_arg1
 	REG_S	a1, (a4)
 
-	/* Sanity checks */
-	li	a4, FW_DYNAMIC_INFO_MAGIC_VALUE
-	REG_L	a3, FW_DYNAMIC_INFO_MAGIC_OFFSET(a2)
-	bne	a3, a4, _bad_dynamic_info
-	li	a4, FW_DYNAMIC_INFO_VERSION_MAX
-	REG_L	a3, FW_DYNAMIC_INFO_VERSION_OFFSET(a2)
-	bgt	a3, a4, _bad_dynamic_info
-
 	/* Save version == 0x1 fields */
 	lla	a4, _dynamic_next_addr
 	REG_L	a3, FW_DYNAMIC_INFO_NEXT_ADDR_OFFSET(a2)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 firmware: Remove the sanity checks in fw_save_info()

? 2021-07-07???? 18:00 +0800?Bin Meng???

Quoted 4 lines

The sanity checks on the magic and version was already done in fw_boot_hart(), which happens before fw_save_info() is called.

Signed-off-by Bin Meng <[email protected]>
Reviewed-by Xiang W <[email protected]>
Quoted 28 lines

---

?firmware/fw_dynamic.S | 8 --------
?1 file changed, 8 deletions(-)

firmware/fw_dynamic.S +0 -0
index 2b7ec3b..2b60196 100644
@@ -57,14 +57,6 @@ fw_save_info:

????????lla?????a4, _dynamic_next_arg1 ????????REG_S???a1, (a4)
?
-???????/* Sanity checks */
-???????li??????a4, FW_DYNAMIC_INFO_MAGIC_VALUE -???????REG_L???a3, FW_DYNAMIC_INFO_MAGIC_OFFSET(a2) -???????bne?????a3, a4, _bad_dynamic_info -???????li??????a4, FW_DYNAMIC_INFO_VERSION_MAX -???????REG_L???a3, FW_DYNAMIC_INFO_VERSION_OFFSET(a2) -???????bgt?????a3, a4, _bad_dynamic_info
-
????????/* Save version == 0x1 fields */ ????????lla?????a4, _dynamic_next_addr ????????REG_L???a3, FW_DYNAMIC_INFO_NEXT_ADDR_OFFSET(a2)

Signature · 1 line
2.25.1
Applied
#2 lore raw

PATCH 1/1 firmware: Remove the sanity checks in fw_save_info()

Quoted 7 lines · Xiang W

? 2021-07-07???? 18:00 +0800?Bin Meng???

Quoted 4 lines

The sanity checks on the magic and version was already done in fw_boot_hart(), which happens before fw_save_info() is called.

Signed-off-by Bin Meng <[email protected]>
Reviewed-by Xiang W <[email protected]>
Reviewed-by Anup Patel <[email protected]>

Applied this patch to the riscv/opensbi repo.

Thanks,
Anup

Quoted 35 lines
Quoted 25 lines

---

 firmware/fw_dynamic.S | 8 --------
 1 file changed, 8 deletions(-)
firmware/fw_dynamic.S +0 -9
index 2b7ec3b..2b60196 100644
@@ -57,14 +57,6 @@ fw_save_info:
        lla     a4, _dynamic_next_arg1
        REG_S   a1, (a4)
 
-       /* Sanity checks */
-       li      a4, FW_DYNAMIC_INFO_MAGIC_VALUE
-       REG_L   a3, FW_DYNAMIC_INFO_MAGIC_OFFSET(a2)
-       bne     a3, a4, _bad_dynamic_info
-       li      a4, FW_DYNAMIC_INFO_VERSION_MAX
-       REG_L   a3, FW_DYNAMIC_INFO_VERSION_OFFSET(a2)
-       bgt     a3, a4, _bad_dynamic_info
-
        /* Save version == 0x1 fields */
        lla     a4, _dynamic_next_addr
        REG_L   a3, FW_DYNAMIC_INFO_NEXT_ADDR_OFFSET(a2)
--
Quoted 3 lines

2.25.1

--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi