From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE7F6C7618B for ; Tue, 23 Jul 2019 15:33:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC31122543 for ; Tue, 23 Jul 2019 15:33:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733052AbfGWPdG (ORCPT ); Tue, 23 Jul 2019 11:33:06 -0400 Received: from mail1.bemta24.messagelabs.com ([67.219.250.5]:33338 "EHLO mail1.bemta24.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729570AbfGWPc6 (ORCPT ); Tue, 23 Jul 2019 11:32:58 -0400 Received: from [67.219.250.101] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-5.bemta.az-a.us-west-2.aws.symcld.net id 9B/55-14470-8A8273D5; Tue, 23 Jul 2019 15:32:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMIsWRWlGSWpSXmKPExsXi5LtOQHeFhnm swasnOhYPr/pbrJq6k8Vi0+NrrBZdv1YyW1zeNYfN4u/2TSwWL7aIW7QdO8bqwOGxc9Zddo9N qzrZPO5c28PmsXlJvcfGdzuYPPr/Gnh83iQXwB7FmpmXlF+RwJrxeuI05oJ1QhXLbv9ga2D8y tfFyMkhJLCaUWLTnswuRi4gew2jxJf3exghHKDE29kv2UCq2ARMJK7M2MncxcjBISIgL3HiiT dImFngCaNE32p7EFtYIFBi6uP9TCAlLAKqEvvvRoKEeQU8Jf6famYEsSUE5CRunusEm8Ip4CW x4VwJxAmeEjc+nmSDKBeUODnzCQvEdAmJgy9eMEPUqEm0zZkA1ioBdMDf3rIJjAKzkHTMQtKx gJFpFaN5UlFmekZJbmJmjq6hgYGuoaGRrqGxga6lqV5ilW6iXmmxbnlqcYmukV5iebFecWVuc k6KXl5qySZGYFykFDTF72A8O+uN3iFGSQ4mJVHeV5/MYoX4kvJTKjMSizPii0pzUosPMcpwcC hJ8Hapm8cKCRalpqdWpGXmAGMUJi3BwaMkwrtNDSjNW1yQmFucmQ6ROsWoKCXOWwKSEABJZJT mwbXB0sIlRlkpYV5GBgYGIZ6C1KLczBJU+VeM4hyMSsK87CDbeTLzSuCmvwJazAS0eK+KGcji kkSElFQDU9+S9aELds1s/lIeJLgnzG5Kl2v008mxxXvfuebIRnw9+8rPY/OZz4senFLM28rEN Wnt9xbbL4civCz5Vrblbppp/u/W1qL0c7K/qu6mTqj6e2lSl9nl8K8Mzx7d/uzBrzot0sH6ju Q/h4oH3NxGM6QNmzd0nb2nvebG/ukJonPkRE127DC/uf+q++Tpk9T6Js2smjYn5t7HgzWan79 UTVcJvfO1vmz2o+TzyWqRHGaHGQ/VxpzoPjBDSEh18rEt9hZ/9D2eTeoR7JNfLdojERWnGH6m Q72bVXT/t8yrUbP7XZU7D0pJ7XOrjBCuCD5WX9B1bg7H3/tsC21zDL4cf77+3aEn5ls2lvxPO l054YkSS3FGoqEWc1FxIgBkC3GWhgMAAA== X-Env-Sender: Jose.DiazdeGrenu@digi.com X-Msg-Ref: server-30.tower-325.messagelabs.com!1563895975!30184!1 X-Originating-IP: [66.77.174.16] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.43.9; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21640 invoked from network); 23 Jul 2019 15:32:56 -0000 Received: from owa.digi.com (HELO MCL-VMS-XCH01.digi.com) (66.77.174.16) by server-30.tower-325.messagelabs.com with ECDHE-RSA-AES256-SHA384 encrypted SMTP; 23 Jul 2019 15:32:56 -0000 Received: from MTK-SMS-XCH04.digi.com (10.10.8.198) by MCL-VMS-XCH01.digi.com (10.5.8.49) with Microsoft SMTP Server (TLS) id 14.3.468.0; Tue, 23 Jul 2019 10:32:55 -0500 Received: from DOR-SMS-XCH01.digi.com (10.49.8.99) by MTK-SMS-XCH04.digi.com (10.10.8.198) with Microsoft SMTP Server (TLS) id 14.3.468.0; Tue, 23 Jul 2019 10:32:54 -0500 Received: from localhost.localdomain (10.101.2.92) by dor-sms-xch01.digi.com (10.49.8.99) with Microsoft SMTP Server (TLS) id 14.3.468.0; Tue, 23 Jul 2019 17:32:52 +0200 From: Jose Diaz de Grenu To: CC: , , , , , , , Subject: [PATCH 2/2] nvmem: imx-ocotp: allow reads with arbitrary size and offset Date: Tue, 23 Jul 2019 17:32:43 +0200 Message-ID: <1563895963-19526-3-git-send-email-Jose.DiazdeGrenu@digi.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563895963-19526-1-git-send-email-Jose.DiazdeGrenu@digi.com> References: <1563895963-19526-1-git-send-email-Jose.DiazdeGrenu@digi.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.101.2.92] Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently the driver only allows to read 32 aligned 32-bit chunks. This is inconvenient when defining nvmem-cells, as they are rarely a multiple of 32 bits in size, and that makes the nvmem-consumer hardcode offsets and masks to extract the real value. Remove the limitation but keep reading in 32-bit chunks from the hardware to ensure there is no change in the behaviour. Signed-off-by: Jose Diaz de Grenu --- drivers/nvmem/imx-ocotp.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c index dc86d863563a..9590eeab85d8 100644 --- a/drivers/nvmem/imx-ocotp.c +++ b/drivers/nvmem/imx-ocotp.c @@ -121,16 +121,8 @@ static int imx_ocotp_read(void *context, unsigned int offset, void *val, size_t bytes) { struct ocotp_priv *priv = context; - unsigned int count; - u32 *buf = val; + u8 *buf = val; int i, ret; - u32 index; - - index = offset >> 2; - count = bytes >> 2; - - if (count > (priv->params->nregs - index)) - count = priv->params->nregs - index; mutex_lock(&ocotp_mutex); @@ -147,9 +139,9 @@ static int imx_ocotp_read(void *context, unsigned int offset, goto read_end; } - for (i = index; i < (index + count); i++) { - *buf++ = readl(priv->base + IMX_OCOTP_OFFSET_B0W0 + - i * IMX_OCOTP_OFFSET_PER_WORD); + for (i = offset; i < (bytes + offset); i++) { + u32 word_val = readl(priv->base + IMX_OCOTP_OFFSET_B0W0 + + (i >> 2) * IMX_OCOTP_OFFSET_PER_WORD); /* 47.3.1.2 * For "read locked" registers 0xBADABADA will be returned and @@ -157,9 +149,14 @@ static int imx_ocotp_read(void *context, unsigned int offset, * software before any new write, read or reload access can be * issued */ - if (*(buf - 1) == IMX_OCOTP_READ_LOCKED_VAL) + if (word_val == IMX_OCOTP_READ_LOCKED_VAL) imx_ocotp_clr_err_if_set(priv->base); + + word_val >>= (i % 4) * 8; + + *buf++ = (u8) (word_val & 0xFF); } + ret = 0; read_end: @@ -415,8 +412,8 @@ static int imx_ocotp_write(void *context, unsigned int offset, void *val, static struct nvmem_config imx_ocotp_nvmem_config = { .name = "imx-ocotp", .read_only = false, - .word_size = 4, - .stride = 4, + .word_size = 1, + .stride = 1, .reg_read = imx_ocotp_read, .reg_write = imx_ocotp_write, };