RE: [PATCH V2] soc: imx8m: Correct i.MX8MP UID fuse offset
Hi, Luliana
> Subject: Re: [PATCH V2] soc: imx8m: Correct i.MX8MP UID fuse offset
>
>
>
> On 6/10/2020 10:57 AM, Anson Huang wrote:
> >
> >> Subject: RE: [PATCH V2] soc: imx8m: Correct i.MX8MP UID fuse offset
> >>
> >>> From: Anson Huang
> >>> Sent: Wednesday, June 10, 2020 6:42 AM
> >>>
> >>> Correct i.MX8MP UID fuse offset according to fuse map:
> >>>
> >>> UID_LOW: 0x420
> >>> UID_HIGH: 0x430
> >>>
> >>> Fixes: fc40200ebf82 ("soc: imx: increase build coverage for imx8m
> >>> soc
> >>> driver")
> >>
> >> AFAIK "Fixes:" should point to the original patch which introduced the
> >> issue.
> >> Not the one changing file name.
> >
> > But the patch can NOT be applied to the kernel version with original
> > file, how to fix it?
> >
> I believe you can add two "Fixes:" with the two commits: the one introducing
> the issue and the one changing the file name.
Thanks, will add once more fix tag, please help review V3.
Anson
Re: [PATCH V2] soc: imx8m: Correct i.MX8MP UID fuse offset
On 6/10/2020 10:57 AM, Anson Huang wrote:
Subject: RE: [PATCH V2] soc: imx8m: Correct i.MX8MP UID fuse offset
From: Anson Huang
Sent: Wednesday, June 10, 2020 6:42 AM
Correct i.MX8MP UID fuse offset according to fuse map:
UID_LOW: 0x420
UID_HIGH: 0x430
Fixes: fc40200ebf82 ("soc: imx: increase build coverage for imx8m soc
driver")
AFAIK "Fixes:" should point to the original patch which introduced the issue.
Not the one changing file name.
But the patch can NOT be applied to the kernel version with original file, how
to
fix it?
I believe you can add two "Fixes:" with the two commits: the one
introducing the issue and the one changing the file name.
Iulia
RE: [PATCH V2] soc: imx8m: Correct i.MX8MP UID fuse offset
> Subject: RE: [PATCH V2] soc: imx8m: Correct i.MX8MP UID fuse offset
>
> > From: Anson Huang
> > Sent: Wednesday, June 10, 2020 6:42 AM
> >
> > Correct i.MX8MP UID fuse offset according to fuse map:
> >
> > UID_LOW: 0x420
> > UID_HIGH: 0x430
> >
> > Fixes: fc40200ebf82 ("soc: imx: increase build coverage for imx8m soc
> > driver")
>
> AFAIK "Fixes:" should point to the original patch which introduced the issue.
> Not the one changing file name.
But the patch can NOT be applied to the kernel version with original file, how
to
fix it?
Anson
RE: [PATCH V2] soc: imx8m: Correct i.MX8MP UID fuse offset
> From: Anson Huang
> Sent: Wednesday, June 10, 2020 6:42 AM
>
> Correct i.MX8MP UID fuse offset according to fuse map:
>
> UID_LOW: 0x420
> UID_HIGH: 0x430
>
> Fixes: fc40200ebf82 ("soc: imx: increase build coverage for imx8m soc driver")
AFAIK "Fixes:" should point to the original patch which introduced the issue.
Not the one changing file name.
> Signed-off-by: Anson Huang
> ---
> Changes since V1:
> - add fix tag.
> ---
> drivers/soc/imx/soc-imx8m.c | 8 ++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index
> 7b0759a..0bc8314 100644
> --- a/drivers/soc/imx/soc-imx8m.c
> +++ b/drivers/soc/imx/soc-imx8m.c
> @@ -22,6 +22,8 @@
> #define OCOTP_UID_LOW0x410
> #define OCOTP_UID_HIGH 0x420
>
> +#define IMX8MP_OCOTP_UID_OFFSET 0x10
> +
> /* Same as ANADIG_DIGPROG_IMX7D */
> #define ANADIG_DIGPROG_IMX8MM0x800
>
> @@ -87,6 +89,8 @@ static void __init imx8mm_soc_uid(void) {
> void __iomem *ocotp_base;
> struct device_node *np;
> + u32 offset = of_machine_is_compatible("fsl,imx8mp") ?
> + IMX8MP_OCOTP_UID_OFFSET : 0;
>
If (of_machine_is_compatible("fsl,imx8mp"))
Octop_base += IMX8MP_OCOTP_UID_OFFSET;
Then you may not need the extra changes.
Regards
Aisheng
> np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-ocotp");
> if (!np)
> @@ -95,9 +99,9 @@ static void __init imx8mm_soc_uid(void)
> ocotp_base = of_iomap(np, 0);
> WARN_ON(!ocotp_base);
>
> - soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH);
> + soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH + offset);
> soc_uid <<= 32;
> - soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW);
> + soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW + offset);
>
> iounmap(ocotp_base);
> of_node_put(np);
> --
> 2.7.4
