rse: export PKA SRAM key during its setup
Group PKA SRAM KMU key setup in one function call for clarity.
Change-Id: Ifc8570b9d5adb3da5a79ac4e598f45c2f83c7ddd
Signed-off-by: Amjad Ouled-Ameur <amjad.ouled-ameur@arm.com>
diff --git a/platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_1.c b/platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_1.c
index 9b07d96..325e8b0 100644
--- a/platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_1.c
+++ b/platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_1.c
@@ -217,12 +217,6 @@
return plat_err;
}
- /* Load the PKA encryption key, now that it is set up */
- kmu_err = kmu_export_key(&KMU_DEV_S, RSE_KMU_SLOT_CC3XX_PKA_SRAM_ENCRYPTION_KEY);
- if (kmu_err != KMU_ERROR_NONE) {
- return kmu_err;
- }
-
cc3xx_lowlevel_pka_sram_encryption_enable();
#endif /* CRYPTO_HW_ACCELERATOR */
diff --git a/platform/ext/target/arm/rse/common/bl1/rse_kmu_keys.c b/platform/ext/target/arm/rse/common/bl1/rse_kmu_keys.c
index 73c51a8..41f1f0b 100644
--- a/platform/ext/target/arm/rse/common/bl1/rse_kmu_keys.c
+++ b/platform/ext/target/arm/rse/common/bl1/rse_kmu_keys.c
@@ -619,5 +619,11 @@
return (enum tfm_plat_err_t)kmu_err;
}
+ /* Load the PKA encryption key, now that it is set up */
+ kmu_err = kmu_export_key(&KMU_DEV_S, RSE_KMU_SLOT_CC3XX_PKA_SRAM_ENCRYPTION_KEY);
+ if (kmu_err != KMU_ERROR_NONE) {
+ return kmu_err;
+ }
+
return TFM_PLAT_ERR_SUCCESS;
}