diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-07-09 18:42:42 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-07-09 18:42:42 -0700 |
| commit | cb68385c18a117628ea22ac56b166d994e49c172 (patch) | |
| tree | 6a2c1a8d7560161c0cedbf1c837f00db1a835d0a | |
| parent | 50c37c29e7adffa1acbbe2c83617ac82972dc51b (diff) | |
| parent | 0f73203f48f49930375c34d8b92ca6828fb03c68 (diff) | |
| download | trusty-cb68385c18a117628ea22ac56b166d994e49c172.tar.gz | |
Merge android14-gs-pixel-5.15-udc-qpr1 into android14-gs-pixel-5.15
SBMerger: 526756187
Change-Id: I71af9e231ccc28d1cb9309c72ec185affce3e5de
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | drivers/trusty/trusty.c | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ int trusty_transfer_memory(struct device *dev, u64 *id, 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; |