From patchwork Thu Oct 22 07:44:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11850455 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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 437A7C4363A for ; Thu, 22 Oct 2020 07:51:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C0112222E9 for ; Thu, 22 Oct 2020 07:51:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GIl34QDW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="NkG6QCCB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0112222E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=Bi6qJR9cgSCqrqKgEJ2F2P3rIpdLrxUdRgmOK1exz6g=; b=GIl34QDWOCl/dljfaRsc9H9Zmk 5MEv9ovbe3bIbboh5rESG6aPikJVA9v2LAVkxNsgyqQOODjfcC3GpOlA/AOVnnYa5wC03oVLt+4uL m/JV2vn5K/upySdbI6JUxkI38c34GVjbh95Mp8a1dZ8lXqMPDmvK4SSEGPY0Vu660QrG+tZ580sAp a0gFB42sJwiGYaZHuQgvd9GDf5ck47vESqWuxJ86mKu/xrO9y6uIfLN7QRFv/w5WS9moD7cz4hmy4 xvVqeIa4+NLvavNfJ83YQOOEYRCq0i0aGO3w31bu42zyPe1k5L50lh1kxfL/jCbuGk2J1cV7p8fOE QlkDT2LQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVVML-0006hN-0t; Thu, 22 Oct 2020 07:50:05 +0000 Received: from mail-db8eur05on2047.outbound.protection.outlook.com ([40.107.20.47] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVVMI-0006gX-6U for linux-arm-kernel@lists.infradead.org; Thu, 22 Oct 2020 07:50:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dmS/b+O8uVu2IV8L9V3hSfnX26pwJV0Qxid/bBnikmy6PWuki4pt2+6ul/e/b68MhA+mO0y1y3aAQMtqYLFS5shWOO/GTEmkR7tsruvx5KazvC8Gb29MxAdAyTRt0VzfNx0VL7aRlIV+9C82MG2v6HnEx0BpsunUKst6vtIFW88SHm3cwZd5+Gu5U1LxBROCa8NZj0hv6Vtb90VyTXJA84CIQyCTxUY2EN8qMs5WFWuiHAk5aDR1uthz0sEsWJn8RcLHT0pYq+2l0YeQBykibPmulnd8et6cv+5eH0MLGdgnUMWe0l21CXcB6K6cYcE5UK/JXPCzshNsK54bWFkunA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MxnKeFPk+ivLhz6ZWfA5yHjkSK8GaQVbndAIQaum2TM=; b=BOvHF6wc0MSVEeqWgOXkWXuiIYaDMG9ZMin+4xQQ2glPX+RC1hVumjQ7xujPkmC3eBiH64NCHCoX7jO1fJ1agjkkNwBPahULL6VMLm0d7DwHVhRavfrm1Q0RA4edHOmuVCeIMDcHZo6XafHZ/XxQEcxYTpDKv4lbjWBR2vzK4Y2kqT+d00oLPfA2r7vNL91bpc/tyk45vW41Ps56tstfKghllbMdIp8BbFIaKqpteeLKQTNBSDbH4FMLJZ670AYUAH4g51y5RnTi9dFLPGRM8UACL4N+SCglVcdLI6QEFH9/pXMRQmajxLR6dPgEPhDFzKL6Sl+gR3TW5sHenUDA/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MxnKeFPk+ivLhz6ZWfA5yHjkSK8GaQVbndAIQaum2TM=; b=NkG6QCCBsgKhTKGu9vBMx69Z1ya9IpMC8jV3U9UplXRBcOCBtcKBlAHHHuza9Vbwju3Y35Ib7cSt79zbi1eOGGm3+2KvDA2WbcJp0tAy8TiNm+Mx3VpaGNXy0sWmst2PloF8keD3GMKGQm5GlmgQXVxi8woSxlAr18svf3QHXE4= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB8PR04MB7050.eurprd04.prod.outlook.com (2603:10a6:10:129::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Thu, 22 Oct 2020 07:49:59 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::ec42:b6d0:7666:19ef%8]) with mapi id 15.20.3477.028; Thu, 22 Oct 2020 07:49:59 +0000 From: peng.fan@nxp.com To: shawnguo@kernel.org, s.hauer@pengutronix.de, srinivas.kandagatla@linaro.org Subject: [PATCH] nvmem: imx-ocotp: add support for the unaliged word count Date: Thu, 22 Oct 2020 15:44:43 +0800 Message-Id: <1603352683-23918-1-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR02CA0103.apcprd02.prod.outlook.com (2603:1096:4:92::19) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR02CA0103.apcprd02.prod.outlook.com (2603:1096:4:92::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3499.18 via Frontend Transport; Thu, 22 Oct 2020 07:49:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: caf179ac-41c8-494c-c645-08d8765f1347 X-MS-TrafficTypeDiagnostic: DB8PR04MB7050: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3yiFBsGGIpR8wCFP4wj/DejR+V7+gwyLbQueZYhGGlxoZooHdU3515Tz6wmRm1VWCiw/0JqgRKgv1ENJ3evjhsuzmBEiQTOFTZ1M9VyoTQNQUo7ToRgTLp4Y/2GWtbI5zp4ApyDeRn/n0mtptEoQWAeTNYhinaRoacE/+yP6SGCebi/htJeAyQ7Z65XdcZ/f9K0eGLNP3sHB2C9Qu0E1/wdkoazfipg80JYR0yjkkUwkGq3rAJExohPtgnelyWGA8+NSSDkOgj1U2cd8WFczP2i/gitW1iwcdfjB1jCYOZ/4MExc/1CjxM6OFgjzBnfXQzGF4ZGV9SdV4WYBoY4Iemvw2Czt7DqMk4GrC4LQd4/xnyS9OscoGMfJOcO33dqy X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(39860400002)(346002)(376002)(366004)(136003)(6486002)(6506007)(66556008)(86362001)(2616005)(6666004)(8676002)(956004)(4326008)(8936002)(36756003)(316002)(69590400008)(66946007)(2906002)(66476007)(6512007)(478600001)(186003)(9686003)(52116002)(83380400001)(5660300002)(16526019)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: THNT9BoyYdCSSP7qM7aHLx1WMUHAn7GumowlpQVKbJ8irbxCEYG/+CdgeSXdqrx67ao8Yy2GQ/aUmekOGHTtAFPwpBPIiYvE1JrWrQ3j7vOYoJDzxpKaSaA2nQjFrIyl+MUTGZfbJMIVIK6IwosQWC1TwJqFawXcka6Y3/2mUC6wbnXy5hrCd1xHxSzyT7f+aoPP6npza0U8F0f+IBx+fitH/KQyTdNmKZTnh346vq8QA2kkQrM5qocYSRWwuBESBuQsvmSt1Xqoma32Xtqx3hl9tIeoIo/fRRRdUJlyiDAPs0bTxz5e9HT0yM+l2j8VLNR4bJiAzEtnbjQaKd2tKo8cDDAEU8CWFPcKT6HA8Lnsvllldr/Z+jgKpFkOLitc2EjiZ7dTmKmuVKbsdRgustJcJPokHPW6qcNcbvlaTnRKfYzizTVMJvA8MIUfcxOLalR/BfuZhpau7nYUJKfyiNTb6fTwP+x90aPkHZXezCGHw54c9CLCwk8qBbh8RGKNIEVd4v1AvZlbWe8h256OIjR34QcyAItr/5Z8ySLACYlH0OOv1DJcgRSUzry1ghRp6RzLHHsYDcGYCpH81RBYlzwUWElF510en8KpDr6RJ57QlRFAkWLaPuhudd+1JOeGY4W4d+WVOSOHaEdHpt5DIg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: caf179ac-41c8-494c-c645-08d8765f1347 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2020 07:49:59.2285 (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: NVc6YF8zXC83H71L3U1L/c5aZ0/nCEGyqGoWCwBhXfyN6kxfKanwH6uSHC7UbR/28H8tLQZv7kbYiL6eBz9hVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7050 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201022_035002_274766_AE5C1B1E X-CRM114-Status: GOOD ( 19.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Fan , linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peng Fan When offset is not 4 bytes aligned, directly shift righty by 2 bits will cause reading out wrong data. Since imx ocotp only supports 4 bytes reading once, we need handle offset is not 4 bytes aligned and enlarge the bytes to 4 bytes aligned. After reading finished, copy the needed data from buffer to caller and free buffer. Signed-off-by: Peng Fan --- drivers/nvmem/imx-ocotp.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c index 7a1ebd6fd08b..08f41328cc71 100644 --- a/drivers/nvmem/imx-ocotp.c +++ b/drivers/nvmem/imx-ocotp.c @@ -4,6 +4,8 @@ * * Copyright (c) 2015 Pengutronix, Philipp Zabel * + * Copyright 2019 NXP + * * Based on the barebox ocotp driver, * Copyright (c) 2010 Baruch Siach , * Orex Computed Radiography @@ -158,22 +160,30 @@ static int imx_ocotp_read(void *context, unsigned int offset, { struct ocotp_priv *priv = context; unsigned int count; - u32 *buf = val; + u8 *buf, *p; int i, ret; - u32 index; + u32 index, num_bytes; index = offset >> 2; - count = bytes >> 2; + num_bytes = round_up((offset % 4) + bytes, 4); + count = num_bytes >> 2; if (count > (priv->params->nregs - index)) count = priv->params->nregs - index; + p = kzalloc(num_bytes, GFP_KERNEL); + if (!p) + return -ENOMEM; + mutex_lock(&ocotp_mutex); + buf = p; + ret = clk_prepare_enable(priv->clk); if (ret < 0) { mutex_unlock(&ocotp_mutex); dev_err(priv->dev, "failed to prepare/enable ocotp clk\n"); + kfree(p); return ret; } @@ -184,7 +194,7 @@ static int imx_ocotp_read(void *context, unsigned int offset, } for (i = index; i < (index + count); i++) { - *buf++ = readl(priv->base + IMX_OCOTP_OFFSET_B0W0 + + *(u32 *)buf = readl(priv->base + IMX_OCOTP_OFFSET_B0W0 + i * IMX_OCOTP_OFFSET_PER_WORD); /* 47.3.1.2 @@ -193,13 +203,21 @@ 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 (*((u32 *)buf) == IMX_OCOTP_READ_LOCKED_VAL) imx_ocotp_clr_err_if_set(priv); + + buf += 4; } + index = offset % 4; + memcpy(val, &p[index], bytes); + read_end: clk_disable_unprepare(priv->clk); mutex_unlock(&ocotp_mutex); + + kfree(p); + return ret; } @@ -447,7 +465,7 @@ static struct nvmem_config imx_ocotp_nvmem_config = { .name = "imx-ocotp", .read_only = false, .word_size = 4, - .stride = 4, + .stride = 1, .reg_read = imx_ocotp_read, .reg_write = imx_ocotp_write, };