2019-12-04 05:53:30

by Peng Fan

Subject: [PATCH] nvmem: imx: scu: correct the fuse word index

From: Peng Fan <[email protected]>

i.MX8 fuse word row index represented as one 4-bytes word.
Exp:
- MAC0 address layout in fuse:
offset 708: MAC[3] MAC[2] MAC[1] MAC[0]
offset 709: XX xx MAC[5] MAC[4]

The original code takes row index * 4 as the offset, this
not exactly match i.MX8 fuse map documentation.

So update code the reflect the truth.

Signed-off-by: Peng Fan <[email protected]>
---
drivers/nvmem/imx-ocotp-scu.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/nvmem/imx-ocotp-scu.c b/drivers/nvmem/imx-ocotp-scu.c
index 455675dd8efe..399e1eb8b4c1 100644
--- a/drivers/nvmem/imx-ocotp-scu.c
+++ b/drivers/nvmem/imx-ocotp-scu.c
@@ -138,8 +138,8 @@ static int imx_scu_ocotp_read(void *context, unsigned int offset,
void *p;
int i, ret;

- index = offset >> 2;
- num_bytes = round_up((offset % 4) + bytes, 4);
+ index = offset;
+ num_bytes = round_up(bytes, 4);
count = num_bytes >> 2;

if (count > (priv->data->nregs - index))
@@ -168,7 +168,7 @@ static int imx_scu_ocotp_read(void *context, unsigned int offset,
buf++;
}

- memcpy(val, (u8 *)p + offset % 4, bytes);
+ memcpy(val, (u8 *)p, bytes);

mutex_unlock(&scu_ocotp_mutex);

@@ -188,10 +188,10 @@ static int imx_scu_ocotp_write(void *context, unsigned int offset,
int ret;

/* allow only writing one complete OTP word at a time */
- if ((bytes != 4) || (offset % 4))
+ if (bytes != 4)
return -EINVAL;

- index = offset >> 2;
+ index = offset;

if (in_hole(context, index))
return -EINVAL;
--
2.16.4

2019-12-05 01:28:07

by Andy Duan

Subject: RE: [PATCH] nvmem: imx: scu: correct the fuse word index

From: Peng Fan <[email protected]> Sent: Wednesday, December 4, 2019 1:52 PM
> From: Peng Fan <[email protected]>
>
> i.MX8 fuse word row index represented as one 4-bytes word.
> Exp:
> - MAC0 address layout in fuse:
> offset 708: MAC[3] MAC[2] MAC[1] MAC[0]
> offset 709: XX xx MAC[5] MAC[4]
>
> The original code takes row index * 4 as the offset, this not exactly match
> i.MX8 fuse map documentation.
>
> So update code the reflect the truth.
>
> Signed-off-by: Peng Fan <[email protected]>

Reviewed-by: Fugang Duan <[email protected]>
> ---
> drivers/nvmem/imx-ocotp-scu.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/nvmem/imx-ocotp-scu.c b/drivers/nvmem/imx-ocotp-scu.c
> index 455675dd8efe..399e1eb8b4c1 100644
> --- a/drivers/nvmem/imx-ocotp-scu.c
> +++ b/drivers/nvmem/imx-ocotp-scu.c
> @@ -138,8 +138,8 @@ static int imx_scu_ocotp_read(void *context,
> unsigned int offset,
> void *p;
> int i, ret;
>
> - index = offset >> 2;
> - num_bytes = round_up((offset % 4) + bytes, 4);
> + index = offset;
> + num_bytes = round_up(bytes, 4);
> count = num_bytes >> 2;
>
> if (count > (priv->data->nregs - index)) @@ -168,7 +168,7 @@ static int
> imx_scu_ocotp_read(void *context, unsigned int offset,
> buf++;
> }
>
> - memcpy(val, (u8 *)p + offset % 4, bytes);
> + memcpy(val, (u8 *)p, bytes);
>
> mutex_unlock(&scu_ocotp_mutex);
>
> @@ -188,10 +188,10 @@ static int imx_scu_ocotp_write(void *context,
> unsigned int offset,
> int ret;
>
> /* allow only writing one complete OTP word at a time */
> - if ((bytes != 4) || (offset % 4))
> + if (bytes != 4)
> return -EINVAL;
>
> - index = offset >> 2;
> + index = offset;
>
> if (in_hole(context, index))
> return -EINVAL;
> --
> 2.16.4

2019-12-19 10:54:27

by Srinivas Kandagatla

Subject: Re: [PATCH] nvmem: imx: scu: correct the fuse word index

On 04/12/2019 05:52, Peng Fan wrote:
> From: Peng Fan <[email protected]>
>
> i.MX8 fuse word row index represented as one 4-bytes word.
> Exp:
> - MAC0 address layout in fuse:
> offset 708: MAC[3] MAC[2] MAC[1] MAC[0]
> offset 709: XX xx MAC[5] MAC[4]
>
> The original code takes row index * 4 as the offset, this
> not exactly match i.MX8 fuse map documentation.
>
> So update code the reflect the truth.
>
> Signed-off-by: Peng Fan <[email protected]>
> ---
> drivers/nvmem/imx-ocotp-scu.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
Applied Thanks,
srini