diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2024-02-13 16:17:41 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2024-02-16 12:57:55 +0100 |
commit | 5b70430c3e798cf997a3fef6c5b0087a4db74821 (patch) | |
tree | de0ddc5da988b0a3e340089eb1e9d7f68619efc7 | |
parent | 7ebceef3cb18e4ade367a295ee4d1900f3440430 (diff) | |
download | barebox-5b70430c3e79.tar.gz barebox-5b70430c3e79.tar.xz |
hab: cleanup hab status printing during boot
So far we have an initcall per SoC to print the HAB status. Add a
struct imx_hab_ops::print_status() hook to reduce this to a single
initcall. This will also allow us to print the HAB status later,
maybe from the hab command, and not only during boot.
Link: https://lore.barebox.org/20240213151744.307958-4-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | drivers/hab/hab.c | 24 | ||||
-rw-r--r-- | drivers/hab/hab.h | 10 | ||||
-rw-r--r-- | drivers/hab/habv3.c | 6 | ||||
-rw-r--r-- | drivers/hab/habv4.c | 39 | ||||
-rw-r--r-- | include/hab.h | 15 |
5 files changed, 42 insertions, 52 deletions
diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c index a5996f0b97..a85bbae6d6 100644 --- a/drivers/hab/hab.c +++ b/drivers/hab/hab.c @@ -14,6 +14,8 @@ #include <mach/imx/ocotp.h> #include <mach/imx/imx6-fusemap.h> +#include "hab.h" + bool imx_hab_srk_hash_valid(const void *buf) { const u8 *srk = buf; @@ -206,6 +208,7 @@ struct imx_hab_ops { int (*permanent_write_enable)(int enable); int (*lockdown_device)(void); int (*device_locked_down)(void); + int (*print_status)(void); }; static struct imx_hab_ops imx_hab_ops_iim = { @@ -214,6 +217,7 @@ static struct imx_hab_ops imx_hab_ops_iim = { .lockdown_device = imx_hab_lockdown_device_iim, .device_locked_down = imx_hab_device_locked_down_iim, .permanent_write_enable = imx_hab_permanent_write_enable_iim, + .print_status = imx25_hab_print_status, }; static struct imx_hab_ops imx6_hab_ops_ocotp = { @@ -222,6 +226,7 @@ static struct imx_hab_ops imx6_hab_ops_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, + .print_status = imx6_hab_print_status, }; static struct imx_hab_ops imx8m_hab_ops_ocotp = { @@ -230,6 +235,7 @@ static struct imx_hab_ops imx8m_hab_ops_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, + .print_status = imx8m_hab_print_status, }; static struct imx_hab_ops *imx_get_hab_ops(void) @@ -383,3 +389,21 @@ int imx_hab_device_locked_down(void) return ops->device_locked_down(); } + +int imx_hab_print_status(void) +{ + struct imx_hab_ops *ops = imx_get_hab_ops(); + + if (!ops) + return -ENOSYS; + + return ops->print_status(); +} + +static int init_imx_hab_print_status(void) +{ + imx_hab_print_status(); + + return 0; +} +postmmu_initcall(init_imx_hab_print_status); diff --git a/drivers/hab/hab.h b/drivers/hab/hab.h new file mode 100644 index 0000000000..7be0e8386b --- /dev/null +++ b/drivers/hab/hab.h @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#ifndef __DRIVER_HAB_HAB_H +#define __DRIVER_HAB_HAB_H + +int imx25_hab_print_status(void); +int imx6_hab_print_status(void); +int imx8m_hab_print_status(void); + +#endif /* __DRIVER_HAB_HAB_H */ diff --git a/drivers/hab/habv3.c b/drivers/hab/habv3.c index 4818dae7d1..e28e9998d7 100644 --- a/drivers/hab/habv3.c +++ b/drivers/hab/habv3.c @@ -69,11 +69,7 @@ static int imx_habv3_get_status(uint32_t status) return -EPERM; } -int imx25_hab_get_status(void) +int imx25_hab_print_status(void) { - if (!cpu_is_mx25()) - return 0; - return imx_habv3_get_status(readl(IOMEM(0x780018d4))); } -postmmu_initcall(imx25_hab_get_status); diff --git a/drivers/hab/habv4.c b/drivers/hab/habv4.c index d8e5732adf..a1d823ed25 100644 --- a/drivers/hab/habv4.c +++ b/drivers/hab/habv4.c @@ -20,6 +20,8 @@ #include <mach/imx/generic.h> #include <mach/imx/imx8mq.h> +#include "hab.h" + #define HABV4_RVT_IMX6_OLD 0x00000094 #define HABV4_RVT_IMX6_NEW 0x00000098 #define HABV4_RVT_IMX6UL 0x00000100 @@ -646,7 +648,7 @@ static int habv4_get_status(const struct habv4_rvt *rvt) return -EPERM; } -int imx6_hab_get_status(void) +static int imx6_hab_get_status(void) { const struct habv4_rvt *rvt; @@ -670,41 +672,19 @@ int imx6_hab_get_status(void) return -EINVAL; } -static int imx8m_hab_get_status(void) -{ - return habv4_get_status(&hab_smc_ops); -} - -static int init_imx8m_hab_get_status(void) +int imx8m_hab_print_status(void) { - if (!cpu_is_mx8m()) - /* can happen in multi-image builds and is not an error */ - return 0; - pr_info("ROM version: 0x%x\n", hab_sip_get_version()); - /* - * Nobody will check the return value if there were HAB errors, but the - * initcall will fail spectaculously with a strange error message. - */ - imx8m_hab_get_status(); + habv4_get_status(&hab_smc_ops); return 0; } -postmmu_initcall(init_imx8m_hab_get_status); -static int init_imx6_hab_get_status(void) +int imx6_hab_print_status(void) { - if (!cpu_is_mx6()) - /* can happen in multi-image builds and is not an error */ - return 0; - remap_range(0x0, SZ_1M, MAP_CACHED); - /* - * Nobody will check the return value if there were HAB errors, but the - * initcall will fail spectaculously with a strange error message. - */ imx6_hab_get_status(); zero_page_faulting(); @@ -712,10 +692,3 @@ static int init_imx6_hab_get_status(void) return 0; } - -/* - * Need to run before MMU setup because i.MX6 ROM code is mapped near 0x0, - * which will no longer be accessible when the MMU sets the zero page to - * faulting. - */ -postmmu_initcall(init_imx6_hab_get_status); diff --git a/include/hab.h b/include/hab.h index d0952e9376..da79a8ffea 100644 --- a/include/hab.h +++ b/include/hab.h @@ -21,28 +21,14 @@ enum habv4_state { }; #ifdef CONFIG_HABV4 -int imx6_hab_get_status(void); int habv4_get_state(void); #else -static inline int imx6_hab_get_status(void) -{ - return -EPERM; -} static inline int habv4_get_state(void) { return -ENOSYS; } #endif -#ifdef CONFIG_HABV3 -int imx25_hab_get_status(void); -#else -static inline int imx25_hab_get_status(void) -{ - return -EPERM; -} -#endif - #define SRK_HASH_SIZE 32 /* Force writing of key, even when a key is already written */ @@ -63,5 +49,6 @@ int imx_hab_write_srk_hash_file(const char *filename, unsigned flags); int imx_hab_read_srk_hash(void *buf); int imx_hab_lockdown_device(unsigned flags); int imx_hab_device_locked_down(void); +int imx_hab_print_status(void); #endif /* __HABV4_H */ |