diff options
| author | Mike McTernan <mikemcternan@google.com> | 2024-02-16 03:10:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 03:10:16 +0000 |
| commit | ad1d3fdf7226caf7101ed6a8cb78a563fa331324 (patch) | |
| tree | 3141cf22b82ae95f55c8339f91a3b8b16b51635c | |
| parent | 261b0c4e90e4031e89bba97abee9eb49256d14c9 (diff) | |
| parent | 3594fd70c162b2a84c70147351d35719acc695fc (diff) | |
| download | trusty-ad1d3fdf7226caf7101ed6a8cb78a563fa331324.tar.gz | |
trusty:lib_ffa: Allow querying of NS bit. am: 3594fd70c1
Original change: https://android-review.googlesource.com/c/trusty/lk/trusty/+/2677155
Change-Id: Ib2f2f49eb9cb09bc553e5bf6c41b393b23f0c6c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | lib/arm_ffa/arm_ffa.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/arm_ffa/arm_ffa.c b/lib/arm_ffa/arm_ffa.c index af4fdb0..45b4263 100644 --- a/lib/arm_ffa/arm_ffa.c +++ b/lib/arm_ffa/arm_ffa.c @@ -107,6 +107,8 @@ static status_t arm_ffa_call_features(ulong id, ASSERT(!request_ns_bit || id == SMC_FC_FFA_MEM_RETRIEVE_REQ || id == SMC_FC64_FFA_MEM_RETRIEVE_REQ); + /* Allow querying for NS bit - see b/292455218 */ +#if 0 /* * The NS bit input parameter must be zero (MBZ) in FF-A version 1.0. * This still requests use of the NS bit in the FFA_MEM_RETRIEVE_RESP ABI. @@ -116,6 +118,7 @@ static status_t arm_ffa_call_features(ulong id, * (https://developer.arm.com/documentation/den0077/c) */ request_ns_bit = 0; +#endif smc_ret = smc8(SMC_FC_FFA_FEATURES, id, request_ns_bit ? FFA_FEATURES2_MEM_RETRIEVE_REQ_NS_BIT : 0, @@ -303,7 +306,7 @@ static status_t arm_ffa_mem_retrieve_req_is_implemented( ASSERT(is_implemented); - res = arm_ffa_call_features(SMC_FC_FFA_MEM_RETRIEVE_REQ, 0, + res = arm_ffa_call_features(SMC_FC_FFA_MEM_RETRIEVE_REQ, request_ns_bit, &is_implemented_val, &features2, &features3); if (res != NO_ERROR) { TRACEF("Failed to query for feature FFA_MEM_RETRIEVE_REQ, err = %d\n", |