diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-06-23 11:15:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-06-23 11:15:44 +0100 |
| commit | 4d6e1c6495f483e8c48526189c4c6984b44365fc (patch) | |
| tree | 2af12cee9bbb6d3a70fa2a1a2d3981c64dbe8959 /include | |
| parent | 5d28ac0cf7a5cd91f03da658edd6e934c5a431bd (diff) | |
| download | qemu-4d6e1c6495f483e8c48526189c4c6984b44365fc.zip qemu-4d6e1c6495f483e8c48526189c4c6984b44365fc.tar.gz qemu-4d6e1c6495f483e8c48526189c4c6984b44365fc.tar.bz2 | |
include/exec/memattrs: Add two bits of space to MemTxAttrs
We will need 2 bits to represent ARMSecurityState.
Do not attempt to replace or widen secure, even though it
logically overlaps the new field -- there are uses within
e.g. hw/block/pflash_cfi01.c, which don't know anything
specific about ARM.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230620124418.805717-7-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/memattrs.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/exec/memattrs.h b/include/exec/memattrs.h index 9fb98bc..d04170a 100644 --- a/include/exec/memattrs.h +++ b/include/exec/memattrs.h @@ -29,10 +29,17 @@ typedef struct MemTxAttrs { * "didn't specify" if necessary. */ unsigned int unspecified:1; - /* ARM/AMBA: TrustZone Secure access + /* + * ARM/AMBA: TrustZone Secure access * x86: System Management Mode access */ unsigned int secure:1; + /* + * ARM: ArmSecuritySpace. This partially overlaps secure, but it is + * easier to have both fields to assist code that does not understand + * ARMv9 RME, or no specific knowledge of ARM at all (e.g. pflash). + */ + unsigned int space:2; /* Memory access is usermode (unprivileged) */ unsigned int user:1; /* |