Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optee arm32 fTPM: select RPMB storage and optimize core memory #83

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

optee arm32 fTPM: select RPMB storage and optimize core memory #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccd5e26
optee ftpm: CFG_TA_FTPM_RPMB_STORAGE selects RPMB storage
etienne-lms Nov 18, 2022
916362f
optee ftpm: add block braces in event log debug instructions
etienne-lms Nov 20, 2022
1b288eb
optee_ta: close persistent object once synced
etienne-lms Nov 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions Samples/ARM32-FirmwareTPM/optee_ta/fTPM/platform/NVMem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
#include <tee_internal_api.h>
#include <tee_internal_api_extensions.h>

#ifdef CFG_TA_FTPM_RPMB_STORAGE
#define CHOOSEN_TEE_STORAGE TEE_STORAGE_PRIVATE_RPMB
#else
#define CHOOSEN_TEE_STORAGE TEE_STORAGE_PRIVATE
#endif

//
// Overall size of NV, not just the TPM's NV storage
//
Expand Down Expand Up @@ -157,7 +163,7 @@ _plat__NvInitFromStorage()
objID = s_StorageObjectID + i;

// Attempt to open TEE persistent storage object.
Result = TEE_OpenPersistentObject(TEE_STORAGE_PRIVATE,
Result = TEE_OpenPersistentObject(CHOOSEN_TEE_STORAGE,
(void *)&objID,
sizeof(objID),
TA_STORAGE_FLAGS,
Expand All @@ -175,7 +181,7 @@ _plat__NvInitFromStorage()
}

// Storage object was not found, create it.
Result = TEE_CreatePersistentObject(TEE_STORAGE_PRIVATE,
Result = TEE_CreatePersistentObject(CHOOSEN_TEE_STORAGE,
(void *)&objID,
sizeof(objID),
TA_STORAGE_FLAGS,
Expand Down Expand Up @@ -226,6 +232,10 @@ _plat__NvInitFromStorage()
i, bytesRead, objID, s_NVStore[i]);
#endif
}

/* Close object now, it will be opened back upon update */
TEE_CloseObject(s_NVStore[i]);
s_NVStore[i] = TEE_HANDLE_NULL;
}

// Storage objects are open and valid, next validate revision
Expand Down Expand Up @@ -296,32 +306,33 @@ _plat__NvWriteBack()
// Form storage object ID for this block.
objID = s_StorageObjectID + i;

// Move data position associated with handle to start of block.
// Open TEE persistent storage object: shall not fail
Result = TEE_OpenPersistentObject(CHOOSEN_TEE_STORAGE,
(void *)&objID, sizeof(objID),
TA_STORAGE_FLAGS,
&s_NVStore[i]);
if (Result != TEE_SUCCESS) {
goto Error;
}

// Move data position associated with handle to start of block.
Result = TEE_SeekObjectData(s_NVStore[i], 0, TEE_DATA_SEEK_SET);
if (Result != TEE_SUCCESS) {
goto Error;
}

// Write out this block.
// Write out this block.
Result = TEE_WriteObjectData(s_NVStore[i],
(void *)&(s_NV[i * NV_BLOCK_SIZE]),
NV_BLOCK_SIZE);
if (Result != TEE_SUCCESS) {
goto Error;
}

// Force storage stack to update its backing store

// Close file to not waste secure resource in the dear TEE
TEE_CloseObject(s_NVStore[i]);

Result = TEE_OpenPersistentObject(TEE_STORAGE_PRIVATE,
(void *)&objID,
sizeof(objID),
TA_STORAGE_FLAGS,
&s_NVStore[i]);
// Success?
if (Result != TEE_SUCCESS) {
goto Error;
}
s_NVStore[i] = TEE_HANDLE_NULL;

// Clear dirty bit.
s_blockMap &= ~(0x1ULL << i);
Expand Down
2 changes: 2 additions & 0 deletions Samples/ARM32-FirmwareTPM/optee_ta/fTPM/platform/fTPM_event_log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ static unsigned int process_event(unsigned int buf_index,
&resplen, &response);

#ifdef fTPMDebug
{
uint16_t ret_tag;
uint32_t resp_size;
uint32_t tpm_rc;
Expand All @@ -345,6 +346,7 @@ static unsigned int process_event(unsigned int buf_index,
MSG("TPM2_PCR_EXTEND_COMMAND returned value:\n");
MSG("\tret_tag = 0x%.4x, size = 0x%.8x, rc = 0x%.8x\n",
SwapBytes16(ret_tag), SwapBytes32(resp_size), SwapBytes32(tpm_rc));
}
#endif

free(response);
Expand Down
3 changes: 3 additions & 0 deletions Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CFG_TA_MEASURED_BOOT ?= n
CFG_TA_DEBUG ?= n
CFG_TEE_TA_LOG_LEVEL ?= 0
CFG_TA_EVENT_LOG_SIZE ?= 1024
CFG_TA_FTPM_RPMB_STORAGE ?= n

cflags-y += -DTHIRTY_TWO_BIT \
-DCFG_TEE_TA_LOG_LEVEL=$(CFG_TEE_TA_LOG_LEVEL) \
Expand All @@ -14,6 +15,8 @@ cflags-y += -DTHIRTY_TWO_BIT \
-fstack-protector \
-Wstack-protector

cflags-$(CFG_TA_FTPM_RPMB_STORAGE) += -DCFG_TA_FTPM_RPMB_STORAGE

ifeq ($(CFG_TA_MEASURED_BOOT),y)
cflags-y += -DEVENT_LOG_SIZE=$(CFG_TA_EVENT_LOG_SIZE)
cflags-y += -DMEASURED_BOOT
Expand Down