Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-22 06:33:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

GXF_STATUS -> GXF_STATUS_EL1

Browse source 
Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2021-05-22 03:47:05 +09:00
parent a9c189fe27
commit aacbdf0949
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cpu_regs.h
View file

@ -134,8 +134,8 @@
#define SYS_IMP_APL_GXF_CONFIG_EL1 sys_reg(3, 6, 15, 1, 2) #define SYS_IMP_APL_GXF_CONFIG_EL1 sys_reg(3, 6, 15, 1, 2)
#define GXF_CONFIG_EN BIT(0) #define GXF_CONFIG_EN BIT(0)
#define SYS_IMP_APL_GXF_STATUS sys_reg(3, 6, 15, 8, 0) #define SYS_IMP_APL_GXF_STATUS_EL1 sys_reg(3, 6, 15, 8, 0)
#define GXF_STATUS_GUARDED BIT(0) #define GXF_STATUS_GUARDED BIT(0)
#define SYS_IMP_APL_GXF_ABORT_EL1 sys_reg(3, 6, 15, 8, 2) #define SYS_IMP_APL_GXF_ABORT_EL1 sys_reg(3, 6, 15, 8, 2)
#define SYS_IMP_APL_GXF_ENTER_EL1 sys_reg(3, 6, 15, 8, 1) #define SYS_IMP_APL_GXF_ENTER_EL1 sys_reg(3, 6, 15, 8, 1)

2
src/gxf.c
View file

@ -23,7 +23,7 @@ bool in_gl12(void)
return false; return false;
if (!(mrs(SYS_IMP_APL_GXF_CONFIG_EL1) & GXF_CONFIG_EN)) if (!(mrs(SYS_IMP_APL_GXF_CONFIG_EL1) & GXF_CONFIG_EN))
return false; return false;
if (!(mrs(SYS_IMP_APL_GXF_STATUS) & GXF_STATUS_GUARDED)) if (!(mrs(SYS_IMP_APL_GXF_STATUS_EL1) & GXF_STATUS_GUARDED))
return false; return false;
return true; return true;
} }

2
tools/apple_regs.json
View file

@ -133,7 +133,7 @@
{"index": 0, "name": "APDAKeyHi_EL12", "fullname": "Pointer Authentication Key A for Data High (EL12)", "enc": [3, 6, 15, 7, 5 ], "width": 64}, {"index": 0, "name": "APDAKeyHi_EL12", "fullname": "Pointer Authentication Key A for Data High (EL12)", "enc": [3, 6, 15, 7, 5 ], "width": 64},
{"index": 0, "name": "APDBKeyLo_EL12", "fullname": "Pointer Authentication Key A for Data Low (EL12)", "enc": [3, 6, 15, 7, 6 ], "width": 64}, {"index": 0, "name": "APDBKeyLo_EL12", "fullname": "Pointer Authentication Key A for Data Low (EL12)", "enc": [3, 6, 15, 7, 6 ], "width": 64},
{"index": 0, "name": "APDBKeyHi_EL12", "fullname": "Pointer Authentication Key A for Data High (EL12)", "enc": [3, 6, 15, 7, 7 ], "width": 64}, {"index": 0, "name": "APDBKeyHi_EL12", "fullname": "Pointer Authentication Key A for Data High (EL12)", "enc": [3, 6, 15, 7, 7 ], "width": 64},
{"index": 0, "name": "GXF_STATUS", "fullname": "GXF Status Register", "enc": [3, 6, 15, 8, 0 ], "width": 64, {"index": 0, "name": "GXF_STATUS_EL1", "fullname": "GXF Status Register", "enc": [3, 6, 15, 8, 0 ], "width": 64,
"fieldsets": [{"fields": [ "fieldsets": [{"fields": [
{"name": "GUARDED", "msb": 0, "lsb": 0} {"name": "GUARDED", "msb": 0, "lsb": 0}
]}]}, ]}]},