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

Merge "FVP: Fix plat_set_nv_ctr() function" into integration

This commit is contained in:
Paul Beesley 2019-09-25 15:03:48 +00:00 committed by TrustedFirmware Code Review
parent dfbf05e044 bd363d356f
commit 80a624d1a3
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plat/arm/board/fvp/fvp_trusted_boot.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -8,39 +8,41 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <lib/mmio.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <platform_def.h> #include <platform_def.h>
#include <tools_share/tbbr_oid.h> #include <tools_share/tbbr_oid.h>
/* /*
* Store a new non-volatile counter value. On some FVP versions, the * Store a new non-volatile counter value.
* non-volatile counters are RO. On these versions we expect the values in the *
* certificates to always match the RO values so that this function is never * On some FVP versions, the non-volatile counters are read-only so this
* called. * function will always fail.
* *
* Return: 0 = success, Otherwise = error * Return: 0 = success, Otherwise = error
*/ */
int plat_set_nv_ctr(void *cookie, unsigned int nv_ctr) int plat_set_nv_ctr(void *cookie, unsigned int nv_ctr)
{ {
const char *oid; const char *oid;
uint32_t *nv_ctr_addr; uintptr_t nv_ctr_addr;
assert(cookie != NULL); assert(cookie != NULL);
oid = (const char *)cookie; oid = (const char *)cookie;
if (strcmp(oid, TRUSTED_FW_NVCOUNTER_OID) == 0) { if (strcmp(oid, TRUSTED_FW_NVCOUNTER_OID) == 0) {
nv_ctr_addr = (uint32_t *)TFW_NVCTR_BASE; nv_ctr_addr = TFW_NVCTR_BASE;
} else if (strcmp(oid, NON_TRUSTED_FW_NVCOUNTER_OID) == 0) { } else if (strcmp(oid, NON_TRUSTED_FW_NVCOUNTER_OID) == 0) {
nv_ctr_addr = (uint32_t *)NTFW_CTR_BASE; nv_ctr_addr = NTFW_CTR_BASE;
} else { } else {
return 1; return 1;
} }
*(unsigned int *)nv_ctr_addr = nv_ctr; mmio_write_32(nv_ctr_addr, nv_ctr);
/* Verify that the current value is the one we just wrote. */ /*
if (nv_ctr != (unsigned int)(*nv_ctr_addr)) * If the FVP models a locked counter then its value cannot be updated
return 1; * and the above write operation has been silently ignored.
*/
return 0; return (mmio_read_32(nv_ctr_addr) == nv_ctr) ? 0 : 1;
} }