Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795053993; b=EdWU2mWNqNlyDfJ8he8sXlGnCrJuv1c0QmiyPt5TUBSn92Xe0r0NEChBnbToLkndoLJw C05Y/MC/dIiTmKuAn9xuuNteyWaSXC7xEl5iwahI7DW5R8AQvhhBe8nLI7NlZy5ayr2Cj byDtvxwb3VmQj3o5OuZIk1E3CWW2wy+eoUvrjVVhYIN7R0QCEAUutduB0Gu3NwsBzqVy7 bb/jtSoJSHzNqq6sStn3ZmeX1KLgplXTGcyFsUwO5I5FGX+5D5bEoYTAz8cO2Sdgimfg5 h0HEl6jELG8juzpXfGGd1CE4ViF80wih9YGU425+AK5WCBzj443FivGo2ERR8RJtAcA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053993; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=zH3Fdb+D32OVTbk6ELbZF2ZApgGWZFR/mMfC6vad4YI=; b=ZKKvVldi/AyN+oeDIgyqGsQP/2FQnkk2TphUZaCyQEKr7m0iNLomgpbFSJabRRKVjnDo OPFDB8UeWalNCJzh4UgxEA9gAx7tsD4yvnSYUm3Xc4GQ7lGtjtP8Pw2i9asvS6uznODfZ 2vAqAul8u7rmVIuQyWURz0yE4sAljKyw4lfr5dlghsbX19bomWdjMxhoJMLb5ms74xNZj /yJIY6ZFhAy92VQrVXO05ddmfHncAi0Oq3dxLWnpiprQmZ4S7TUZKst/fLTQ+G8ad9Lpn XiIpCIYD8rnC1pIE996UPdt1lTe3bV4+hZPllVkrqz/ECjhMyrgDf5dxoNCND9cFRHQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=QiCTER8P; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F16A606A320; Thu, 19 Nov 2026 02:06:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=QiCTER8P Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFFC51F000C4; Thu, 19 Nov 2026 02:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053993; bh=zH3Fdb+D32OVTbk6ELbZF2ZApgGWZFR/mMfC6vad4YI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QiCTER8PHdUx6GF+FvD54YFAbfjJG/V/hcMuHoAxkSjkJepcet3VkFJT/dmhSbkQF NcuxBHhAoWcHcc5RYZXuJZCtzSj3YdHpII69PIlakhtx6H2fwAV1HDHR8txhPDDWeQ B0Ej72b87Jr83H4swTu6AYqxtnCi1Fist/gdb0qk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Miquel Raynal , Alexey Charkov , Srinivas Kandagatla , Sasha Levin Subject: [PATCH 5.15 1110/2214] nvmem: rockchip-otp: Serialize reads Date: Wed, 18 Nov 2026 15:46:26 +0100 Message-ID: <20261118150056.550055616@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexey Charkov [ Upstream commit 9fc6a1592d844c0397f115ee8cbd935169b9a71e ] The OTP controller is driven through a single set of registers holding a state machine which has to be stepped through for every word read, yet nothing keeps two readers out of each other's way. Concurrent reads interleave, and the outcome is either a reader bailing out: rockchip-otp 2a580000.otp: timeout during read setup or, worse, one of them silently taking delivery of the other's data. Reading two cells in parallel from userspace on RK3576 reproduces both within 150 iterations - 53 read errors and 9 corrupted results, the latter either losing their first word or, in one case, ending in the two bytes which belong to the other reader's cell - whereas the same reads issued sequentially never fail. Concurrency is not hypothetical here, as six thermal sensors source their trim values from the OTP and reach the driver straight from asynchronous driver probing. Guard the read path with a mutex. Reads are the only way into the hardware, as the driver registers no write callback, and they always run in process context, so a plain mutex spanning the whole clock-enable, read, clock-disable sequence is enough. Fixes: 755864feb729 ("nvmem: add Rockchip OTP driver") Cc: stable@vger.kernel.org Reviewed-by: Miquel Raynal Signed-off-by: Alexey Charkov Signed-off-by: Srinivas Kandagatla Link: https://patch.msgid.link/20261002101329.1084348-2-srini@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/nvmem/rockchip-otp.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/rockchip-otp.c b/drivers/nvmem/rockchip-otp.c index aaa044bb231b8..0fb8d6d800bbe 100644 --- a/drivers/nvmem/rockchip-otp.c +++ b/drivers/nvmem/rockchip-otp.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -66,6 +67,8 @@ struct rockchip_otp { void __iomem *base; struct reset_control *rst; const struct rockchip_data *data; + /* Serializes access to the OTP controller state machine */ + struct mutex mutex; struct clk_bulk_data clks[]; }; @@ -179,16 +182,21 @@ static int rockchip_otp_read(void *context, unsigned int offset, if (!otp->data || !otp->data->reg_read) return -EINVAL; + mutex_lock(&otp->mutex); + ret = clk_bulk_prepare_enable(otp->data->num_clks, otp->clks); if (ret < 0) { dev_err(otp->dev, "failed to prepare/enable clks\n"); - return ret; + goto unlock; } ret = otp->data->reg_read(context, offset, val, bytes); clk_bulk_disable_unprepare(otp->data->num_clks, otp->clks); +unlock: + mutex_unlock(&otp->mutex); + return ret; } @@ -246,6 +254,11 @@ static int rockchip_otp_probe(struct platform_device *pdev) otp->data = data; otp->dev = dev; + + ret = devm_mutex_init(dev, &otp->mutex); + if (ret) + return ret; + otp->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(otp->base)) return PTR_ERR(otp->base); -- 2.53.0