Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-26 14:55:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes If8547b5a,I6826a56d,Idb40907a,Ia51cbe1a,I9b55f6c5, ... into integration

Browse source 
* changes:
  feat(fvp): add SPM manifest for OP-TEE at S-EL1 without S-EL2/Hafnium
  fix(fvp): update the memory size allocated to optee at EL1
  fix(fvp): add DRAM memory regions that linux kernel can share
  feat(fvp): update FF-A version to v1.1 supported by optee
  feat(fvp): replace managed-exit with ns-interrupts-action
  fix(fvp): add optee specific mem-size attribute
  fix(fvp): fix the FF-A optee manifest by adding the boot info node
This commit is contained in:
Madhukar Pappireddy 2024-07-19 16:28:29 +02:00 • committed by TrustedFirmware Code Review
commit 9877b6ef1e
3 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plat/arm/board/fvp/fdts/fvp_spmc_el1_optee_manifest.dts Normal file
View file

@ -0,0 +1,22 @@
/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 2024, Arm Limited. All rights reserved.
*/
/dts-v1/;
/ {
compatible = "arm,ffa-core-manifest-1.0";
#address-cells = <2>;
#size-cells = <1>;
attribute {
spmc_id = <0x8000>;
maj_ver = <0x1>;
min_ver = <0x1>;
exec_state = <0x0>;
load_address = <0x0 0x6000000>;
entrypoint = <0x0 0x6000000>;
binary_size = <0x80000>;
};
};

9
plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts
View file

@ -35,7 +35,7 @@
debug_name = "op-tee"; debug_name = "op-tee";
load_address = <0x6280000>; load_address = <0x6280000>;
vcpu_count = <8>; vcpu_count = <8>;
mem_size = <1048576>; mem_size = <0xd80000>;
}; };
}; };
@ -63,10 +63,11 @@
reg = <0x0 0x6000000 0x0 0x2000000>; /* Trusted DRAM */ reg = <0x0 0x6000000 0x0 0x2000000>; /* Trusted DRAM */
}; };
memory@1 { memory@80000000 {
device_type = "ns-memory"; device_type = "ns-memory";
reg = <0x00008800 0x80000000 0x0 0x7f000000>, reg = <0x0 0x80000000 0x0 0x7c000000>,
<0x0 0x88000000 0x0 0x10000000>; <0x8 0x80000000 0x1 0x80000000>,
<0x00008800 0x80000000 0x0 0x7f000000>;
}; };
memory@0 { memory@0 {

13
plat/arm/board/fvp/fdts/optee_sp_manifest.dts
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2022, Arm Limited. All rights reserved. * Copyright (c) 2020-2024, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* *
@ -15,23 +15,30 @@
/* Properties */ /* Properties */
description = "op-tee"; description = "op-tee";
ffa-version = <0x00010000>; /* 31:16 - Major, 15:0 - Minor */ ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xe0786148 0xe311f8e7 0x02005ebc 0x1bc5d5a5>; uuid = <0xe0786148 0xe311f8e7 0x02005ebc 0x1bc5d5a5>;
id = <1>; id = <1>;
execution-ctx-count = <8>; execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */ exception-level = <2>; /* S-EL1 */
execution-state = <0>; /* AARCH64 */ execution-state = <0>; /* AARCH64 */
load-address = <0x6280000>; load-address = <0x6280000>;
mem-size = <0xd80000>; /* OP-TEE specific extension */
entrypoint-offset = <0x4000>; entrypoint-offset = <0x4000>;
xlat-granule = <0>; /* 4KiB */ xlat-granule = <0>; /* 4KiB */
boot-order = <0>; boot-order = <0>;
messaging-method = <0x3>; /* Direct request/response supported. */ messaging-method = <0x3>; /* Direct request/response supported. */
managed-exit; ns-interrupts-action = <1>; /* NS_ACTION_ME */
run-time-model = <1>; /* SP pre-emptible. */ run-time-model = <1>; /* SP pre-emptible. */
/* Boot protocol */ /* Boot protocol */
gp-register-num = <0x0>; gp-register-num = <0x0>;
/* Boot Info */
boot-info {
compatible = "arm,ffa-manifest-boot-info";
ffa_manifest;
};
device-regions { device-regions {
compatible = "arm,ffa-manifest-device-regions"; compatible = "arm,ffa-manifest-device-regions";