[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250423164150.3pqytl5zqwfnsx7i@pengutronix.de>
Date: Wed, 23 Apr 2025 18:41:50 +0200
From: Marco Felsch <m.felsch@...gutronix.de>
To: "Peng Fan (OSS)" <peng.fan@....nxp.com>
Cc: Shawn Guo <shawnguo@...nel.org>, Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>, imx@...ts.linux.dev,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Peng Fan <peng.fan@....com>
Subject: Re: [PATCH v2 3/3] soc: imx8m: Dump higher 64bits UID
On 25-04-23, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@....com>
>
> i.MX8MP UID is actually 128bits and partitioned into two parts.
> The 1st 64bits are at 0x410 and 0x420, and 2nd 64bits are at 0xE00
> and 0xE10.
>
> Dump the whole 128bits for i.MX8MP, by set soc_uid as an array with two
> u64.
>
> Signed-off-by: Peng Fan <peng.fan@....com>
> ---
> drivers/soc/imx/soc-imx8m.c | 22 ++++++++++++++++------
> 1 file changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c
> index 2186f6ab3eddd6c9369c691c845b3b78acaabe23..04a1b60f2f2b52cc374714f9a1205496c1762f39 100644
> --- a/drivers/soc/imx/soc-imx8m.c
> +++ b/drivers/soc/imx/soc-imx8m.c
> @@ -24,6 +24,7 @@
> #define OCOTP_UID_HIGH 0x420
>
> #define IMX8MP_OCOTP_UID_OFFSET 0x10
> +#define IMX8MP_OCOTP_UID_HIGH 0xE00
>
> /* Same as ANADIG_DIGPROG_IMX7D */
> #define ANADIG_DIGPROG_IMX8MM 0x800
> @@ -96,9 +97,13 @@ static int imx8mp_soc_uid(struct platform_device *pdev, u64 *socuid)
> struct imx8_soc_drvdata *drvdata = platform_get_drvdata(pdev);
> void __iomem *ocotp_base = drvdata->ocotp_base;
>
> - *socuid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH + IMX8MP_OCOTP_UID_OFFSET);
> - *socuid <<= 32;
> - *socuid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW + IMX8MP_OCOTP_UID_OFFSET);
> + socuid[0] = readl_relaxed(ocotp_base + OCOTP_UID_HIGH + IMX8MP_OCOTP_UID_OFFSET);
> + socuid[0] <<= 32;
> + socuid[0] |= readl_relaxed(ocotp_base + OCOTP_UID_LOW + IMX8MP_OCOTP_UID_OFFSET);
^
Nit: while on it, we can add a IMX8MP_OCOTP_UID_LOW define.
With or without the change, the patch lgtm.
Reviewed-by: Marco Felsch <m.felsch@...gutronix.de>
> +
> + socuid[1] = readl_relaxed(ocotp_base + IMX8MP_OCOTP_UID_HIGH + 0x10);
> + socuid[1] <<= 32;
> + socuid[1] |= readl_relaxed(ocotp_base + IMX8MP_OCOTP_UID_HIGH);
>
> return 0;
> }
> @@ -220,7 +225,7 @@ static int imx8m_soc_probe(struct platform_device *pdev)
> const struct of_device_id *id;
> struct soc_device *soc_dev;
> u32 soc_rev = 0;
> - u64 soc_uid = 0;
> + u64 soc_uid[2] = {0, 0};
> int ret;
>
> soc_dev_attr = devm_kzalloc(dev, sizeof(*soc_dev_attr), GFP_KERNEL);
> @@ -258,7 +263,7 @@ static int imx8m_soc_probe(struct platform_device *pdev)
> }
> }
> if (data->soc_uid) {
> - ret = data->soc_uid(pdev, &soc_uid);
> + ret = data->soc_uid(pdev, soc_uid);
> if (ret) {
> imx8m_soc_unprepare(pdev);
> return ret;
> @@ -271,7 +276,12 @@ static int imx8m_soc_probe(struct platform_device *pdev)
> if (!soc_dev_attr->revision)
> return -ENOMEM;
>
> - soc_dev_attr->serial_number = devm_kasprintf(dev, GFP_KERNEL, "%016llX", soc_uid);
> + if (soc_uid[1])
> + soc_dev_attr->serial_number = devm_kasprintf(dev, GFP_KERNEL, "%016llX%016llX",
> + soc_uid[1], soc_uid[0]);
> + else
> + soc_dev_attr->serial_number = devm_kasprintf(dev, GFP_KERNEL, "%016llX",
> + soc_uid[0]);
> if (!soc_dev_attr->serial_number)
> return -ENOMEM;
>
>
> --
> 2.37.1
>
>
Powered by blists - more mailing lists