From: Rouven Czerwinski <r.czerwinski@xxxxxxxxxxxxxx> The i.MX8M family of processors moved the SEC_CONFIG_1 fuse to a different location. Fix this by adding dedicated imx8mq ops which uses the new hook. Signed-off-by: Rouven Czerwinski <r.czerwinski@xxxxxxxxxxxxxx> [m.felsch@xxxxxxxxxxxxxx: split commit into two] [m.felsch@xxxxxxxxxxxxxx: integrate review feedback] [a.fatoum@xxxxxxxxxxxxxx: fixup imx_hab_device_locked_down_ocotp logic for imx6 and imx8m] Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx> --- Changelog: v2: - integrate Ahmads fixup patch - v1-link: https://lore.barebox.org/barebox/20231010143314.2031253-1-m.felsch@xxxxxxxxxxxxxx/T/#t drivers/hab/hab.c | 47 +++++++++++++++++++++++++++----- include/mach/imx/ocotp-fusemap.h | 3 ++ 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c index afe6a6682276..29379ff871c8 100644 --- a/drivers/hab/hab.c +++ b/drivers/hab/hab.c @@ -150,7 +150,7 @@ static int imx_hab_permanent_write_enable_ocotp(int enable) return imx_ocotp_permanent_write(enable); } -static int imx_hab_lockdown_device_ocotp(void) +static int imx6_hab_lockdown_device_ocotp(void) { int ret; @@ -161,7 +161,18 @@ static int imx_hab_lockdown_device_ocotp(void) return imx_ocotp_write_field(OCOTP_SEC_CONFIG_1, 1); } -static int imx_hab_device_locked_down_ocotp(void) +static int imx8m_hab_lockdown_device_ocotp(void) +{ + int ret; + + ret = imx_ocotp_write_field(MX8M_OCOTP_SEC_CONFIG_1, 1); + if (ret < 0) + return ret; + + return imx_ocotp_write_field(MX8MQ_OCOTP_DIR_BT_DIS, 1); +} + +static int imx6_hab_device_locked_down_ocotp(void) { int ret; unsigned int v; @@ -173,6 +184,18 @@ static int imx_hab_device_locked_down_ocotp(void) return v; } +static int imx8m_hab_device_locked_down_ocotp(void) +{ + int ret; + unsigned int v; + + ret = imx_ocotp_read_field(MX8M_OCOTP_SEC_CONFIG_1, &v); + if (ret < 0) + return ret; + + return v; +} + struct imx_hab_ops { int (*init)(void); int (*write_srk_hash)(const u8 *srk, unsigned flags); @@ -190,11 +213,19 @@ static struct imx_hab_ops imx_hab_ops_iim = { .permanent_write_enable = imx_hab_permanent_write_enable_iim, }; -static struct imx_hab_ops imx_hab_ops_ocotp = { +static struct imx_hab_ops imx6_hab_ops_ocotp = { + .write_srk_hash = imx_hab_write_srk_hash_ocotp, + .read_srk_hash = imx_hab_read_srk_hash_ocotp, + .lockdown_device = imx6_hab_lockdown_device_ocotp, + .device_locked_down = imx6_hab_device_locked_down_ocotp, + .permanent_write_enable = imx_hab_permanent_write_enable_ocotp, +}; + +static struct imx_hab_ops imx8m_hab_ops_ocotp = { .write_srk_hash = imx_hab_write_srk_hash_ocotp, .read_srk_hash = imx_hab_read_srk_hash_ocotp, - .lockdown_device = imx_hab_lockdown_device_ocotp, - .device_locked_down = imx_hab_device_locked_down_ocotp, + .lockdown_device = imx8m_hab_lockdown_device_ocotp, + .device_locked_down = imx8m_hab_device_locked_down_ocotp, .permanent_write_enable = imx_hab_permanent_write_enable_ocotp, }; @@ -208,8 +239,10 @@ static struct imx_hab_ops *imx_get_hab_ops(void) if (IS_ENABLED(CONFIG_HABV3) && (cpu_is_mx25() || cpu_is_mx35())) tmp = &imx_hab_ops_iim; - else if (IS_ENABLED(CONFIG_HABV4) && (cpu_is_mx6() || cpu_is_mx8mq())) - tmp = &imx_hab_ops_ocotp; + else if (IS_ENABLED(CONFIG_HABV4) && cpu_is_mx6()) + tmp = &imx6_hab_ops_ocotp; + else if (IS_ENABLED(CONFIG_HABV4) && cpu_is_mx8mq()) + tmp = &imx8m_hab_ops_ocotp; else return NULL; diff --git a/include/mach/imx/ocotp-fusemap.h b/include/mach/imx/ocotp-fusemap.h index 6ba794c16619..823273895502 100644 --- a/include/mach/imx/ocotp-fusemap.h +++ b/include/mach/imx/ocotp-fusemap.h @@ -53,5 +53,8 @@ #define OCOTP_GP1 (OCOTP_WORD(0x660) | OCOTP_BIT(0) | OCOTP_WIDTH(32)) #define OCOTP_GP2 (OCOTP_WORD(0x670) | OCOTP_BIT(0) | OCOTP_WIDTH(32)) #define OCOTP_PAD_SETTINGS (OCOTP_WORD(0x6d0) | OCOTP_BIT(0) | OCOTP_WIDTH(6)) +/* i.MX8M moved the security related fuses */ +#define MX8M_OCOTP_SEC_CONFIG_1 (OCOTP_WORD(0x470) | OCOTP_BIT(25) | OCOTP_WIDTH(1)) +#define MX8MQ_OCOTP_DIR_BT_DIS (OCOTP_WORD(0x470) | OCOTP_BIT(27) | OCOTP_WIDTH(1)) #endif /* __MACH_IMX_OCOTP_FUSEMAP_H */ -- 2.39.2
