Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Peng Fan <peng.fan@nxp.com>
To:     "srinivas.kandagatla@linaro.org" <srinivas.kandagatla@linaro.org>,
        "shawnguo@kernel.org" <shawnguo@kernel.org>,
        "s.hauer@pengutronix.de" <s.hauer@pengutronix.de>
CC:     "kernel@pengutronix.de" <kernel@pengutronix.de>,
        "festevam@gmail.com" <festevam@gmail.com>,
        dl-linux-imx <linux-imx@nxp.com>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Aisheng Dong <aisheng.dong@nxp.com>,
        Andy Duan <fugang.duan@nxp.com>, Peng Fan <peng.fan@nxp.com>
Subject: [PATCH] nvmem: imx: scu: correct the fuse word index
Thread-Topic: [PATCH] nvmem: imx: scu: correct the fuse word index
Thread-Index: AQHVqmb3nxYwp0MksEa8htHeEretqA==
Date:   Wed, 4 Dec 2019 05:52:09 +0000
Message-ID: <1575438591-12409-1-git-send-email-peng.fan@nxp.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [119.31.174.66]
x-ms-publictraffictype: Email
x-ms-office365-filtering-ht: Tenant
x-ms-office365-filtering-correlation-id: 1a0215b9-bea7-482e-d1a6-08d7787e1a17
x-ms-traffictypediagnostic: AM0PR04MB3985:|AM0PR04MB3985:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <AM0PR04MB39854BDDF22C067B6172DB09885D0@AM0PR04MB3985.eurprd04.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:6430;
x-forefront-prvs: 0241D5F98C
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(136003)(396003)(366004)(39860400002)(346002)(376002)(199004)(189003)(6512007)(2501003)(6506007)(2906002)(478600001)(7736002)(305945005)(386003)(8936002)(44832011)(8676002)(36756003)(81156014)(81166006)(2616005)(25786009)(54906003)(4326008)(110136005)(50226002)(66946007)(64756008)(66476007)(66556008)(66446008)(14444005)(256004)(6436002)(316002)(71190400001)(71200400001)(5660300002)(26005)(6116002)(186003)(102836004)(3846002)(52116002)(6486002)(86362001)(14454004)(99286004)(2201001);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR04MB3985;H:AM0PR04MB4481.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: nxp.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: k+4FUK9uYSjK4X3HoYY0zS5z/orNRGk5VwiqnhmHOdxprWZC1pNZRDll78KxqzcVOEQE/Wah/X4ObQpEowD158aDWEh5bOECFSsi6QRAppTvxgBsevAk5ISfW31p6nUDSD7VuLXv4RMc5TLPlqqEeYVnJ3Zly8rDcKeBzmWy6Du6Kr7OxOahG8Y/MPry7dWScRJABdMmDN2c5ElyVbTH5dPzWE7iV6j4E+1h3GtF6i+8X19LC/tPwkkh4DA+iwI+taGLlCliwha9pFe+XKbY44OomohPk5kj41KBXHRwxrv7q1/csGxcb98gyi8ig8Fa50l3QsDRYugncrHl32b6FNttEWKi1ldSl5Qb0+kkdOnWNeeJgak6KLYVPy7LGW5joVyWgQNL9CCXHiRGPguH46W9QW3eOO78wCgpqHnJjtUaEgQnaHOarcxBjIOF0dgm
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1a0215b9-bea7-482e-d1a6-08d7787e1a17
X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Dec 2019 05:52:09.7374
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 4LmOsc+Sm7Dn0TVICtYK1Ffm9jKC2MLcWssY1+HwGcGfz4novtkCdgcVVQoV3oD8luEMCCBx73RSLqcs/I/Odw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB3985
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Peng Fan <peng.fan@nxp.com>

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 <peng.fan@nxp.com>
---
 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 i=
nt offset,
 	void *p;
 	int i, ret;
=20
-	index =3D offset >> 2;
-	num_bytes =3D round_up((offset % 4) + bytes, 4);
+	index =3D offset;
+	num_bytes =3D round_up(bytes, 4);
 	count =3D num_bytes >> 2;
=20
 	if (count > (priv->data->nregs - index))
@@ -168,7 +168,7 @@ static int imx_scu_ocotp_read(void *context, unsigned i=
nt offset,
 		buf++;
 	}
=20
-	memcpy(val, (u8 *)p + offset % 4, bytes);
+	memcpy(val, (u8 *)p, bytes);
=20
 	mutex_unlock(&scu_ocotp_mutex);
=20
@@ -188,10 +188,10 @@ static int imx_scu_ocotp_write(void *context, unsigne=
d int offset,
 	int ret;
=20
 	/* allow only writing one complete OTP word at a time */
-	if ((bytes !=3D 4) || (offset % 4))
+	if (bytes !=3D 4)
 		return -EINVAL;
=20
-	index =3D offset >> 2;
+	index =3D offset;
=20
 	if (in_hole(context, index))
 		return -EINVAL;
--=20
2.16.4