| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 1 | From e0b9971db819fb9ed9b08a5d3f6f2a4565e92a1a Mon Sep 17 00:00:00 2001 |
| 2 | From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 3 | Date: Fri, 14 Jan 2022 12:23:04 +0000 |
| 4 | Subject: [PATCH 22/32] firmware: arm_ffa: Fix FFA_MEM_SHARE and |
| 5 | FFA_MEM_FRAG_TX |
| 6 | |
| 7 | FFA memory share on success might return FFA_MEM_FRAG_RX. In that case |
| 8 | set handle from w1/w2 from FFA return value. |
| 9 | |
| 10 | FFA_MEM_FRAG_TX call will return FFA_SUCCESS for the last fragment, so |
| 11 | check for this return code. |
| 12 | |
| 13 | Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 14 | Change-Id: I7ef44742d53a9e75d8587d1213be98a1352f16d4 |
| 15 | Upstream-Status: Pending [Not submitted to upstream yet] |
| 16 | --- |
| 17 | drivers/firmware/arm_ffa/driver.c | 12 ++++++++---- |
| 18 | 1 file changed, 8 insertions(+), 4 deletions(-) |
| 19 | |
| 20 | diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c |
| 21 | index 8fa1785afd42..a3b1df6d7f3c 100644 |
| 22 | --- a/drivers/firmware/arm_ffa/driver.c |
| 23 | +++ b/drivers/firmware/arm_ffa/driver.c |
| 24 | @@ -398,11 +398,15 @@ static int ffa_mem_first_frag(u32 func_id, phys_addr_t buf, u32 buf_sz, |
| 25 | if (ret.a0 == FFA_ERROR) |
| 26 | return ffa_to_linux_errno((int)ret.a2); |
| 27 | |
| 28 | - if (ret.a0 != FFA_SUCCESS) |
| 29 | + if (ret.a0 != FFA_SUCCESS && ret.a0 != FFA_MEM_FRAG_RX) |
| 30 | return -EOPNOTSUPP; |
| 31 | |
| 32 | - if (handle) |
| 33 | - *handle = PACK_HANDLE(ret.a2, ret.a3); |
| 34 | + if (handle) { |
| 35 | + if (ret.a0 == FFA_MEM_FRAG_RX) |
| 36 | + *handle = PACK_HANDLE(ret.a1, ret.a2); |
| 37 | + else |
| 38 | + *handle = PACK_HANDLE(ret.a2, ret.a3); |
| 39 | + } |
| 40 | |
| 41 | return frag_len; |
| 42 | } |
| 43 | @@ -426,7 +430,7 @@ static int ffa_mem_next_frag(u64 handle, u32 frag_len) |
| 44 | if (ret.a0 == FFA_ERROR) |
| 45 | return ffa_to_linux_errno((int)ret.a2); |
| 46 | |
| 47 | - if (ret.a0 != FFA_MEM_FRAG_RX) |
| 48 | + if (ret.a0 != FFA_SUCCESS && ret.a0 != FFA_MEM_FRAG_RX) |
| 49 | return -EOPNOTSUPP; |
| 50 | |
| 51 | return ret.a3; |
| 52 | -- |
| 53 | 2.30.2 |
| 54 | |