Merge android14-gs-pixel-5.15-udc-d1 into android14-gs-pixel-5.15-udc-qpr1
SBMerger: 526756187
Change-Id: I108b65032f16ee47f2950da50aca01943a723c79
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
index 0ff1cf2..6cfa5af 100644
--- a/drivers/trusty/trusty.c
+++ b/drivers/trusty/trusty.c
@@ -373,12 +373,17 @@
u32 smc = lend ? SMC_FC_FFA_MEM_LEND :
SMC_FC_FFA_MEM_SHARE;
/* First fragment */
+ trace_trusty_smc(smc, total_len, fragment_len, 0);
smc_ret = trusty_smc8(smc, total_len,
fragment_len, 0, 0, 0, 0, 0);
+ trace_trusty_smc_done(smc_ret.r0);
} else {
+ trace_trusty_smc(SMC_FC_FFA_MEM_FRAG_TX, cookie_low,
+ cookie_high, fragment_len);
smc_ret = trusty_smc8(SMC_FC_FFA_MEM_FRAG_TX,
cookie_low, cookie_high,
fragment_len, 0, 0, 0, 0);
+ trace_trusty_smc_done(smc_ret.r0);
}
if (smc_ret.r0 == SMC_FC_FFA_MEM_FRAG_RX) {
cookie_low = smc_ret.r1;
