Merge changes from topic "ffa_el3_spmc" into integration
* changes: fix(spmc): fix incorrect FF-A version usage fix(spmc): fix FF-A memory transaction validation
This commit is contained in:
commit
f7ad743470
|
@ -304,7 +304,7 @@ overlapping_memory_regions(struct ffa_comp_mrd *region1,
|
|||
|
||||
if ((region1_start >= region2_start &&
|
||||
region1_start < region2_end) ||
|
||||
(region1_end >= region2_start
|
||||
(region1_end > region2_start
|
||||
&& region1_end < region2_end)) {
|
||||
WARN("Overlapping mem regions 0x%lx-0x%lx & 0x%lx-0x%lx\n",
|
||||
region1_start, region1_end,
|
||||
|
@ -815,7 +815,7 @@ static int spmc_shmem_check_state_obj(struct spmc_shmem_obj *obj,
|
|||
if ((obj->desc.handle != inflight_obj->desc.handle) &&
|
||||
(obj->desc_size == obj->desc_filled)) {
|
||||
other_mrd = spmc_shmem_obj_get_comp_mrd(inflight_obj,
|
||||
ffa_version);
|
||||
FFA_VERSION_COMPILED);
|
||||
if (other_mrd == NULL) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue