Skip to contentSkip to conversation

firmware: Define a macro for version of struct fw_dynamic_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: Define a macro for version of struct fw_dynamic_info

Avoid using a magic number, instead use a macro for the version of struct fw_dynamic_info.

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

---

 firmware/fw_dynamic.S    | 4 ++--
 include/sbi/fw_dynamic.h | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
firmware/fw_dynamic.S +2 -2
index 0705e63..2b7ec3b 100644
@@ -36,7 +36,7 @@ fw_boot_hart:
 	bgt	a0, a1, _bad_dynamic_info
 
 	/* Read boot HART id */
-	li	a1, 0x2
+	li	a1, FW_DYNAMIC_INFO_VERSION_2
 	blt	a0, a1, 2f
 	REG_L	a0, FW_DYNAMIC_INFO_BOOT_HART_OFFSET(a2)
 	ret

@@ -77,7 +77,7 @@ fw_save_info:
 	REG_S	a3, (a4)
 
 	/* Save version == 0x2 fields */
-	li	a4, 0x2
+	li	a4, FW_DYNAMIC_INFO_VERSION_2
 	REG_L	a3, FW_DYNAMIC_INFO_VERSION_OFFSET(a2)
 	blt	a3, a4, 2f
 	lla	a4, _dynamic_boot_hart
include/sbi/fw_dynamic.h +2 -1
index 25c0eb8..a07266e 100644
@@ -31,7 +31,8 @@
 #define FW_DYNAMIC_INFO_MAGIC_VALUE		0x4942534f
 
 /** Maximum supported info version */
-#define FW_DYNAMIC_INFO_VERSION_MAX		0x2
+#define FW_DYNAMIC_INFO_VERSION_2		0x2
+#define FW_DYNAMIC_INFO_VERSION_MAX		FW_DYNAMIC_INFO_VERSION_2
 
 /** Possible next mode values */
 #define FW_DYNAMIC_INFO_NEXT_MODE_U		0x0
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 firmware: Define a macro for version of struct fw_dynamic_info

? 2021-07-07???? 16:22 +0800?Bin Meng???

Quoted 4 lines

Avoid using a magic number, instead use a macro for the version of struct fw_dynamic_info.

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

---

?firmware/fw_dynamic.S??? | 4 ++--
?include/sbi/fw_dynamic.h | 3 ++-
?2 files changed, 4 insertions(+), 3 deletions(-)

firmware/fw_dynamic.S +0 -0
index 0705e63..2b7ec3b 100644
@@ -36,7 +36,7 @@ fw_boot_hart:

????????bgt?????a0, a1, _bad_dynamic_info
?
????????/* Read boot HART id */ -???????li??????a1, 0x2
+???????li??????a1, FW_DYNAMIC_INFO_VERSION_2 ????????blt?????a0, a1, 2f
????????REG_L???a0, FW_DYNAMIC_INFO_BOOT_HART_OFFSET(a2) ????????ret

firmware/fw_dynamic.S +0 -0
@@ -77,7 +77,7 @@ fw_save_info:
 ????????REG_S???a3, (a4)

?
????????/* Save version == 0x2 fields */ -???????li??????a4, 0x2
+???????li??????a4, FW_DYNAMIC_INFO_VERSION_2 ????????REG_L???a3, FW_DYNAMIC_INFO_VERSION_OFFSET(a2) ????????blt?????a3, a4, 2f ????????lla?????a4, _dynamic_boot_hart

include/sbi/fw_dynamic.h +0 -0
index 25c0eb8..a07266e 100644
@@ -31,7 +31,8 @@

?#define FW_DYNAMIC_INFO_MAGIC_VALUE????????????0x4942534f ?
?/** Maximum supported info version */

include/sbi/fw_dynamic.h +2 -1
-#define FW_DYNAMIC_INFO_VERSION_MAX????????????0x2
+#define FW_DYNAMIC_INFO_VERSION_2??????????????0x2
+#define

FW_DYNAMIC_INFO_VERSION_MAX????????????FW_DYNAMIC_INFO_VERSION_2 ?
?/** Possible next mode values */
?#define FW_DYNAMIC_INFO_NEXT_MODE_U????????????0x0

Signature · 1 line
2.25.1
Applied
#2 lore raw

PATCH 1/1 firmware: Define a macro for version of struct fw_dynamic_info

Quoted 7 lines · Xiang W

? 2021-07-07???? 16:22 +0800?Bin Meng???

Quoted 4 lines

Avoid using a magic number, instead use a macro for the version of struct fw_dynamic_info.

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 54 lines
Quoted 41 lines

---

 firmware/fw_dynamic.S    | 4 ++--
 include/sbi/fw_dynamic.h | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
firmware/fw_dynamic.S +2 -2
index 0705e63..2b7ec3b 100644
@@ -36,7 +36,7 @@ fw_boot_hart:
        bgt     a0, a1, _bad_dynamic_info
 
        /* Read boot HART id */
-       li      a1, 0x2
+       li      a1, FW_DYNAMIC_INFO_VERSION_2
        blt     a0, a1, 2f
        REG_L   a0, FW_DYNAMIC_INFO_BOOT_HART_OFFSET(a2)
        ret

@@ -77,7 +77,7 @@ fw_save_info:
        REG_S   a3, (a4)
 
        /* Save version == 0x2 fields */
-       li      a4, 0x2
+       li      a4, FW_DYNAMIC_INFO_VERSION_2
        REG_L   a3, FW_DYNAMIC_INFO_VERSION_OFFSET(a2)
        blt     a3, a4, 2f
        lla     a4, _dynamic_boot_hart
include/sbi/fw_dynamic.h +2 -1
index 25c0eb8..a07266e 100644
@@ -31,7 +31,8 @@
 #define FW_DYNAMIC_INFO_MAGIC_VALUE            0x4942534f
 
 /** Maximum supported info version */
-#define FW_DYNAMIC_INFO_VERSION_MAX            0x2
+#define FW_DYNAMIC_INFO_VERSION_2              0x2
+#define

FW_DYNAMIC_INFO_VERSION_MAX FW_DYNAMIC_INFO_VERSION_2

Quoted 6 lines

/** Possible next mode values */
#define FW_DYNAMIC_INFO_NEXT_MODE_U 0x0
--
2.25.1

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