diff options
author | Andre Przywara <andre.przywara@arm.com> | 2022-11-15 11:45:19 +0000 |
---|---|---|
committer | Andre Przywara <andre.przywara@arm.com> | 2023-01-11 16:02:58 +0000 |
commit | c5a3ebbd3a55eee2b29e1b887fd111b3b40487c4 (patch) | |
tree | 13870dc94b8a27356179ac4eb24b06bdd20692c4 /bl31 | |
parent | d242128c1dc87f2c0e25e2c4e84c5668a6c397a3 (diff) | |
download | arm-trusted-firmware-c5a3ebbd3a55eee2b29e1b887fd111b3b40487c4.tar.gz |
refactor(context-mgmt): move FEAT_HCX save/restore into C
At the moment we save and restore the HCRX_EL2 register in assembly, and
just depend on the build time flags.
To allow runtime checking, and to avoid too much code in assembly, move
that over to C, and use the new combined build/runtime feature check.
This also allows to drop the assert, since this should now be covered by
the different FEAT_STATE_x options.
Change-Id: I3e20b9ba17121d423cd08edc20bbf4e7ae7c0178
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Diffstat (limited to 'bl31')
-rw-r--r-- | bl31/bl31_main.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index a4640b1b9..e70eb5584 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -93,15 +93,6 @@ void bl31_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, /* Perform late platform-specific setup */ bl31_plat_arch_setup(); -#if ENABLE_FEAT_HCX - /* - * Assert that FEAT_HCX is supported on this system, without this check - * an exception would occur during context save/restore if enabled but - * not supported. - */ - assert(is_feat_hcx_supported()); -#endif /* ENABLE_FEAT_HCX */ - #if CTX_INCLUDE_PAUTH_REGS /* * Assert that the ARMv8.3-PAuth registers are present or an access |