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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CFB99C3ABA5 for ; Wed, 30 Apr 2025 00:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=r2KkygrCEj+vv3C/Evsn0AimPuoveXKnQ51Dw8at/DU=; b=SDmbwIlj5MDhVVW/nYZtIRNUFR h9ZANEp+TpA4xZ5GjrY5b3RsWmRPFyXmRdMwqSGwc4e2Q/J1jruNujQrJ4y3QENbaicIQfH0m+DQ/ jDxoDEyekjc5lVzvJkOPsWFh9R3XNMvWHw3JU5huDg2UISCPuwVloGIi4jLBha0Pmtu2We1OZNFaX O/d+shsYoqKwkrdiz2i8g99zoOjp4y/VckY5U78fSrtLUq/pKxpU/TpIundtk/T51JfPQddk2Zq5A JefrIvvsbWei2pLYacG6k6RiWyY2tgpwq3ReM4q6LWgjkU8W/gGJN40LUlNiUINA59vHdQA6AlW/7 56Ff4gSQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u9ury-0000000BC4n-2BL2; Wed, 30 Apr 2025 00:00:10 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u9ukj-0000000BAN5-1Ab1; Tue, 29 Apr 2025 23:52:42 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 7F19743E39; Tue, 29 Apr 2025 23:52:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5713EC4CEED; Tue, 29 Apr 2025 23:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745970760; bh=ykLMS7gUdYtoJUrK25Huw4VRbIFaiCI+ESeBgVPX15M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ho5xWI4ocw15dADepZojWKjkQ9yHR5wwKv0c5dmxaOafph5SvMBHlyRzAuTEQqJhZ 8H1sXlBRaJfPBZ7RgP2M5JyiVeIzl6MxOlWxW5x+xVWIAsi7Qv45TiWoxcFVtOjQr0 4vU9QCTTsYWlg+FJTAAiYqJ/KnIHkGlmYu/49XTqatYP22qScakodG25m3kF5CwFwM DjGoUcaM1tjc1ngiLlLk3QbImATz/8xsrID/pAS/ERWUKgpgPz4rUjXvuwJjqjjo2T I894p4A8GRrE8X2gs0tQNRcH3JkBsLAjbC30qTLcI+fmje8vdCEaCGLy9nIxEzlBRP 4XIQ6erzAqI6w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Heiko Stuebner , Nicolas Frattaroli , Srinivas Kandagatla , Greg Kroah-Hartman , Sasha Levin , srini@kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 6.6 02/21] nvmem: rockchip-otp: Move read-offset into variant-data Date: Tue, 29 Apr 2025 19:52:14 -0400 Message-Id: <20250429235233.537828-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250429235233.537828-1-sashal@kernel.org> References: <20250429235233.537828-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.88 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250429_165241_372697_9C4C310F X-CRM114-Status: GOOD ( 14.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Heiko Stuebner [ Upstream commit 6907e8093b3070d877ee607e5ceede60cfd08bde ] The RK3588 has an offset into the OTP area where the readable area begins and automatically adds this to the start address. Other variants are very much similar to rk3588, just with a different offset, so move that value into variant-data. To match the size in bytes, store this value also in bytes and not in number of blocks. Signed-off-by: Heiko Stuebner Tested-by: Nicolas Frattaroli Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20250411112251.68002-2-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/nvmem/rockchip-otp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/nvmem/rockchip-otp.c b/drivers/nvmem/rockchip-otp.c index 7107d68a2f8c7..a0252ac867bf7 100644 --- a/drivers/nvmem/rockchip-otp.c +++ b/drivers/nvmem/rockchip-otp.c @@ -59,7 +59,6 @@ #define RK3588_OTPC_AUTO_EN 0x08 #define RK3588_OTPC_INT_ST 0x84 #define RK3588_OTPC_DOUT0 0x20 -#define RK3588_NO_SECURE_OFFSET 0x300 #define RK3588_NBYTES 4 #define RK3588_BURST_NUM 1 #define RK3588_BURST_SHIFT 8 @@ -69,6 +68,7 @@ struct rockchip_data { int size; + int read_offset; const char * const *clks; int num_clks; nvmem_reg_read_t reg_read; @@ -196,7 +196,7 @@ static int rk3588_otp_read(void *context, unsigned int offset, addr_start = round_down(offset, RK3588_NBYTES) / RK3588_NBYTES; addr_end = round_up(offset + bytes, RK3588_NBYTES) / RK3588_NBYTES; addr_len = addr_end - addr_start; - addr_start += RK3588_NO_SECURE_OFFSET; + addr_start += otp->data->read_offset / RK3588_NBYTES; buf = kzalloc(array_size(addr_len, RK3588_NBYTES), GFP_KERNEL); if (!buf) @@ -279,6 +279,7 @@ static const char * const rk3588_otp_clocks[] = { static const struct rockchip_data rk3588_data = { .size = 0x400, + .read_offset = 0xc00, .clks = rk3588_otp_clocks, .num_clks = ARRAY_SIZE(rk3588_otp_clocks), .reg_read = rk3588_otp_read, -- 2.39.5