andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "build(sptool): handle uuid field in SP layout file" into integration

This commit is contained in:
Joanna Farley 2022-03-23 14:31:31 +01:00 committed by TrustedFirmware Code Review
parent 0a81a42116 5ac60ea15e
commit e638c228b8
2 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/components/secure-partition-manager.rst
View File

@ -343,6 +343,9 @@ signing domain in case of dual root CoT.
The SP owner can either be the silicon or the platform provider. The The SP owner can either be the silicon or the platform provider. The
corresponding "owner" field value can either take the value of "SiP" or "Plat". corresponding "owner" field value can either take the value of "SiP" or "Plat".
In absence of "owner" field, it defaults to "SiP" owner. In absence of "owner" field, it defaults to "SiP" owner.
The UUID of the partition can be specified as a field in the description file or
if it does not exist there the UUID is extracted from the DTS partition
manifest.
.. code:: shell .. code:: shell
@ -350,7 +353,8 @@ In absence of "owner" field, it defaults to "SiP" owner.
"tee1" : { "tee1" : {
"image": "tee1.bin", "image": "tee1.bin",
"pm": "tee1.dts", "pm": "tee1.dts",
"owner": "SiP" "owner": "SiP",
"uuid": "1b1820fe-48f7-4175-8999-d51da00b7c9f"
}, },
"tee2" : { "tee2" : {
@ -1284,4 +1288,4 @@ Client <https://developer.arm.com/documentation/den0006/d/>`__
-------------- --------------
*Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.* *Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*

68
tools/sptool/sp_mk_generator.py
View File

@ -13,8 +13,9 @@ must be relative to it.
This script parses the layout file and generates a make file which updates This script parses the layout file and generates a make file which updates
FDT_SOURCES, FIP_ARGS, CRT_ARGS and SPTOOL_ARGS which are used in later build FDT_SOURCES, FIP_ARGS, CRT_ARGS and SPTOOL_ARGS which are used in later build
steps. steps.
This script also gets SP "uuid" from parsing its PM and converting it to a If the SP entry in the layout file has a "uuid" field the scripts gets the UUID
standard format. from there, otherwise it parses the associated partition manifest and extracts
the UUID from there.
param1: Generated mk file "sp_gen.mk" param1: Generated mk file "sp_gen.mk"
param2: "SP_LAYOUT_FILE", json file containing platform provided information param2: "SP_LAYOUT_FILE", json file containing platform provided information
@ -37,7 +38,8 @@ A typical SP_LAYOUT_FILE file will look like
"SP2" : { "SP2" : {
"image": "sp2.bin", "image": "sp2.bin",
"pm": "test/sp2.dts" "pm": "test/sp2.dts",
"uuid": "1b1820fe-48f7-4175-8999-d51da00b7c9f"
} }
... ...
@ -106,35 +108,41 @@ with open(gen_file, 'w') as out_file:
src = [ json_dir + "/" + data[key]['image'] , dtb ] src = [ json_dir + "/" + data[key]['image'] , dtb ]
out_file.write("SPTOOL_ARGS += -i " + ":".join(src) + " -o " + dst + "\n") out_file.write("SPTOOL_ARGS += -i " + ":".join(src) + " -o " + dst + "\n")
""" if "uuid" in data[key]:
Extract uuid from partition manifest """
""" Extract the UUID from the JSON file if the SP entry has a 'uuid' field
pm_file = open(dts) """
for line in pm_file: uuid_std = uuid.UUID(data[key]['uuid'])
if "uuid" in line: else:
# re.findall returns a list of string tuples. """
# uuid_hex is the first item in this list representing the four Extract uuid from partition manifest
# uuid hex integers from the manifest uuid field. The heading """
# '0x' of the hexadecimal representation is stripped out. pm_file = open(dts)
# e.g. uuid = <0x1e67b5b4 0xe14f904a 0x13fb1fb8 0xcbdae1da>; for line in pm_file:
# uuid_hex = ('1e67b5b4', 'e14f904a', '13fb1fb8', 'cbdae1da') if "uuid" in line:
uuid_hex = re.findall(r'0x([0-9a-f]+) 0x([0-9a-f]+) 0x([0-9a-f]+) 0x([0-9a-f]+)', line)[0]; # re.findall returns a list of string tuples.
# uuid_hex is the first item in this list representing the four
# uuid hex integers from the manifest uuid field. The heading
# '0x' of the hexadecimal representation is stripped out.
# e.g. uuid = <0x1e67b5b4 0xe14f904a 0x13fb1fb8 0xcbdae1da>;
# uuid_hex = ('1e67b5b4', 'e14f904a', '13fb1fb8', 'cbdae1da')
uuid_hex = re.findall(r'0x([0-9a-f]+) 0x([0-9a-f]+) 0x([0-9a-f]+) 0x([0-9a-f]+)', line)[0];
# uuid_hex is a list of four hex string values # uuid_hex is a list of four hex string values
if len(uuid_hex) != 4: if len(uuid_hex) != 4:
print("ERROR: malformed UUID") print("ERROR: malformed UUID")
exit(-1) exit(-1)
# The uuid field in SP manifest is the little endian representation # The uuid field in SP manifest is the little endian representation
# mapped to arguments as described in SMCCC section 5.3. # mapped to arguments as described in SMCCC section 5.3.
# Convert each unsigned integer value to a big endian representation # Convert each unsigned integer value to a big endian representation
# required by fiptool. # required by fiptool.
y=list(map(bytearray.fromhex, uuid_hex)) y=list(map(bytearray.fromhex, uuid_hex))
z=(int.from_bytes(y[0], byteorder='little', signed=False), z=(int.from_bytes(y[0], byteorder='little', signed=False),
int.from_bytes(y[1], byteorder='little', signed=False), int.from_bytes(y[1], byteorder='little', signed=False),
int.from_bytes(y[2], byteorder='little', signed=False), int.from_bytes(y[2], byteorder='little', signed=False),
int.from_bytes(y[3], byteorder='little', signed=False)) int.from_bytes(y[3], byteorder='little', signed=False))
uuid_std = uuid.UUID(f'{z[0]:08x}{z[1]:08x}{z[2]:08x}{z[3]:08x}') uuid_std = uuid.UUID(f'{z[0]:08x}{z[1]:08x}{z[2]:08x}{z[3]:08x}')
""" """
Append FIP_ARGS Append FIP_ARGS