diff options
| author | Olivier Deprez <olivier.deprez@arm.com> | 2024-01-15 17:12:53 +0000 |
|---|---|---|
| committer | Ryan Roberts <ryan.roberts@arm.com> | 2024-01-15 17:39:12 +0000 |
| commit | c2c1d0d3ffcf0f5a0b39f73c73f6d6f527825035 (patch) | |
| tree | 7285fc02b1d4c6853fe7164fabfe890fc26213c1 /config/arch | |
| parent | cc1c9e58de4cd4e077c41231374b3837ab1cbafa (diff) | |
fix: 4 worlds configuration
FEAT_MTE/FEAT_MTE2 is an optional architecture option,
remove it from default arch configs.
Enable FEAT_MTE in the 4 worlds config as Hafnium requires
it for the build configration consumed by shrinkwrap.
Disable FEAT_SME/FEAT_SME2 from the 4 worlds config as
Hafnium does not support it yet.
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Diffstat (limited to 'config/arch')
| -rw-r--r-- | config/arch/v8.5.yaml | 2 | ||||
| -rw-r--r-- | config/arch/v8.9.yaml | 2 | ||||
| -rw-r--r-- | config/arch/v9.4.yaml | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/config/arch/v8.5.yaml b/config/arch/v8.5.yaml index 11d8855..a179717 100644 --- a/config/arch/v8.5.yaml +++ b/config/arch/v8.5.yaml @@ -27,5 +27,3 @@ run: -C cluster1.has_branch_target_exception: 1 -C cluster0.has_rndr: 1 # Implement random number instructions to read from RNDR and RNDRSS random number registers from ARMv8.5 (FEAT_RNG). 1:feature is implemented if ARMv8.5 is enabled. -C cluster1.has_rndr: 1 - -C cluster0.memory_tagging_support_level: 3 # Specify the memory tagging extension support level: 0, not implemented. 1, instructions and registers only are implemented (FEAT_MTE). 2, implemented (FEAT_MTE2). 3, implemented with asymmetric handling of exceptions - -C cluster1.memory_tagging_support_level: 3 diff --git a/config/arch/v8.9.yaml b/config/arch/v8.9.yaml index 82838e2..d425207 100644 --- a/config/arch/v8.9.yaml +++ b/config/arch/v8.9.yaml @@ -30,5 +30,3 @@ run: -C cluster1.has_permission_overlay_s1: 1 -C cluster0.has_permission_overlay_s2: 1 -C cluster1.has_permission_overlay_s2: 1 - -C cluster0.memory_tagging_support_level: 4 # FEAT_MTE4 is mandatory from Armv8.9 when FEAT_MTE2 is implemented. - -C cluster1.memory_tagging_support_level: 4 diff --git a/config/arch/v9.4.yaml b/config/arch/v9.4.yaml index 1b0baed..c29d4e4 100644 --- a/config/arch/v9.4.yaml +++ b/config/arch/v9.4.yaml @@ -19,5 +19,3 @@ run: -C cluster1.has_arm_v9-4: 1 -C cluster0.has_gcs: 1 -C cluster1.has_gcs: 1 - -C cluster0.memory_tagging_support_level: 4 # FEAT_MTE4 is mandatory from Armv8.9 when FEAT_MTE2 is implemented. Due to the layers, 8.8 ends up on top of 8.9 so we have to override again. - -C cluster1.memory_tagging_support_level: 4 |