On Tue, Jul 16, 2019 at 12:58:37PM +0200, Bastian Krause wrote:
> Pass the OCOTP unique id as hashable information to machine id
> generation.
>
> Signed-off-by: Bastian Krause <bst@xxxxxxxxxxxxxx>
> ---
> drivers/nvmem/ocotp.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c
> index 3f9f162860..6f76ad9ac0 100644
> --- a/drivers/nvmem/ocotp.c
> +++ b/drivers/nvmem/ocotp.c
> @@ -29,6 +29,7 @@
> #include <regmap.h>
> #include <linux/clk.h>
> #include <mach/ocotp.h>
> +#include <machine_id.h>
> #include <linux/nvmem-provider.h>
>
> /*
> @@ -77,6 +78,9 @@
> #define MAC_OFFSET_1 (0x24 * 4)
> #define MAX_MAC_OFFSETS 2
> #define MAC_BYTES 8
> +#define UNIQUE_ID_NUM 2
> +/* 0 <= n < UNIQUE_ID_NUM */
> +#define UNIQUE_ID(n) (OCOTP_WORD(0x410 + 0x10 * (n)) | OCOTP_BIT(0) | OCOTP_WIDTH(32))
>
> enum imx_ocotp_format_mac_direction {
> OCOTP_HW_TO_MAC,
> @@ -548,6 +552,23 @@ static int imx_ocotp_read(struct device_d *dev, const int offset, void *val,
> return regmap_bulk_read(priv->map, offset, val, bytes);
> }
>
> +static int imx_ocotp_set_unique_machine_id(void)
> +{
> + uint32_t unique_id_parts[UNIQUE_ID_NUM];
> + int ret, i;
> +
> + for (i = 0; i < UNIQUE_ID_NUM; i++) {
> + ret = imx_ocotp_read_field(UNIQUE_ID(i), &unique_id_parts[i]);
> + if (ret < 0)
> + goto out;
> + }
> +
> + machine_id_set_hashable(&unique_id_parts, sizeof(unique_id_parts));
So unique_id_parts is on the stack. As said, better make a copy in
machine_id_set_hashable() ;)
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
