[PATCH V3] include: Add check for offset fw_dynamic_info
Xiang W
wxjstz at 126.com
Sun Mar 27 01:22:13 PDT 2022
Add static detection to prevent the modification of struct fw_dynamic_info
from forgetting the modification of FW_DYNAMIC_INFO_xxx_OFFSET
Signed-off-by: Xiang W <wxjstz at 126.com>
---
V3 change:
* reword commit message
include/sbi/fw_dynamic.h | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/include/sbi/fw_dynamic.h b/include/sbi/fw_dynamic.h
index dea207b..978f10b 100644
--- a/include/sbi/fw_dynamic.h
+++ b/include/sbi/fw_dynamic.h
@@ -74,6 +74,38 @@ struct fw_dynamic_info {
*/
unsigned long boot_hart;
} __packed;
+/** Prevent modification of struct fw_dynamic_info from affecting
+ * FW_DYNAMIC_INFO_xxx_OFFSET */
+_Static_assert(
+ offsetof(struct fw_dynamic_info, magic)
+ == FW_DYNAMIC_INFO_MAGIC_OFFSET,
+ "struct fw_dynamic_info definition has changed, please redefine "
+ "FW_DYNAMIC_INFO_MAGIC_OFFSET");
+_Static_assert(
+ offsetof(struct fw_dynamic_info, version)
+ == FW_DYNAMIC_INFO_VERSION_OFFSET,
+ "struct fw_dynamic_info definition has changed, please redefine "
+ "FW_DYNAMIC_INFO_VERSION_OFFSET");
+_Static_assert(
+ offsetof(struct fw_dynamic_info, next_addr)
+ == FW_DYNAMIC_INFO_NEXT_ADDR_OFFSET,
+ "struct fw_dynamic_info definition has changed, please redefine "
+ "FW_DYNAMIC_INFO_NEXT_ADDR_OFFSET");
+_Static_assert(
+ offsetof(struct fw_dynamic_info, next_mode)
+ == FW_DYNAMIC_INFO_NEXT_MODE_OFFSET,
+ "struct fw_dynamic_info definition has changed, please redefine "
+ "FW_DYNAMIC_INFO_NEXT_MODE_OFFSET");
+_Static_assert(
+ offsetof(struct fw_dynamic_info, options)
+ == FW_DYNAMIC_INFO_OPTIONS_OFFSET,
+ "struct fw_dynamic_info definition has changed, please redefine "
+ "FW_DYNAMIC_INFO_OPTIONS_OFFSET");
+_Static_assert(
+ offsetof(struct fw_dynamic_info, boot_hart)
+ == FW_DYNAMIC_INFO_BOOT_HART_OFFSET,
+ "struct fw_dynamic_info definition has changed, please redefine "
+ "FW_DYNAMIC_INFO_BOOT_HART_OFFSET");
#endif
--
2.30.2
More information about the opensbi
mailing list