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 2DA1BCD13DA for ; Tue, 5 May 2026 07:25:26 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=URyjBZx93D93GEfbZa0g9Emw0SDcKQggXo+MwOLy0Bk=; b=nB3/tCG0KR++DI7JHeSNKkPpoi E99GGXNycn0s8g9x4S8SlKaQijGEUHCmrwGa3pLwIZH1WnsVpcBs+4BYHNv5s6Q2DW/M+HxOZ3iwA FLj+368c9coSWJsAQSQ4e9QN/JoNLteNZkwl0xg0gbzE9N8SVW0RbvmLRBa3zKxjcyijycuFodMJA kjPNlU32oqmmbbg7by6hnmF8HIgB1iuaNPu1hQoNK9br04PwD9YzTbwUtDhwYXnG9+Sn3SwGd3UZi YTQ3bX/mq7lBGVvmqTZaSxrm4ECeIOhsKV7cEcHEPBkSdkuBB8JuaWdMoyHIuzX48Fd9AG+uGTCpw OzOQKRoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wKA9i-0000000FP8y-1nba; Tue, 05 May 2026 07:25:22 +0000 Received: from galois.linutronix.de ([2a0a:51c0:0:12e:550::1]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wKA9f-0000000FP5q-0bV5; Tue, 05 May 2026 07:25:20 +0000 From: Gregor Herburger DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1777965915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=URyjBZx93D93GEfbZa0g9Emw0SDcKQggXo+MwOLy0Bk=; b=fvJoFP2YwU8OJjgfp2gUxm/AdI4vA58NqLxovOiocyVnw2hMAyWD4CwfdiL+pM3kin0tK0 MLllV2Z9PcU7SUKpewFFBHnUosVWCt3fUPforli8TJJP4gDA0i/UyIO/StAy7bB1k1zIFu qJz55xzVELnb4CsEux4aVFSUU5/Wg+pTntwucWy05rJDb7s0KQo/x7h9eYu4YzAQe0lgMN 57QKirOEF/pQL2WZUOuYCWXbRPnvDRQOEg2K0vLooNfDx6I07zw4Qob89NCm3A6kNEctRw ab3+0a43qRmx03VvFsSL+ya0N00k0xk8mfoAbzRIs+s8rbKknk6Abfx8bJFXZQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1777965915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=URyjBZx93D93GEfbZa0g9Emw0SDcKQggXo+MwOLy0Bk=; b=ytI1+iJCv+/PDPNDLv6Ibs/ris3EBzu6MqJO1bGqk0SJlvmWcn39cTPuLkFFsU4F7I4Eje VbGGNyPC8yXCDRCQ== Date: Tue, 05 May 2026 09:25:10 +0200 Subject: [PATCH v2 2/4] nvmem: Add the Raspberry Pi OTP driver MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260505-rpi-otp-driver-v2-2-e9176ec72837@linutronix.de> References: <20260505-rpi-otp-driver-v2-0-e9176ec72837@linutronix.de> In-Reply-To: <20260505-rpi-otp-driver-v2-0-e9176ec72837@linutronix.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Eric Anholt , Stefan Wahren , Srinivas Kandagatla , Kees Cook , "Gustavo A. R. Silva" Cc: devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Gregor Herburger X-Developer-Signature: v=1; a=ed25519-sha256; t=1777965913; l=5902; i=gregor.herburger@linutronix.de; s=20260226; h=from:subject:message-id; bh=a2ptnuNqX1aUnQDiinu8cyfWAbSy9akuDiv3x+rEw6s=; b=nDkj09t59fRWI2S46hN+5ZHj1mMpqm3hU00GHlzzxxJp3fJ6aUQHhXuDKzpJvQGn1GP9VCOkM HA63pZVRZKHDEInBDEUySYSeYyvrIp/AJ2q3bdRtR9BZkxlm4KMqbfs X-Developer-Key: i=gregor.herburger@linutronix.de; a=ed25519; pk=u72Lv7+/lS5CC1hmSrb17lv/6CK7HBh4Lvz77PHA5LM= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260505_002519_343708_F4E87052 X-CRM114-Status: GOOD ( 20.81 ) 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 Raspberry Pis have OTP registers which can be accessed through the videocore firmware. Add a nvmem driver to support these OTP registers. Signed-off-by: Gregor Herburger --- drivers/nvmem/Kconfig | 10 +++ drivers/nvmem/Makefile | 1 + drivers/nvmem/raspberrypi-otp.c | 119 +++++++++++++++++++++++++++++ include/soc/bcm2835/raspberrypi-firmware.h | 9 +++ 4 files changed, 139 insertions(+) diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig index 74ddbd0f79b0..4ecfb0dfbe6b 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -483,4 +483,14 @@ config NVMEM_QORIQ_EFUSE This driver can also be built as a module. If so, the module will be called nvmem_qoriq_efuse. +config NVMEM_RASPBERRYPI_OTP + tristate "Raspberry Pi OTP support" + depends on RASPBERRYPI_FIRMWARE || COMPILE_TEST + help + This driver provides access to the Raspberry Pi OTP memory via the + nvmem subsystem. The driver supports the customer OTP as well as the + device specific private key OTP (BCM2712 only). + + This driver can also be built as a module. If so, the module + will be called raspberrypi-otp. endif diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile index 7252b8ec88d4..8ca2095e068f 100644 --- a/drivers/nvmem/Makefile +++ b/drivers/nvmem/Makefile @@ -95,3 +95,4 @@ obj-$(CONFIG_NVMEM_ZYNQMP) += nvmem_zynqmp_nvmem.o nvmem_zynqmp_nvmem-y := zynqmp_nvmem.o obj-$(CONFIG_NVMEM_QORIQ_EFUSE) += nvmem-qoriq-efuse.o nvmem-qoriq-efuse-y := qoriq-efuse.o +obj-$(CONFIG_NVMEM_RASPBERRYPI_OTP) += raspberrypi-otp.o diff --git a/drivers/nvmem/raspberrypi-otp.c b/drivers/nvmem/raspberrypi-otp.c new file mode 100644 index 000000000000..83624aa85bb3 --- /dev/null +++ b/drivers/nvmem/raspberrypi-otp.c @@ -0,0 +1,119 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include +#include +#include +#include + +struct rpi_otp_priv { + struct rpi_firmware *fw; + struct device *dev; + u32 read_tag; + u32 write_tag; +}; + +struct rpi_otp_header { + u32 start; + u32 count; + u32 data[] __counted_by(count); +}; + +static int rpi_otp_read(void *context, unsigned int offset, void *buf, size_t bytes) +{ + struct rpi_otp_priv *priv = context; + struct rpi_otp_header *fwbuf; + u32 count = bytes / 4; + int ret; + + fwbuf = kzalloc(struct_size(fwbuf, data, count), GFP_KERNEL); + if (!fwbuf) + return -ENOMEM; + + fwbuf->start = offset / 4; + fwbuf->count = count; + + ret = rpi_firmware_property(priv->fw, priv->read_tag, fwbuf, + sizeof(struct rpi_otp_header) + bytes); + if (ret) + goto out; + + memcpy(buf, fwbuf->data, bytes); + +out: + kfree(fwbuf); + return ret; +} + +static int rpi_otp_write(void *context, unsigned int offset, void *val, size_t bytes) +{ + struct rpi_otp_priv *priv = context; + struct rpi_otp_header *fwbuf; + u32 count = bytes / 4; + int ret; + + fwbuf = kzalloc(struct_size(fwbuf, data, count), GFP_KERNEL); + if (!fwbuf) + return -ENOMEM; + + fwbuf->start = offset / 4; + fwbuf->count = count; + memcpy(fwbuf->data, val, bytes); + + ret = rpi_firmware_property(priv->fw, priv->write_tag, fwbuf, + sizeof(struct rpi_otp_header) + bytes); + + kfree(fwbuf); + return ret; +} + +static int rpi_otp_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct nvmem_device *nvmem; + struct rpi_otp_priv *priv; + const struct rpi_otp_driver_data *data; + struct nvmem_config config = { + .read_only = false, + .word_size = 4, + .stride = 4, + .reg_read = rpi_otp_read, + .reg_write = rpi_otp_write, + .id = NVMEM_DEVID_NONE, + }; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + data = dev_get_platdata(dev); + if (!data) + return -ENODEV; + + priv->fw = dev_get_drvdata(dev->parent); + priv->dev = dev; + priv->read_tag = data->read_tag; + priv->write_tag = data->write_tag; + config.dev = dev; + config.priv = priv; + config.name = data->name; + config.size = data->size; + + nvmem = devm_nvmem_register(dev, &config); + if (IS_ERR(nvmem)) + return dev_err_probe(dev, PTR_ERR(nvmem), "error registering nvmem config\n"); + + return 0; +} + +static struct platform_driver raspberry_otp_driver = { + .probe = rpi_otp_probe, + .driver = { + .name = "raspberrypi-otp", + }, +}; +module_platform_driver(raspberry_otp_driver); + +MODULE_AUTHOR("Gregor Herburger "); +MODULE_DESCRIPTION("Raspberry Pi OTP driver"); +MODULE_LICENSE("GPL"); diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h index e1f87fbfe554..ae73c9cd19ba 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -92,6 +92,8 @@ enum rpi_firmware_property_tag { RPI_FIRMWARE_SET_POE_HAT_VAL = 0x00030050, RPI_FIRMWARE_NOTIFY_XHCI_RESET = 0x00030058, RPI_FIRMWARE_NOTIFY_DISPLAY_DONE = 0x00030066, + RPI_FIRMWARE_GET_PRIVATE_OTP = 0x00030081, + RPI_FIRMWARE_SET_PRIVATE_OTP = 0x00038081, /* Dispmanx TAGS */ RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE = 0x00040001, @@ -174,6 +176,13 @@ struct rpi_firmware_clk_rate_request { .id = cpu_to_le32(_id), \ } +struct rpi_otp_driver_data { + const char *name; + u32 read_tag; + u32 write_tag; + int size; +}; + #if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE) int rpi_firmware_property(struct rpi_firmware *fw, u32 tag, void *data, size_t len); -- 2.47.3