RSE: Add getter function for RSE ID

Add a function declaration for a function to get the RSE ID and a
default implementation which fetches the value from the OTP. Platforms
can define their own version of this function in the case where the RSE
ID is not in the OTP.

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

Author: jaccoo01

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

@@ -249,6 +249,7 @@ target_sources(platform_s
         $<$<BOOL:${RSE_ENABLE_DCSU_PROVISIONING_COMMS}>:${PLATFORM_DIR}/ext/target/arm/drivers/dcsu/src/dcsu_drv.c>
         $<$<BOOL:${RSE_ENABLE_DCSU_PROVISIONING_COMMS}>:${CMAKE_CURRENT_SOURCE_DIR}/rse_dcsu_hal.c>
         ./platform_shared_measurement_data.c
+        $<$<BOOL:${RSE_OTP_HAS_RSE_ID}>:${CMAKE_CURRENT_SOURCE_DIR}/rse_get_rse_id_from_otp.c>
 )
 
 target_sources(tfm_sprt
@@ -368,6 +369,7 @@ target_sources(platform_bl2
         ./dpa_hardened_word_copy.c
         ./rse_persistent_data.c
         ./platform_shared_measurement_data.c
+        $<$<BOOL:${RSE_OTP_HAS_RSE_ID}>:${CMAKE_CURRENT_SOURCE_DIR}/rse_get_rse_id_from_otp.c>
 )
 
 target_include_directories(platform_bl2
@@ -487,6 +489,7 @@ target_sources(platform_bl1_1
         ./platform_shared_measurement_data.c
         ./rse_soc_uid.c
         ${PLATFORM_DIR}/ext/target/arm/drivers/mpu/armv8m/mpu_armv8m_drv.c
+        $<$<BOOL:${RSE_OTP_HAS_RSE_ID}>:${CMAKE_CURRENT_SOURCE_DIR}/rse_get_rse_id_from_otp.c>
 )
 
 target_compile_definitions(platform_bl1_1

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

@@ -131,3 +131,4 @@ tfm_plat_increment_nv_counter
 rse_count_zero_bits
 rse_get_sender_routing_tables
 rse_get_receiver_routing_tables
+rse_get_rse_id

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

@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#ifndef __RSE_GET_RSE_ID_H__
+#define __RSE_GET_RSE_ID_H__
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum tfm_plat_err_t rse_get_rse_id(uint32_t *rse_id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RSE_GET_RSE_ID_H__ */

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

@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include "platform_error_codes.h"
+#include "rse_get_rse_id.h"
+#include "tfm_plat_otp.h"
+
+/* Default implementation of rse_get_rse_id. Platforms should implement their own version of this function
+ * when the RSE ID is not in the OTP */
+
+enum tfm_plat_err_t rse_get_rse_id(uint32_t *rse_id)
+{
+    enum tfm_plat_err_t plat_err;
+
+    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;
+    }
+
+    return TFM_PLAT_ERR_SUCCESS;
+}

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

@@ -28,6 +28,7 @@
 #include "dpa_hardened_word_copy.h"
 #include "rse_routing_tables.h"
 #include "rse_get_routing_tables.h"
+#include "rse_get_rse_id.h"
 
 #include <string.h>
 
@@ -87,16 +88,17 @@ static enum tfm_plat_err_t header_init(struct rse_handshake_msg *msg,
 {
     enum tfm_plat_err_t plat_err;
     cc3xx_err_t cc_err;
+    uint32_t rse_id;
 
     msg->header.type = type;
 
-    plat_err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_ID,
-                                 sizeof(msg->header.rse_id),
-                                 (uint8_t*)&msg->header.rse_id);
+    plat_err = rse_get_rse_id(&rse_id);
     if (plat_err != TFM_PLAT_ERR_SUCCESS) {
         return plat_err;
     }
 
+    msg->header.rse_id = rse_id;
+
     cc_err = cc3xx_lowlevel_rng_get_random((uint8_t *)&msg->header.ccm_iv,
                                            sizeof(msg->header.ccm_iv),
                                            CC3XX_RNG_DRBG);
@@ -515,7 +517,7 @@ enum tfm_plat_err_t rse_handshake(uint32_t *vhuk_seeds_buf)
     uint32_t rse_id;
     enum tfm_plat_err_t plat_err;
 
-    plat_err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_ID, sizeof(rse_id), (uint8_t *)&rse_id);
+    plat_err = rse_get_rse_id(&rse_id);
     if (plat_err != TFM_PLAT_ERR_SUCCESS) {
         return plat_err;
     }

platform/ext/target/arm/rse/neoverse_rd/rdv3/host_system.c

@@ -14,6 +14,7 @@
 #include "host_system.h"
 #include "tfm_hal_device_header.h"
 #include "tfm_plat_otp.h"
+#include "rse_get_rse_id.h"
 #ifdef RD_SYSCTRL_NOC_S3
 #include "noc_s3_lib.h"
 
@@ -284,9 +285,7 @@ static int read_chip_id(uint32_t *chip_id)
     int err;
     uint32_t otp_chip_id;
 
-    err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_ID,
-                            sizeof(otp_chip_id),
-                            (uint8_t*)&otp_chip_id);
+    err = rse_get_rse_id(&otp_chip_id);
     if (err != 0)
         return err;
 

platform/ext/target/arm/rse/neoverse_rd/rdv3r1/host_system.c

@@ -13,6 +13,7 @@
 #include "host_system.h"
 #include "tfm_hal_device_header.h"
 #include "tfm_plat_otp.h"
+#include "rse_get_rse_id.h"
 #ifdef RD_SYSCTRL_NOC_S3
 #include "noc_s3_lib.h"
 
@@ -285,9 +286,7 @@ static int read_chip_id(uint32_t *chip_id)
     int err;
     uint32_t otp_chip_id;
 
-    err = tfm_plat_otp_read(PLAT_OTP_ID_RSE_ID,
-                            sizeof(otp_chip_id),
-                            (uint8_t*)&otp_chip_id);
+    err = rse_get_rse_id(&otp_chip_id);
     if (err != 0)
         return err;