sec-cfg: Add secure_handover_config section

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

Starting from SYSFW v2020.08, a secure_handover_config section
is mandatory in the security config. Otherwise the boot fails
on all SoCs.

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>

5 files changed, 53 insertions, 0 deletions

diff --git a/include/common.h b/include/common.h
index 382b6c422..2a012211a 100644
--- a/include/common.h
+++ b/include/common.h
@@ -83,6 +83,7 @@ typedef u8 ftbool;
 #define BOARDCFG_DKEK_CFG_MAGIC_NUM             0x5170
 #define BOARDCFG_SA2UL_CFG_MAGIC_NUM_RSVD       0x23BE
 #define BOARDCFG_SEC_DBG_CTRL_MAGIC_NUM         0x42AF
+#define BOARDCFG_SEC_HANDOVER_CFG_MAGIC_NUM     0x608F
 
 struct boardcfg_substructure_header {
         u16     magic;
@@ -260,6 +261,13 @@ struct boardcfg_secure_debug_config {
         u8                                      jtag_unlock_hosts[BOARDCFG_SEC_MAX_NUM_JTAG_UNLOCK_HOSTS];
 } __attribute__((__packed__));
 
+struct boardcfg_sec_handover {
+        struct boardcfg_substructure_header     subhdr;
+        u8                                      handover_msg_sender;
+        u8                                      handover_to_host_id;
+        u8                                      rsvd[4];
+};
+
 struct boardcfg_security {
         struct boardcfg_abi_rev                 rev;
         struct boardcfg_proc_acl                processor_acl_list;
@@ -268,6 +276,7 @@ struct boardcfg_security {
         struct boardcfg_dkek                    dkek_config;
         struct boardcfg_sa2ul_cfg               sa2ul_cfg;
         struct boardcfg_secure_debug_config     sec_dbg_config;
+        struct boardcfg_sec_handover            sec_handover_cfg;
 } __attribute__((__packed__));
 
 /**
diff --git a/soc/am65x/evm/sec-cfg.c b/soc/am65x/evm/sec-cfg.c
index 13007cd6f..500fd762c 100644
--- a/soc/am65x/evm/sec-cfg.c
+++ b/soc/am65x/evm/sec-cfg.c
@@ -103,4 +103,15 @@ const struct boardcfg_security am65_boardcfg_security_data = {
                 .min_cert_rev = 0x0,
                 .jtag_unlock_hosts = {0, 0, 0, 0},
         },
+
+        /* Secure Handover Configuration */
+        .sec_handover_cfg = {
+                .subhdr = {
+                        .magic = BOARDCFG_SEC_HANDOVER_CFG_MAGIC_NUM,
+                        .size = sizeof(struct boardcfg_sec_handover),
+                },
+                .handover_msg_sender = 0,
+                .handover_to_host_id = 0,
+                .rsvd = {0,0,0,0},
+        },
 };
diff --git a/soc/am65x_sr2/evm/sec-cfg.c b/soc/am65x_sr2/evm/sec-cfg.c
index 486036fca..f51d5bbe9 100644
--- a/soc/am65x_sr2/evm/sec-cfg.c
+++ b/soc/am65x_sr2/evm/sec-cfg.c
@@ -102,4 +102,15 @@ const struct boardcfg_security am65_boardcfg_security_data = {
                 .min_cert_rev = 0x0,
                 .jtag_unlock_hosts = {0, 0, 0, 0},
         },
+
+        /* Secure Handover Configuration */
+        .sec_handover_cfg = {
+                .subhdr = {
+                        .magic = BOARDCFG_SEC_HANDOVER_CFG_MAGIC_NUM,
+                        .size = sizeof(struct boardcfg_sec_handover),
+                },
+                .handover_msg_sender = 0,
+                .handover_to_host_id = 0,
+                .rsvd = {0,0,0,0},
+        },
 };
diff --git a/soc/j7200/evm/sec-cfg.c b/soc/j7200/evm/sec-cfg.c
index 74b393891..a084939cf 100644
--- a/soc/j7200/evm/sec-cfg.c
+++ b/soc/j7200/evm/sec-cfg.c
@@ -102,4 +102,15 @@ const struct boardcfg_security j7200_boardcfg_security_data = {
                 .min_cert_rev = 0x0,
                 .jtag_unlock_hosts = {0, 0, 0, 0},
         },
+
+        /* Secure Handover Configuration */
+        .sec_handover_cfg = {
+                .subhdr = {
+                        .magic = BOARDCFG_SEC_HANDOVER_CFG_MAGIC_NUM,
+                        .size = sizeof(struct boardcfg_sec_handover),
+                },
+                .handover_msg_sender = 0,
+                .handover_to_host_id = 0,
+                .rsvd = {0,0,0,0},
+        },
 };
diff --git a/soc/j721e/evm/sec-cfg.c b/soc/j721e/evm/sec-cfg.c
index 8391d276c..1ddb539e0 100644
--- a/soc/j721e/evm/sec-cfg.c
+++ b/soc/j721e/evm/sec-cfg.c
@@ -103,4 +103,15 @@ const struct boardcfg_security j721e_boardcfg_security_data = {
                 .min_cert_rev = 0x0,
                 .jtag_unlock_hosts = {0, 0, 0, 0},
         },
+
+        /* Secure Handover Configuration */
+        .sec_handover_cfg = {
+                .subhdr = {
+                        .magic = BOARDCFG_SEC_HANDOVER_CFG_MAGIC_NUM,
+                        .size = sizeof(struct boardcfg_sec_handover),
+                },
+                .handover_msg_sender = 0,
+                .handover_to_host_id = 0,
+                .rsvd = {0,0,0,0},
+        },
 };