From: Jan Kiszka <[email protected]>

This adds full support for SMCCC_ARCH_WORKAROUND_2 and ensures that
there is no deviation between features reported before and after
enabling Jailhouse.

Signed-off-by: Jan Kiszka <[email protected]>
---
 hypervisor/arch/arm-common/smccc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hypervisor/arch/arm-common/smccc.c 
b/hypervisor/arch/arm-common/smccc.c
index 363cda1a..0925d4bc 100644
--- a/hypervisor/arch/arm-common/smccc.c
+++ b/hypervisor/arch/arm-common/smccc.c
@@ -57,8 +57,8 @@ static inline long handle_arch_features(u32 id)
                return ARM_SMCCC_SUCCESS;

        case SMCCC_ARCH_WORKAROUND_1:
-               return this_cpu_data()->smccc_has_workaround_1 ?
-                       ARM_SMCCC_SUCCESS : ARM_SMCCC_NOT_SUPPORTED;
+       case SMCCC_ARCH_WORKAROUND_2:
+               return smc_arg1(SMCCC_ARCH_FEATURES, id);

        default:
                return ARM_SMCCC_NOT_SUPPORTED;
--
2.26.2

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/jailhouse-dev/b93e9798b6475bd75ba7ddbfad2f58905cbe0090.1609752982.git.jan.kiszka%40web.de.

Reply via email to