RSE: Add routing tables getter functions

Add functions which abstract the storage location of the RSE routing
tables. These functions can be used in place of tfm_plat_otp_read in
rse_handshake.c.

Change-Id: I5e4290eab1d0b49a58bdf0dfb4d25000d24ecbb2
Signed-off-by: Jackson Cooper-Driver <[email protected]>

Author: jaccoo01

platform/ext/target/arm/rse/common/CMakeLists.txt

@@ -900,6 +900,11 @@ install(FILES       ${CMAKE_CURRENT_BINARY_DIR}/config/otp_layout.csv
 ############################## Routing tables ##################################
 
 if (RSE_AMOUNT GREATER 1)
+    target_sources(platform_bl1_1
+        PRIVATE
+            ./rse_get_routing_tables.c
+    )
+
     add_custom_target(routing_tables_pickle
         ALL
         SOURCES ${CMAKE_CURRENT_BINARY_DIR}/config/routing_tables.pickle

platform/ext/target/arm/rse/common/bl1/bl1_1_shared_symbols.txt

@@ -129,3 +129,5 @@ dm_rotpk_area_info
 tfm_plat_otp_init
 tfm_plat_increment_nv_counter
 rse_count_zero_bits
+rse_get_sender_routing_tables
+rse_get_receiver_routing_tables

platform/ext/target/arm/rse/common/platform_error_codes.h

@@ -166,6 +166,9 @@ enum tfm_plat_err_t {
     /* RSE zero count error codes */
     TFM_PLAT_ERR_ZERO_COUNT_MISMATCH,
     TFM_PLAT_ERR_ZERO_COUNT_INVALID_ARGUMENT,
+    /* Routing tables errors */
+    TFM_PLAT_ERR_SEND_ROUTING_TABLES_INVALID_SIZE,
+    TFM_PLAT_ERR_RECEIVE_ROUTING_TABLES_INVALID_SIZE,
     /* Generic errors */
     TFM_PLAT_ERR_SYSTEM_ERR,
     TFM_PLAT_ERR_MAX_VALUE,

platform/ext/target/arm/rse/common/rse_get_routing_tables.c

@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#include <stdint.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "platform_error_codes.h"
+#include "rse_routing_tables.h"
+#include "rse_get_routing_tables.h"
+#include "tfm_plat_otp.h"
+
+#define SENDER_ROUTING_TABLES_SIZE ((NUM_NODES) * sizeof(uint8_t))
+#define RECEIVE_ROUTING_TABLES_SIZE ((NUM_NODES) * sizeof(uint8_t))
+
+#ifndef RSE_OTP_HAS_ROUTING_TABLES
+extern struct rse_whole_system_routing_tables_t rse_system_routing_tables;
+#endif
+
+enum tfm_plat_err_t rse_get_sender_routing_tables(uint8_t *routing_tables_buf, size_t buf_size,
+                                                  uint32_t rse_id)
+{
+    if (buf_size < SENDER_ROUTING_TABLES_SIZE) {
+        return TFM_PLAT_ERR_SEND_ROUTING_TABLES_INVALID_SIZE;
+    }
+
+#ifdef RSE_OTP_HAS_ROUTING_TABLES
+    enum tfm_plat_err_t plat_err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_TO_RSE_SENDER_ROUTING_TABLE,
+                                                     buf_size, routing_tables_buf);
+    if (plat_err != TFM_PLAT_ERR_SUCCESS) {
+        return plat_err;
+    }
+#else
+    memcpy(routing_tables_buf, rse_system_routing_tables.routing_table[rse_id].send,
+           SENDER_ROUTING_TABLES_SIZE);
+#endif
+
+    return TFM_PLAT_ERR_SUCCESS;
+}
+
+enum tfm_plat_err_t rse_get_receiver_routing_tables(uint8_t *routing_tables_buf, size_t buf_size,
+                                                    uint32_t rse_id)
+{
+    if (buf_size < RECEIVE_ROUTING_TABLES_SIZE) {
+        return TFM_PLAT_ERR_RECEIVE_ROUTING_TABLES_INVALID_SIZE;
+    }
+
+#ifdef RSE_OTP_HAS_ROUTING_TABLES
+    enum tfm_plat_err_t plat_err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_TO_RSE_RECEIVER_ROUTING_TABLE,
+                                                     buf_size, routing_tables_buf);
+    if (plat_err != TFM_PLAT_ERR_SUCCESS) {
+        return plat_err;
+    }
+#else
+    memcpy(routing_tables_buf, rse_system_routing_tables.routing_table[rse_id].receive,
+           RECEIVE_ROUTING_TABLES_SIZE);
+#endif
+
+    return TFM_PLAT_ERR_SUCCESS;
+}

platform/ext/target/arm/rse/common/rse_get_routing_tables.h

@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#ifndef __RSE_GET_ROUTING_TABLES_H__
+#define __RSE_GET_ROUTING_TABLES_H__
+
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Retrieves the sender routing tables associated with a given RSE.
+ *
+ * This function populates the provided buffer with the sender routing table entries for the specified
+ * RSE identifier. The number of entries returned is limited by the size of the buffer.
+ *
+ * \param[out] routing_tables_buf  Pointer to a buffer where the routing table entries will be stored.
+ * \param[in]  buf_size            Size of the buffer in bytes.
+ * \param[in]  rse_id              Identifier for the RSE whose sender routing tables are to be retrieved.
+ *
+ * \return  Returns a tfm_plat_err_t indicating success or failure.
+ */
+enum tfm_plat_err_t rse_get_sender_routing_tables(uint8_t *routing_tables_buf, size_t buf_size,
+                                                  uint32_t rse_id);
+
+/**
+ * \brief Retrieves the receiver routing tables associated with a given RSE.
+ *
+ * This function populates the provided buffer with the receiver routing table entries for the specified
+ * RSE identifier. The number of entries returned is limited by the size of the buffer.
+ *
+ * \param[out] routing_tables_buf  Pointer to a buffer where the routing table entries will be stored.
+ * \param[in]  buf_size            Size of the buffer in bytes.
+ * \param[in]  rse_id              Identifier for the RSE whose receiver routing tables are to be retrieved.
+ *
+ * \return  Returns a tfm_plat_err_t indicating success or failure.
+ */
+enum tfm_plat_err_t rse_get_receiver_routing_tables(uint8_t *routing_tables_buf, size_t buf_size,
+                                                    uint32_t rse_id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RSE_GET_ROUTING_TABLES_H__ */

platform/ext/target/arm/rse/common/rse_handshake/rse_handshake.c

@@ -27,6 +27,7 @@
 #include "cmsis.h"
 #include "dpa_hardened_word_copy.h"
 #include "rse_routing_tables.h"
+#include "rse_get_routing_tables.h"
 
 #include <string.h>
 
@@ -36,8 +37,8 @@
 #define VHUK_SEED_SIZE           32
 #define VHUK_SEED_WORD_SIZE      8
 
-uint32_t sending_mhu[RSE_AMOUNT];
-uint32_t receiving_mhu[RSE_AMOUNT];
+uint8_t sending_mhu[RSE_AMOUNT];
+uint8_t receiving_mhu[RSE_AMOUNT];
 
 enum rse_handshake_msg_type {
     RSE_HANDSHAKE_SESSION_KEY_MSG,
@@ -511,27 +512,20 @@ static enum tfm_plat_err_t rse_handshake_server(uint32_t *vhuk_seeds_buf)
 
 enum tfm_plat_err_t rse_handshake(uint32_t *vhuk_seeds_buf)
 {
-#ifndef RSE_OTP_HAS_ROUTING_TABLES
-    /* The handshake can't be supported without routing tables in OTP */
-    return TFM_PLAT_ERR_UNSUPPORTED;
-#else
     uint32_t rse_id;
     enum tfm_plat_err_t plat_err;
 
-    plat_err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_TO_RSE_SENDER_ROUTING_TABLE,
-                                 sizeof(sending_mhu), (uint8_t *)sending_mhu);
+    plat_err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_ID, sizeof(rse_id), (uint8_t *)&rse_id);
     if (plat_err != TFM_PLAT_ERR_SUCCESS) {
         return plat_err;
     }
 
-    plat_err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_TO_RSE_RECEIVER_ROUTING_TABLE,
-                                 sizeof(receiving_mhu), (uint8_t *)receiving_mhu);
+    plat_err = rse_get_sender_routing_tables(sending_mhu, sizeof(sending_mhu), rse_id);
     if (plat_err != TFM_PLAT_ERR_SUCCESS) {
         return plat_err;
     }
 
-    plat_err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_ID, sizeof(rse_id),
-                                 (uint8_t*)&rse_id);
+    plat_err = rse_get_receiver_routing_tables(receiving_mhu, sizeof(receiving_mhu), rse_id);
     if (plat_err != TFM_PLAT_ERR_SUCCESS) {
         return plat_err;
     }
@@ -545,5 +539,4 @@ enum tfm_plat_err_t rse_handshake(uint32_t *vhuk_seeds_buf)
     } else {
         return rse_handshake_client(rse_id, vhuk_seeds_buf);
     }
-#endif /* RSE_OTP_HAS_ROUTING_TABLES */
 }