commit a24ce04b80a6c57b9a2eb08f52e7d7a0f6d31fd1
author Tamas Ban <tamas.ban@arm.com> Wed Feb 20 11:50:22 2019 +0000
committer Tamas Ban <tamas.ban@arm.com> Wed Apr 17 09:04:53 2019 +0000
tree 4fbb0746eb639a372cdcd2228f1882e67c3925b9
parent a4574d9332812680e61dee614ceb5bb1f44641b5

Attest: Generalize boot satus handling

Introduce wrapper structure to simplify the handling of
boot status data.

Change-Id: I4fecbf2b346e4e773a898b6013c0b351bcf5beeb
Signed-off-by: Tamas Ban <tamas.ban@arm.com>

bl2/include/tfm_boot_status.h

diff --git a/bl2/include/tfm_boot_status.h b/bl2/include/tfm_boot_status.h
index dbcc6ce..f31743b 100644
--- a/bl2/include/tfm_boot_status.h
+++ b/bl2/include/tfm_boot_status.h
@@ -197,6 +197,16 @@
     uint16_t tlv_len; /* size of single TLV entry (including this header). */
 };
 
+/**
+ * \struct tfm_boot_data
+ *
+ * \brief Store the data for the runtime SW
+ */
+struct tfm_boot_data {
+    struct shared_data_tlv_header header;
+    uint8_t data[];
+};
+
 #define SHARED_DATA_ENTRY_HEADER_SIZE sizeof(struct shared_data_tlv_entry)
 #define SHARED_DATA_ENTRY_SIZE(size) (size + SHARED_DATA_ENTRY_HEADER_SIZE)
 

bl2/src/boot_record.c

diff --git a/bl2/src/boot_record.c b/bl2/src/boot_record.c
index 21c1904..263088d 100644
--- a/bl2/src/boot_record.c
+++ b/bl2/src/boot_record.c
@@ -254,26 +254,26 @@
                              const uint8_t *data)
 {
     struct shared_data_tlv_entry tlv_entry = {0};
-    struct shared_data_tlv_header *tlv_header;
+    struct tfm_boot_data *boot_data;
     uint8_t *next_tlv;
     uintptr_t tlv_end, offset;
 
-    tlv_header = (struct shared_data_tlv_header *)BOOT_TFM_SHARED_DATA_BASE;
+    boot_data = (struct tfm_boot_data *)BOOT_TFM_SHARED_DATA_BASE;
 
     /* Check whether first time to call this function. If does then initialise
      * shared data area.
      */
     if (shared_memory_init_done == SHARED_MEMORY_UNINITIALZED) {
         memset((void *)BOOT_TFM_SHARED_DATA_BASE, 0, BOOT_TFM_SHARED_DATA_SIZE);
-        tlv_header->tlv_magic   = SHARED_DATA_TLV_INFO_MAGIC;
-        tlv_header->tlv_tot_len = SHARED_DATA_HEADER_SIZE;
+        boot_data->header.tlv_magic   = SHARED_DATA_TLV_INFO_MAGIC;
+        boot_data->header.tlv_tot_len = SHARED_DATA_HEADER_SIZE;
         shared_memory_init_done = SHARED_MEMORY_INITIALZED;
     }
 
     /* Check whether TLV entry is already added.
      * Get the boundaries of TLV section
      */
-    tlv_end = BOOT_TFM_SHARED_DATA_BASE + tlv_header->tlv_tot_len;
+    tlv_end = BOOT_TFM_SHARED_DATA_BASE + boot_data->header.tlv_tot_len;
     offset  = BOOT_TFM_SHARED_DATA_BASE + SHARED_DATA_HEADER_SIZE;
 
     /* Iterates over the TLV section looks for the same entry if found then
@@ -293,18 +293,18 @@
     tlv_entry.tlv_len  = SHARED_DATA_ENTRY_SIZE(size);
 
     /* Verify overflow of shared area */
-    if ((tlv_header->tlv_tot_len + tlv_entry.tlv_len) >
+    if ((boot_data->header.tlv_tot_len + tlv_entry.tlv_len) >
          BOOT_TFM_SHARED_DATA_SIZE){
         return SHARED_MEMORY_OVERFLOW;
     }
 
-    next_tlv = (uint8_t *)tlv_header + tlv_header->tlv_tot_len;
+    next_tlv = (uint8_t *)boot_data + boot_data->header.tlv_tot_len;
     memcpy(next_tlv, &tlv_entry, SHARED_DATA_ENTRY_HEADER_SIZE);
 
     next_tlv += SHARED_DATA_ENTRY_HEADER_SIZE;
     memcpy(next_tlv, data, size);
 
-    tlv_header->tlv_tot_len = tlv_header->tlv_tot_len + tlv_entry.tlv_len;
+    boot_data->header.tlv_tot_len += tlv_entry.tlv_len;
 
     return SHARED_MEMORY_OK;
 }