Skip to content

GitLab

Commit 0d4120d8 authored by Ruari Phipps's avatar Ruari Phipps
Browse files

SPM: Get rid of uint32_t array representation of UUID 



UUID's in the device tree files were stored in little endian. So
to keep all entries in these files RFC 4122 compliant, store them in
big endian then convert it to little endian when they are read so they
can be used in the UUID data structure.
Signed-off-by: default avatarRuari Phipps <ruari.phipps@arm.com>
Change-Id: I5674159b82b245104381df10a4e3291160d9b3b5
parent 8d0a3bb3
Hide whitespace changes
Inline Side-by-side
plat/arm/board/fvp/fdts/fvp_tb_fw_config.dts
View file @ 0d4120d8
...@@ -40,35 +40,34 @@ ...@@ -40,35 +40,34 @@
}; };
/* /*
* Though TF-A is UUID RFC 4122 compliant meaning fields are stored in * UUID's here are UUID RFC 4122 compliant meaning fieds are stored in
* network order (big endian), UUID's mentioned in this file are are * network order (big endian)
* stored in machine order (little endian).
* This will be fixed in future.
*/ */
#if ARM_IO_IN_DTB #if ARM_IO_IN_DTB
arm-io_policies { arm-io_policies {
fip-handles { fip-handles {
compatible = "arm,io-fip-handle"; compatible = "arm,io-fip-handle";
scp_bl2_uuid = <0x3dfd6697 0x49e8be89 0xa1785dae 0x13826040>; scp_bl2_uuid = <0x9766fd3d 0x89bee849 0xae5d78a1 0x40608213>;
bl31_uuid = <0x6d08d447 0x4698fe4c 0x5029959b 0x005abdcb>; bl31_uuid = <0x47d4086d 0x4cfe9846 0x9b952950 0xcbbd5a00>;
bl32_uuid = <0x89e1d005 0x4713dc53 0xa502b8d 0x383e7a4b>; bl32_uuid = <0x05d0e189 0x53dc1347 0x8d2b500a 0x4b7a3e38>;
bl32_extra1_uuid = <0x9bc2700b 0x40785a2a 0x560a659f 0x88827382>; bl32_extra1_uuid = <0x0b70c28b 0x2a5a7840 0x9f650a56 0x82738288>;
bl32_extra2_uuid = <0xb17ba88e 0x4d3fa2cf 0xbbe7fd85 0xd92002a5>; bl32_extra2_uuid = <0x8ea87bb1 0xcfa23f4d 0x85fde7bb 0xa50220d9>;
bl33_uuid = <0xa7eed0d6 0x4bd5eafc 0x34998297 0xe4b634f2>; bl33_uuid = <0xd6d0eea7 0xfcead54b 0x97829934 0xf234b6e4>;
hw_cfg_uuid = <0xd9f1b808 0x4993cfc9 0xbc6f62a9 0xcc65726b>; hw_cfg_uuid = <0x08b8f1d9 0xc9cf9349 0xa9626fbc 0x6b7265cc>;
soc_fw_cfg_uuid = <0x4b817999 0x46fb7603 0x268d8e8c 0xe059787f>; soc_fw_cfg_uuid = <0x9979814b 0x0376fb46 0x8c8e8d26 0x7f7859e0>;
tos_fw_cfg_uuid = <0x1a7c2526 0x477fc6db 0xc4c4968d 0x218024b0>; tos_fw_cfg_uuid = <0x26257c1a 0xdbc67f47 0x8d96c4c4 0xb0248021>;
nt_fw_cfg_uuid = <0x1598da28 0x447ee893 0xaf1a66ac 0xf9501580>; nt_fw_cfg_uuid = <0x28da9815 0x93e87e44 0xac661aaf 0x801550f9>;
t_key_cert_uuid = <0x90e87e82 0x11e460f8 0x7a77b4a1 0x4cf9b421>; t_key_cert_uuid = <0x827ee890 0xf860e411 0xa1b477a7 0x21b4f94c>;
scp_fw_key_uuid = <0xa1214202 0x11e460f8 0x3cf39b8d 0x14a0150e>; scp_fw_key_uuid = <0x024221a1 0xf860e411 0x8d9bf33c 0x0e15a014>;
soc_fw_key_uuid = <0xccbeb88a 0x11e460f9 0x48ebd09a 0xf8dcd822>; soc_fw_key_uuid = <0x8ab8becc 0xf960e411 0x9ad0eb48 0x22d8dcf8>;
tos_fw_key_cert_uuid = <0x3d67794 0x11e460fb 0x10b7dd85 0x4ee8c5b>; tos_fw_key_cert_uuid = <0x9477d603 0xfb60e411 0x85ddb710 0x5b8cee04>;
nt_fw_key_cert_uuid = <0x2a83d58a 0x11e460fb 0x30dfaf8a 0x5998c4bb>; nt_fw_key_cert_uuid = <0x8ad5832a 0xfb60e411 0x8aafdf30 0xbbc49859>;
scp_fw_content_cert_uuid = <0x046fbe44 0x11e4635e 0xd8738bb2 0x5696aeea>; scp_fw_content_cert_uuid = <0x44be6f04 0x5e63e411 0xb28b73d8 0xeaae9656>;
soc_fw_content_cert_uuid = <0x200cb2e2 0x11e4635e 0xccabe89c 0x66b62bf9>; soc_fw_content_cert_uuid = <0xe2b20c20 0x5e63e411 0x9ce8abcc 0xf92bb666>;
tos_fw_content_cert_uuid = <0x11449fa4 0x11e4635e 0x53f2887 0x3df32a72>; tos_fw_content_cert_uuid = <0xa49f4411 0x5e63e411 0x87283f05 0x722af33d>;
nt_fw_content_cert_uuid = <0xf3c1c48e 0x11e4635d 0xee87a9a7 0xa73fb240>; nt_fw_content_cert_uuid = <0x8ec4c1f3 0x5d63e411 0xa7a987ee 0x40b23fa7>;
sp_content_cert_uuid = <0x44fd6d77 0x3b4c9786 0x3ec1eb91 0x6f2a5a02>; sp_content_cert_uuid = <0x776dfd44 0x86974c3b 0x91ebc13e 0x025a2a6f>;
}; };
}; };
#endif /* ARM_IO_IN_DTB */ #endif /* ARM_IO_IN_DTB */
...@@ -77,24 +76,24 @@ ...@@ -77,24 +76,24 @@
compatible = "arm,sp"; compatible = "arm,sp";
#ifdef OPTEE_SP_FW_CONFIG #ifdef OPTEE_SP_FW_CONFIG
op-tee { op-tee {
uuid = <0xe0786148 0xe311f8e7 0x02005ebc 0x1bc5d5a5>; uuid = <0x486178e0 0xe7f811e3 0xbc5e0002 0xa5d5c51b>;
load-address = <0x6280000>; load-address = <0x6280000>;
}; };
#else #else
cactus-primary { cactus-primary {
uuid = <0x1e67b5b4 0xe14f904a 0x13fb1fb8 0xcbdae1da>; uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
load-address = <0x7000000>; load-address = <0x7000000>;
owner = "SiP"; owner = "SiP";
}; };
cactus-secondary { cactus-secondary {
uuid = <0x092358d1 0xb94723f0 0x64447c82 0xc88f57f5>; uuid = <0xd1582309 0xf02347b9 0x827c4464 0xf5578fc8>;
load-address = <0x7100000>; load-address = <0x7100000>;
owner = "Plat"; owner = "Plat";
}; };
cactus-tertiary { cactus-tertiary {
uuid = <0x735cb579 0xb9448c1d 0xe1619385 0xd2d80a77>; uuid = <0x79b55c73 0x1d8c44b9 0x859361e1 0x770ad8d2>;
load-address = <0x7200000>; load-address = <0x7200000>;
}; };
#endif #endif
......
plat/arm/common/fconf/arm_fconf_io.c
View file @ 0d4120d8
...@@ -249,6 +249,7 @@ int fconf_populate_arm_io_policies(uintptr_t config) ...@@ -249,6 +249,7 @@ int fconf_populate_arm_io_policies(uintptr_t config)
{ {
int err, node; int err, node;
unsigned int i; unsigned int i;
unsigned int j;
union uuid_helper_t uuid_helper; union uuid_helper_t uuid_helper;
io_uuid_spec_t *uuid_ptr; io_uuid_spec_t *uuid_ptr;
...@@ -274,6 +275,15 @@ int fconf_populate_arm_io_policies(uintptr_t config) ...@@ -274,6 +275,15 @@ int fconf_populate_arm_io_policies(uintptr_t config)
return err; return err;
} }
/* Convert uuid from big endian to little endian */
for (j = 0U; j < 4U; j++) {
uuid_helper.word[j] =
((uuid_helper.word[j] >> 24U) & 0xff) |
((uuid_helper.word[j] << 8U) & 0xff0000) |
((uuid_helper.word[j] >> 8U) & 0xff00) |
((uuid_helper.word[j] << 24U) & 0xff000000);
}
VERBOSE("FCONF: arm-io_policies.%s cell found with value = 0x%x 0x%x 0x%x 0x%x\n", VERBOSE("FCONF: arm-io_policies.%s cell found with value = 0x%x 0x%x 0x%x 0x%x\n",
load_info[i].name, load_info[i].name,
uuid_helper.word[0], uuid_helper.word[1], uuid_helper.word[0], uuid_helper.word[1],
......
plat/arm/common/fconf/arm_fconf_sp.c
View file @ 0d4120d8
...@@ -37,6 +37,7 @@ int fconf_populate_arm_sp(uintptr_t config) ...@@ -37,6 +37,7 @@ int fconf_populate_arm_sp(uintptr_t config)
const unsigned int plat_start = SP_PKG5_ID; const unsigned int plat_start = SP_PKG5_ID;
unsigned int plat_index = plat_start; unsigned int plat_index = plat_start;
const unsigned int plat_end = plat_start + MAX_SP_IDS / 2; const unsigned int plat_end = plat_start + MAX_SP_IDS / 2;
unsigned int j;
/* As libfdt use void *, we can't avoid this cast */ /* As libfdt use void *, we can't avoid this cast */
const void *dtb = (void *)config; const void *dtb = (void *)config;
...@@ -64,6 +65,16 @@ int fconf_populate_arm_sp(uintptr_t config) ...@@ -64,6 +65,16 @@ int fconf_populate_arm_sp(uintptr_t config)
ERROR("FCONF: cannot read SP uuid\n"); ERROR("FCONF: cannot read SP uuid\n");
return -1; return -1;
} }
/* Convert uuid from big endian to little endian */
for (j = 0U; j < 4U; j++) {
uuid_helper.word[j] =
((uuid_helper.word[j] >> 24U) & 0xff) |
((uuid_helper.word[j] << 8U) & 0xff0000) |
((uuid_helper.word[j] >> 8U) & 0xff00) |
((uuid_helper.word[j] << 24U) & 0xff000000);
}
arm_sp.uuids[index] = uuid_helper; arm_sp.uuids[index] = uuid_helper;
VERBOSE("FCONF: %s UUID %x-%x-%x-%x load_addr=%lx\n", VERBOSE("FCONF: %s UUID %x-%x-%x-%x load_addr=%lx\n",
__func__, __func__,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment