sec-cfg: Add dkek_config section

Update the common.h headers to add new defines from SYSFW 2020.03.

Starting from SYSFW v2020.03, a dkek_config section is mandatory in
the security config. Otherwise the boot fails.

Fix this by adding a section for dkek_config with HOST_ID_ALL in
allowed_hosts and allow_dkek_export_tisci set.

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Tested-by: Suman Anna <s-anna@ti.com>

4 files changed, 44 insertions, 0 deletions

diff --git a/include/common.h b/include/common.h
index 03e88e2a9..af01a4396 100644
--- a/include/common.h
+++ b/include/common.h
@@ -80,6 +80,7 @@ typedef u8 ftbool;
 #define BOARDCFG_DBG_CFG_MAGIC_NUM              0x020C
 #define BOARDCFG_PMIC_CFG_MAGIC_NUM             0x3172
 #define BOARDCFG_OTP_CFG_MAGIC_NUM              0x4081
+#define BOARDCFG_DKEK_CFG_MAGIC_NUM             0x5170
 
 struct boardcfg_substructure_header {
         u16     magic;
@@ -231,11 +232,21 @@ struct boardcfg_extended_otp {
         u8                                      write_host_id;
 } __attribute__((__packed__));
 
+#define MAX_NUM_DKEK_ALLOWED_HOSTS              4
+
+struct boardcfg_dkek {
+        struct boardcfg_substructure_header     subhdr;
+        u8                                      allowed_hosts[MAX_NUM_DKEK_ALLOWED_HOSTS];
+        u8                                      allow_dkek_export_tisci;
+        u8                                      rsvd[3];
+} __attribute__((__packed__));
+
 struct boardcfg_security {
         struct boardcfg_abi_rev                 rev;
         struct boardcfg_proc_acl                processor_acl_list;
         struct boardcfg_host_hierarchy          host_hierarchy;
         struct boardcfg_extended_otp            otp_config;
+        struct boardcfg_dkek                    dkek_config;
 } __attribute__((__packed__));
 
 /**
diff --git a/soc/am65x/evm/sec-cfg.c b/soc/am65x/evm/sec-cfg.c
index 291b2af65..b15030749 100644
--- a/soc/am65x/evm/sec-cfg.c
+++ b/soc/am65x/evm/sec-cfg.c
@@ -71,4 +71,15 @@ const struct boardcfg_security am65_boardcfg_security_data = {
                 /* This is an array with 32 entries */
                 .otp_entry = {{ 0 } },
         },
+
+        /* DKEK configuration */
+        .dkek_config = {
+                .subhdr = {
+                        .magic = BOARDCFG_DKEK_CFG_MAGIC_NUM,
+                        .size = sizeof(struct boardcfg_dkek),
+                },
+                .allowed_hosts = { HOST_ID_ALL, 0, 0, 0 },
+                .allow_dkek_export_tisci = 0x5A,
+                .rsvd = {0, 0, 0},
+        },
 };
diff --git a/soc/am65x_sr2/evm/sec-cfg.c b/soc/am65x_sr2/evm/sec-cfg.c
index ea7007664..9e1cfb9c5 100644
--- a/soc/am65x_sr2/evm/sec-cfg.c
+++ b/soc/am65x_sr2/evm/sec-cfg.c
@@ -70,4 +70,15 @@ const struct boardcfg_security am65_boardcfg_security_data = {
                 /* This is an array with 32 entries */
                 .otp_entry = {{ 0 } },
         },
+
+        /* DKEK configuration */
+        .dkek_config = {
+                .subhdr = {
+                        .magic = BOARDCFG_DKEK_CFG_MAGIC_NUM,
+                        .size = sizeof(struct boardcfg_dkek),
+                },
+                .allowed_hosts = { HOST_ID_ALL, 0, 0, 0 },
+                .allow_dkek_export_tisci = 0x5A,
+                .rsvd = {0, 0, 0},
+        },
 };
diff --git a/soc/j721e/evm/sec-cfg.c b/soc/j721e/evm/sec-cfg.c
index 4392a3188..153f059c5 100644
--- a/soc/j721e/evm/sec-cfg.c
+++ b/soc/j721e/evm/sec-cfg.c
@@ -71,4 +71,15 @@ const struct boardcfg_security j721e_boardcfg_security_data = {
                 /* This is an array with 32 entries */
                 .otp_entry = {{ 0 } },
         },
+
+        /* DKEK configuration */
+        .dkek_config = {
+                .subhdr = {
+                        .magic = BOARDCFG_DKEK_CFG_MAGIC_NUM,
+                        .size = sizeof(struct boardcfg_dkek),
+                },
+                .allowed_hosts = { HOST_ID_ALL, 0, 0, 0 },
+                .allow_dkek_export_tisci = 0x5A,
+                .rsvd = {0, 0, 0},
+        },
 };