From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1F533438B3 for ; Mon, 8 Jun 2026 10:50:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780915855; cv=none; b=SCOdipGOukb/K1Ukg7ES+BFnE/KrZin8LKmzhvf6LONR0XnMErLJoKq5aaQ8YtXOiKAv2W8Y6r3JnR5ZXlhgkSOLsFFKG1IhWV/ZxFoKViC20/AqUX3Apk3+aTZ9H+d9I6AbGDmDuzPnQWewMfgnSUG1ASuHiDSxxFZ60kUgN14= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780915855; c=relaxed/simple; bh=82tOqhMxMqDMa92MhjlNmFuJ21oVmwMx7617WZCwNpU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qXGRvT4Xy/tn9Lpbk0tvFMbJlmEDxYNK3n4imhPMJ/eGU7YqY3guZ9cYbua4mU7Qx++kvSBayGMrflITytEQjBQNK9g2ZT5oqYR9geNvYeK8kgLqV1eNbo77+Anj5WZk+4/2ZFh9fp5yxQNvgx/3R0vCTrKolKjMJryr7vgK7rg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=DFLRMLKk; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=T8nXA72J; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="DFLRMLKk"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="T8nXA72J" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6586OtjQ2384508 for ; Mon, 8 Jun 2026 10:50:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= N4obobFwXe+ZvslbSpMidwSTHXcyAz/tF/irAKCEVyw=; b=DFLRMLKk18svRImJ YbSNuKXpVeYhnoQC/xZGYgAPsHSmE6c+2TGOH/D9cm3sGjzI7bIjGjwMIA0uczm4 r3DjudcrqPz1SAZiWrdJKO9TvrS871936NGmgRgHWUf/edZpVhTFFruO43YvOIxn iHsH78WC12Ds21Vr3Gi+nDQUSjMnP7pUkKTnG3dIVn8kD22gXg2iw4SMGnePOZkd IPbkY/mmtwHrKA6K2+g4Ki1Ir9qoVzjGq/kYMTo+XICJg24Zf7g9KnlBXztS8l2j ektdzhS5+ElwWotwa+40j3uEoRJH0k6qrCot85rjOQXdApE5N3umoScBEWmN27Gm md2A+g== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4embs1fb7u-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 08 Jun 2026 10:50:53 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51776d4355cso125290201cf.0 for ; Mon, 08 Jun 2026 03:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780915852; x=1781520652; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=N4obobFwXe+ZvslbSpMidwSTHXcyAz/tF/irAKCEVyw=; b=T8nXA72JZMotAU4iQcBZ69peJ1Dx8NafLsYP8Z/ArUIa2477HXbDk5y1bYAK8P+v64 1bPIPy29xHgtsRg4LbRvnvpq6e0vujNW6rTKZzKPsfjp/5QImnA1XKUUNwgexiaheu1Z 9Q7VgdF0lqHJHCA7Smde3NIgKs76Bzqbppc8i2Sgk6T8E7FnI8DCJpWopbuuDKuUrORw 1VxtfkQT2p5Zdx2WPNILlPRf9/TyaDsiU3lRp/x+KMyE7zj5vqY13dAbdGOIAK7/cBFt MAl8FSTNYxDKPmeqPPNBGOAbxNwDoBAZxSUc9ouVP2hH0KBdiVzF/c9HIdKtpzxkbTql 30gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780915852; x=1781520652; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=N4obobFwXe+ZvslbSpMidwSTHXcyAz/tF/irAKCEVyw=; b=lT+9ggntyUXLqi6UjqtHSwKR9wxchCwplQgBqT86dvCOYrBLG3T/aPXONICeaOPXxz DH364sLEPvenytIf2kHUoYm5TzSAC7xdSL99IWQMEOQp4Cq1sIY3BXwF2HvG1MmxyKla /IWulHgwUk/Y/hWhPxGpKWhMuSpEhYkLpPhAwUc2FvBB0OX7BFGzX2LhmZW1N/35iLlS K2SjMTY5Zhid3SBdicQ/1WNqw+xRX/K9VPFsoO+tnpyAD96msJ9fbnqOsY7kW/Mws5wW eWPcUZrlWQ4zY5+kCgAMLiRaIVJma0nvCbHZ71sgUGUSNYyUMZmZrU/p3OtVlYc1X2Le hnXA== X-Forwarded-Encrypted: i=1; AFNElJ+BerdOmV7J6X8nzMqiIAMBLOnCccRoghkBaycounblafLvi2hvH5V9NuRHqQrLaIKkaSDbC3/XNDopdMk=@vger.kernel.org X-Gm-Message-State: AOJu0YxYmcjxEPzyTAnFzNFxr2rAHyyg8qAoE3GC3pOs4r2cByDiyOST SdCB4soAo1TlaoRlKwFD6McqyqQXQKOQCQghpCg9NJA1zwzAHYhKjQwBuThn92itnS+guzIwaRc hk2WGcI5IecenP+ApIeJ03mrS5hIU8PR0RYYoYTc8EjEc+Kyt8kIra8lJOrzPlTwLfuk= X-Gm-Gg: Acq92OG2ifYTg0T/fbv2jsuCQEAOhpNUq+wGRsFrOYEVz2vcmRSuCgSC07ojkAYaPkB LUtY5BwjVfTwG3e69f5zk8mTiDm7g1e6HIQUMReM08IFZMDiYv+lLgLo3Wakh86nD932vUE5yY8 6O043Ynz4Ow/VO+9Sr+rTAGoL19U4Piy9g+uGfzsxHSXCqES+d/skas30gShMDnvOKEsB7PQm4V NQAZk39EsDpN+EeqyidqwxFTGF/+jKT9T0A88XbJgcSZqzLG5jSUw1Y6BLIs9ylUIdjWZEYfd5h ZpdcIPNrYvcjraNpthXC0EzMkU9rC/U6lqErqGz5NSLuqJ15WbbAN3B5As4PGMMh8JPKDi8lQP8 SKOklMmcT/raRa0Saobg8Nlgb3L+TfJNOHmKpe954kKoQ4dDZnzsvxjuw0Z9ulsVOUA+oSQy7gf r43fEzB55exPWf5rDFiboN/U2lUh15f7h0alavXfNkh8Q23erCk6GtZGWsGAsEp4VjYwT+g8AZw DPx51Y7gKge X-Received: by 2002:a05:622a:284:b0:517:88cf:5cb with SMTP id d75a77b69052e-517986737ddmr140531871cf.7.1780915851906; Mon, 08 Jun 2026 03:50:51 -0700 (PDT) X-Received: by 2002:a05:622a:284:b0:517:88cf:5cb with SMTP id d75a77b69052e-517986737ddmr140531451cf.7.1780915851344; Mon, 08 Jun 2026 03:50:51 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com ([2a01:e0a:830:450:cc96:22ae:323b:9eff]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bf051e9aa33sm850399866b.24.2026.06.08.03.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 03:50:50 -0700 (PDT) From: Loic Poulain Date: Mon, 08 Jun 2026 12:50:41 +0200 Subject: [PATCH v3 4/7] block: implement NVMEM provider Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260608-block-as-nvmem-v3-4-82681f50aa35@oss.qualcomm.com> References: <20260608-block-as-nvmem-v3-0-82681f50aa35@oss.qualcomm.com> In-Reply-To: <20260608-block-as-nvmem-v3-0-82681f50aa35@oss.qualcomm.com> To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Jens Axboe , Johannes Berg , Jeff Johnson , Bartosz Golaszewski , Marcel Holtmann , Luiz Augusto von Dentz , Balakrishna Godavarthi , Rocky Liao , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Srinivas Kandagatla , Andrew Lunn , Heiner Kallweit , Russell King , Saravana Kannan Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-block@vger.kernel.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, daniel@makrotopia.org, Loic Poulain X-Mailer: b4 0.14.2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA4MDEwMSBTYWx0ZWRfX5aZTQWnFyyTT J0Ij0w1cp0ZGasN/0G0xa6dH3e19SueuNZz5sAWmi1CivkqdA386sd4IGQndaG9iESs1m8JKkqq ZoSS0hHOclwTsZR5yOdVTC1iVsHg8PKIUkIKlIvmZPzI+NZytJQ2Azqk+10zXotYUbIcezc2/VN n/n7xfQm5HZaXDYlYmH18ymxvO+Fdi5+cXn4ySQgWBew2/i2DDLhYF9rDuN42xbXNnc9EV3H3wN jONQk/QLp0N1pO/pnajtyGpMQzApoy+5M3Gk/+MCeaQl6x/qNk0Ee1H05eOF2whnEqPpstYlCNV 9iDMxkFN6HeyAvoh+RP0MCaUOViPEqejv9um0XipQugFb/MVfbSFzqfXWCX4PI/LkDacCTZG+3b 47o6EksWfxyN50OoqB3ToO/0ldltbgBn/wTRCvwv7sbcrb+nytBfPIad7WTnpmBsJwAqGuS+6KY 65NnVZnW7gb5wHL9O0Q== X-Authority-Analysis: v=2.4 cv=CeY4Irrl c=1 sm=1 tr=0 ts=6a269e8d cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=VT4XjZGOAAAA:8 a=EUspDBNiAAAA:8 a=71DuYGxFrHUPmPLwgxgA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 a=6CpsfURP9XNmmWg3j1mJ:22 X-Proofpoint-ORIG-GUID: 0x5AHOTYU7y4XeVjfF3mdSRC9iPHvVy0 X-Proofpoint-GUID: 0x5AHOTYU7y4XeVjfF3mdSRC9iPHvVy0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-08_02,2026-06-05_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 adultscore=0 priorityscore=1501 spamscore=0 malwarescore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606080101 From: Daniel Golle On embedded devices using an eMMC it is common that one or more partitions on the eMMC are used to store MAC addresses and Wi-Fi calibration EEPROM data. Allow referencing the partition in device tree for the kernel and Wi-Fi drivers accessing it via the NVMEM layer. To safely defer the freeing of the provider private data until all consumers have released their cells, a nvmem_dev() accessor is added to the NVMEM core to expose the struct device embedded in struct nvmem_device. This allows registering a devm action on the nvmem device itself, ensuring the private data outlives any active cell references. Signed-off-by: Daniel Golle Co-developed-by: Loic Poulain Signed-off-by: Loic Poulain --- block/Kconfig | 9 +++ block/Makefile | 1 + block/blk-nvmem.c | 171 +++++++++++++++++++++++++++++++++++++++++ drivers/nvmem/core.c | 13 ++++ include/linux/nvmem-consumer.h | 6 ++ 5 files changed, 200 insertions(+) diff --git a/block/Kconfig b/block/Kconfig index 15027963472d7b40e27b9097a5993c457b5b3054..0b33747e16dc33473683706f75c92bdf8b648f7c 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -209,6 +209,15 @@ config BLK_INLINE_ENCRYPTION_FALLBACK by falling back to the kernel crypto API when inline encryption hardware is not present. +config BLK_NVMEM + bool "Block device NVMEM provider" + depends on OF + depends on NVMEM + help + Allow block devices (or partitions) to act as NVMEM providers, + typically used with eMMC to store MAC addresses or Wi-Fi + calibration data on embedded devices. + source "block/partitions/Kconfig" config BLK_PM diff --git a/block/Makefile b/block/Makefile index 7dce2e44276c4274c11a0a61121c83d9c43d6e0c..d7ac389e71902bc091a8800ea266190a43b3e63d 100644 --- a/block/Makefile +++ b/block/Makefile @@ -36,3 +36,4 @@ obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += blk-crypto.o blk-crypto-profile.o \ blk-crypto-sysfs.o obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o obj-$(CONFIG_BLOCK_HOLDER_DEPRECATED) += holder.o +obj-$(CONFIG_BLK_NVMEM) += blk-nvmem.o diff --git a/block/blk-nvmem.c b/block/blk-nvmem.c new file mode 100644 index 0000000000000000000000000000000000000000..99c7728fb7bccdc2216780a73a89a9210f925049 --- /dev/null +++ b/block/blk-nvmem.c @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * block device NVMEM provider + * + * Copyright (c) 2024 Daniel Golle + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + * + * Useful on devices using a partition on an eMMC for MAC addresses or + * Wi-Fi calibration EEPROM data. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "blk.h" + + +/* List of all NVMEM devices */ +static LIST_HEAD(nvmem_devices); +static DEFINE_MUTEX(devices_mutex); + +struct blk_nvmem { + struct nvmem_device *nvmem; + dev_t devt; + struct list_head list; +}; + +static int blk_nvmem_reg_read(void *priv, unsigned int from, + void *val, size_t bytes) +{ + blk_mode_t mode = BLK_OPEN_READ | BLK_OPEN_RESTRICT_WRITES; + struct blk_nvmem *bnv = priv; + size_t bytes_left = bytes; + struct file *bdev_file; + loff_t pos = from; + int ret = 0; + + bdev_file = bdev_file_open_by_dev(bnv->devt, mode, priv, NULL); + if (!bdev_file) + return -ENODEV; + + if (IS_ERR(bdev_file)) + return PTR_ERR(bdev_file); + + while (bytes_left) { + pgoff_t f_index = pos >> PAGE_SHIFT; + struct folio *folio; + size_t folio_off; + size_t to_read; + + folio = read_mapping_folio(bdev_file->f_mapping, f_index, NULL); + if (IS_ERR(folio)) { + ret = PTR_ERR(folio); + goto err_release_bdev; + } + + folio_off = offset_in_folio(folio, pos); + to_read = min(bytes_left, folio_size(folio) - folio_off); + memcpy_from_folio(val, folio, folio_off, to_read); + pos += to_read; + bytes_left -= to_read; + val += to_read; + folio_put(folio); + } + +err_release_bdev: + fput(bdev_file); + + return ret; +} + +static int blk_nvmem_register(struct device *dev) +{ + struct device_node *child, *np = dev_of_node(dev); + struct block_device *bdev = dev_to_bdev(dev); + struct nvmem_config config = {}; + struct blk_nvmem *bnv; + + /* skip devices which do not have a device tree node */ + if (!np) + return 0; + + /* skip devices without an nvmem layout defined */ + child = of_get_child_by_name(np, "nvmem-layout"); + if (!child) + return 0; + of_node_put(child); + + /* + * skip block device too large to be represented as NVMEM devices, + * the NVMEM reg_read callback uses an unsigned int offset + */ + if (bdev_nr_bytes(bdev) > UINT_MAX) + return -EFBIG; + + bnv = kzalloc_obj(*bnv); + if (!bnv) + return -ENOMEM; + + config.id = NVMEM_DEVID_NONE; + config.dev = &bdev->bd_device; + config.name = dev_name(&bdev->bd_device); + config.owner = THIS_MODULE; + config.priv = bnv; + config.reg_read = blk_nvmem_reg_read; + config.size = bdev_nr_bytes(bdev); + config.word_size = 1; + config.stride = 1; + config.read_only = true; + config.root_only = true; + config.ignore_wp = true; + config.of_node = to_of_node(dev->fwnode); + + bnv->devt = bdev->bd_device.devt; + bnv->nvmem = nvmem_register(&config); + if (IS_ERR(bnv->nvmem)) { + dev_err_probe(&bdev->bd_device, PTR_ERR(bnv->nvmem), + "Failed to register NVMEM device\n"); + kfree(bnv); + return PTR_ERR(bnv->nvmem); + } + + scoped_guard(mutex, &devices_mutex) + list_add_tail(&bnv->list, &nvmem_devices); + + return 0; +} + +static void blk_nvmem_unregister(struct device *dev) +{ + struct blk_nvmem *bnv_c, *bnv_t, *bnv = NULL; + + scoped_guard(mutex, &devices_mutex) { + list_for_each_entry_safe(bnv_c, bnv_t, &nvmem_devices, list) { + if (bnv_c->devt == dev_to_bdev(dev)->bd_device.devt) { + bnv = bnv_c; + list_del(&bnv->list); + break; + } + } + + if (!bnv) + return; + } + + nvmem_unregister(bnv->nvmem); + kfree(bnv); +} + +static struct class_interface blk_nvmem_bus_interface __refdata = { + .class = &block_class, + .add_dev = &blk_nvmem_register, + .remove_dev = &blk_nvmem_unregister, +}; + +static int __init blk_nvmem_init(void) +{ + int ret; + + ret = class_interface_register(&blk_nvmem_bus_interface); + if (ret) + return ret; + + return 0; +} +device_initcall(blk_nvmem_init); diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 311cb2e5a5c02d2c6979d7c9bbb7f94abdfbdad1..ee3481229c20b3063c86d0dd66aabbf6b5e29169 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -2154,6 +2154,19 @@ const char *nvmem_dev_name(struct nvmem_device *nvmem) } EXPORT_SYMBOL_GPL(nvmem_dev_name); +/** + * nvmem_dev() - Get the struct device of a given nvmem device. + * + * @nvmem: nvmem device. + * + * Return: pointer to the struct device of the nvmem device. + */ +struct device *nvmem_dev(struct nvmem_device *nvmem) +{ + return &nvmem->dev; +} +EXPORT_SYMBOL_GPL(nvmem_dev); + /** * nvmem_dev_size() - Get the size of a given nvmem device. * diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h index 34c0e58dfa26636d2804fcc7e0bc4a875ee73dae..ce387c89dc8e4bc1241f3b6f36be8c6c95e282ed 100644 --- a/include/linux/nvmem-consumer.h +++ b/include/linux/nvmem-consumer.h @@ -82,6 +82,7 @@ int nvmem_device_cell_write(struct nvmem_device *nvmem, const char *nvmem_dev_name(struct nvmem_device *nvmem); size_t nvmem_dev_size(struct nvmem_device *nvmem); +struct device *nvmem_dev(struct nvmem_device *nvmem); void nvmem_add_cell_lookups(struct nvmem_cell_lookup *entries, size_t nentries); @@ -220,6 +221,11 @@ static inline const char *nvmem_dev_name(struct nvmem_device *nvmem) return NULL; } +static inline struct device *nvmem_dev(struct nvmem_device *nvmem) +{ + return NULL; +} + static inline void nvmem_add_cell_lookups(struct nvmem_cell_lookup *entries, size_t nentries) {} static inline void -- 2.34.1