From nobody Mon Feb 9 00:55:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5EB5C0015E for ; Tue, 1 Aug 2023 18:21:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231959AbjHASVt (ORCPT ); Tue, 1 Aug 2023 14:21:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231734AbjHASVn (ORCPT ); Tue, 1 Aug 2023 14:21:43 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8815F2689 for ; Tue, 1 Aug 2023 11:21:39 -0700 (PDT) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9F357E0003; Tue, 1 Aug 2023 18:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1690914098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=un3Uwaotmlox+IhpuLnflkjcgnz89/YG1Do8CcofnC8=; b=KSm9vmu0f8IIcuOFIlEzau9XSapvbuGrbGmh2i1glN+GtLBpvJYtMLcriL7sQVfOKWyS0o PtghWB/Bn5vMHBcPOhw4J84WduNNP8bNjuuMKSVtjmaZK0sig+/YQhHXYkO/skQVsA4dVi tPbJkpVL3r0mHUfCaZPeTeKmjqe9K7sTK1gck/4Bbc/vp5CAp1SYBE7v87p+f/h5bH1eXS BPoFabs50SX8imkphZYTSwZE8aQxqKBtFjg09NStYeyj7TGiVBdvb4gLHx5tqSkrETQHnI kn31uhXsxa5z47ZpFRwqL0QMPgt7wGtHB/uvN4nMNcWNruNMK53qcQbhTU3Avw== From: Miquel Raynal To: Srinivas Kandagatla Cc: Greg Kroah-Hartman , Thomas Petazzoni , Robert Marko , Luka Perkov , Michael Walle , , Randy Dunlap , Chen-Yu Tsai , Daniel Golle , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Miquel Raynal Subject: [PATCH v7 1/7] nvmem: core: Create all cells before adding the nvmem device Date: Tue, 1 Aug 2023 20:21:26 +0200 Message-Id: <20230801182132.1058707-2-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230801182132.1058707-1-miquel.raynal@bootlin.com> References: <20230801182132.1058707-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: miquel.raynal@bootlin.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Let's pack all the cells creation in one place, so they are all created before we add the nvmem device. Signed-off-by: Miquel Raynal --- drivers/nvmem/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 3f8c7718412b..48659106a1e2 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -998,12 +998,6 @@ struct nvmem_device *nvmem_register(const struct nvmem= _config *config) if (rval) goto err_remove_cells; =20 - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); - - rval =3D device_add(&nvmem->dev); - if (rval) - goto err_remove_cells; - rval =3D nvmem_add_cells_from_fixed_layout(nvmem); if (rval) goto err_remove_cells; @@ -1012,6 +1006,12 @@ struct nvmem_device *nvmem_register(const struct nvm= em_config *config) if (rval) goto err_remove_cells; =20 + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); + + rval =3D device_add(&nvmem->dev); + if (rval) + goto err_remove_cells; + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); =20 return nvmem; --=20 2.34.1 From nobody Mon Feb 9 00:55:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4895C0015E for ; Tue, 1 Aug 2023 18:21:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232060AbjHASVw (ORCPT ); Tue, 1 Aug 2023 14:21:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231789AbjHASVo (ORCPT ); Tue, 1 Aug 2023 14:21:44 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6445D269A for ; Tue, 1 Aug 2023 11:21:41 -0700 (PDT) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5BE8CE0008; Tue, 1 Aug 2023 18:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1690914099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X3Zr5zi6oiutEUY5SskrgH9VYy6BX6UnhftLaueXlCU=; b=Qwc4xWMhuvilEC8gbcLTJ38MSm192xYthNDF4cItf+Qlz+MmsgOA28ca3z/PmVV4hIIbGo /p77PON4HbCwGxBD36wYi/Iybj1PHNX6XKCu+CIB2or+zKU8dzSw7K+i6jMWfFXwBUOuk/ EEt8umo6taoe7vA1wcbpE4gJQ85/unuyYegiy3Y4oDdL5G5q0pKO4LSajU/zZvpkyLKfNk /Nu/NYxPne1XMEZL4DBnEM2WfCtnkTMzLGdF3RsuRRDOj2EdR4WGHxAeXoH9ecUQrbT7aA jCMpph1MLWPtg9xi5MWFRe8ebWYaB8LJuMUt2V/i8lXkOBgJDOViGKs2h+m/gA== From: Miquel Raynal To: Srinivas Kandagatla Cc: Greg Kroah-Hartman , Thomas Petazzoni , Robert Marko , Luka Perkov , Michael Walle , , Randy Dunlap , Chen-Yu Tsai , Daniel Golle , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Miquel Raynal Subject: [PATCH v7 2/7] nvmem: core: Do not open-code existing functions Date: Tue, 1 Aug 2023 20:21:27 +0200 Message-Id: <20230801182132.1058707-3-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230801182132.1058707-1-miquel.raynal@bootlin.com> References: <20230801182132.1058707-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: miquel.raynal@bootlin.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use of_nvmem_layout_get_container() instead of hardcoding it. Signed-off-by: Miquel Raynal --- drivers/nvmem/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 48659106a1e2..257328887263 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -786,10 +786,10 @@ EXPORT_SYMBOL_GPL(nvmem_layout_unregister); =20 static struct nvmem_layout *nvmem_layout_get(struct nvmem_device *nvmem) { - struct device_node *layout_np, *np =3D nvmem->dev.of_node; + struct device_node *layout_np; struct nvmem_layout *l, *layout =3D ERR_PTR(-EPROBE_DEFER); =20 - layout_np =3D of_get_child_by_name(np, "nvmem-layout"); + layout_np =3D of_nvmem_layout_get_container(nvmem); if (!layout_np) return NULL; =20 --=20 2.34.1 From nobody Mon Feb 9 00:55:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFEF2C0015E for ; Tue, 1 Aug 2023 18:21:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232136AbjHASV4 (ORCPT ); Tue, 1 Aug 2023 14:21:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231837AbjHASVp (ORCPT ); Tue, 1 Aug 2023 14:21:45 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E53DF213E for ; Tue, 1 Aug 2023 11:21:42 -0700 (PDT) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0DF99E0006; Tue, 1 Aug 2023 18:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1690914101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZIUXjeBWaacBxz6WsBbjN0nfgEPspA1Ri8UkX9Lqn/c=; b=m0Y3FQU7ZWxAVvM4lVxGVpPnJD1KykoHWeve45Ufs3yQIG6QC9Q0wkUZGJ3Ze5diPZ4jBU 2QGQzsy//qSArcxQ3hGtTHAoaWuLEKzltIUmu6gH9D+f/0hu+v3RoXyMrrBceMuU/J6qvX wABtexQ48Lyj1yF6wUZ0aDUDs5/uV397D5k+vbYasGEIdsvE7rQGNdGWcA3h+/CyYw+LeC ZP43Qdr7QXHjN0Rh2+C1fJthZkfRiPYFP6KhNL69lGKN6U/KgX/5GbxdkGQwqVuLA9GjO6 XhxaypvVOTsIIvIY5LU/cSfljQwXQa37v9n2CaaBwYOpm62j8ysXQEvpXTR7eQ== From: Miquel Raynal To: Srinivas Kandagatla Cc: Greg Kroah-Hartman , Thomas Petazzoni , Robert Marko , Luka Perkov , Michael Walle , , Randy Dunlap , Chen-Yu Tsai , Daniel Golle , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Miquel Raynal Subject: [PATCH v7 3/7] nvmem: core: Track the registered devices Date: Tue, 1 Aug 2023 20:21:28 +0200 Message-Id: <20230801182132.1058707-4-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230801182132.1058707-1-miquel.raynal@bootlin.com> References: <20230801182132.1058707-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: miquel.raynal@bootlin.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Create a list with all the NVMEM devices registered in the subsystem. This way we can iterate through them when needed (unused for now). Signed-off-by: Miquel Raynal --- drivers/nvmem/core.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 257328887263..4e81e0aaf433 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -23,6 +23,7 @@ struct nvmem_device { struct module *owner; struct device dev; + struct list_head node; int stride; int word_size; int id; @@ -76,6 +77,9 @@ static LIST_HEAD(nvmem_cell_tables); static DEFINE_MUTEX(nvmem_lookup_mutex); static LIST_HEAD(nvmem_lookup_list); =20 +static DEFINE_MUTEX(nvmem_devices_mutex); +static LIST_HEAD(nvmem_devices_list); + static BLOCKING_NOTIFIER_HEAD(nvmem_notifier); =20 static DEFINE_SPINLOCK(nvmem_layout_lock); @@ -1012,6 +1016,10 @@ struct nvmem_device *nvmem_register(const struct nvm= em_config *config) if (rval) goto err_remove_cells; =20 + mutex_lock(&nvmem_devices_mutex); + list_add_tail(&nvmem->node, &nvmem_devices_list); + mutex_unlock(&nvmem_devices_mutex); + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); =20 return nvmem; @@ -1037,6 +1045,10 @@ static void nvmem_device_release(struct kref *kref) =20 blocking_notifier_call_chain(&nvmem_notifier, NVMEM_REMOVE, nvmem); =20 + mutex_lock(&nvmem_devices_mutex); + list_del(&nvmem->node); + mutex_unlock(&nvmem_devices_mutex); + if (nvmem->flags & FLAG_COMPAT) device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); =20 --=20 2.34.1 From nobody Mon Feb 9 00:55:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8CC1C0015E for ; Tue, 1 Aug 2023 18:22:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232240AbjHASV7 (ORCPT ); Tue, 1 Aug 2023 14:21:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231859AbjHASVq (ORCPT ); Tue, 1 Aug 2023 14:21:46 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84DC0213D for ; Tue, 1 Aug 2023 11:21:44 -0700 (PDT) Received: by mail.gandi.net (Postfix) with ESMTPSA id B9957E0007; Tue, 1 Aug 2023 18:21:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1690914103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jd0UhfUDeWS6RJi7TPdxTJy86kv9J6eGWIB4ZKNoAwM=; b=n04pfgg1wSKMjJNVxmp56VFal0ugBPYkmy5t1dDuafuMyjxUYljax85DhvCfjEDCFaMv0k qx2383RQC98jWRdXCNqVzyTf2zsl7qNZnJX6zVgutp+LXLqRpmL9lP+2nkGSP3BXBTlaLi 8S5iP6BH1olUkL83NxnzvB5gLaJ1x/4b5A5cdNUOUyeZnAzZWj0z4IpEu9PMLHaw55M8I2 mIls/wv7LKlqe9sRk1RiKlPonxJkRLZwOU6cYgGpjFFmPkmM86OatEc7iof9lhp/y/MXKe jAcF2cA90Q4EWcdUTTlaCA+5EMAJXsWhchER8BT6xv4/vNt3Ug+2e1NJXAMPjg== From: Miquel Raynal To: Srinivas Kandagatla Cc: Greg Kroah-Hartman , Thomas Petazzoni , Robert Marko , Luka Perkov , Michael Walle , , Randy Dunlap , Chen-Yu Tsai , Daniel Golle , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Miquel Raynal Subject: [PATCH v7 4/7] nvmem: core: Notify when a new layout is registered Date: Tue, 1 Aug 2023 20:21:29 +0200 Message-Id: <20230801182132.1058707-5-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230801182132.1058707-1-miquel.raynal@bootlin.com> References: <20230801182132.1058707-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: miquel.raynal@bootlin.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Tell listeners a new layout was introduced and is now available. Signed-off-by: Miquel Raynal --- drivers/nvmem/core.c | 4 ++++ include/linux/nvmem-consumer.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 4e81e0aaf433..0406fbc7b750 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -776,12 +776,16 @@ int __nvmem_layout_register(struct nvmem_layout *layo= ut, struct module *owner) list_add(&layout->node, &nvmem_layouts); spin_unlock(&nvmem_layout_lock); =20 + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_LAYOUT_ADD, layout); + return 0; } EXPORT_SYMBOL_GPL(__nvmem_layout_register); =20 void nvmem_layout_unregister(struct nvmem_layout *layout) { + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_LAYOUT_REMOVE, layout= ); + spin_lock(&nvmem_layout_lock); list_del(&layout->node); spin_unlock(&nvmem_layout_lock); diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h index fa030d93b768..859d41431e2f 100644 --- a/include/linux/nvmem-consumer.h +++ b/include/linux/nvmem-consumer.h @@ -43,6 +43,8 @@ enum { NVMEM_REMOVE, NVMEM_CELL_ADD, NVMEM_CELL_REMOVE, + NVMEM_LAYOUT_ADD, + NVMEM_LAYOUT_REMOVE, }; =20 #if IS_ENABLED(CONFIG_NVMEM) --=20 2.34.1 From nobody Mon Feb 9 00:55:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86244C04A94 for ; Tue, 1 Aug 2023 18:22:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230212AbjHASWC (ORCPT ); Tue, 1 Aug 2023 14:22:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231737AbjHASVs (ORCPT ); Tue, 1 Aug 2023 14:21:48 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 587B2269E for ; Tue, 1 Aug 2023 11:21:46 -0700 (PDT) Received: by mail.gandi.net (Postfix) with ESMTPSA id 66D39E0004; Tue, 1 Aug 2023 18:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1690914105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oQ7q+S0WA0btHb97Zj7i/4YX+TmscMRWUDpKDDLHHz0=; b=lJtXERix5BPSbkIEF3Km8JkhvAu0NMTE5qZS/buGZvl+HFE8urSb6rSitsStlr1S6j4+BC 0k7B7BGDmKEybXzY2xcCgkIXABuDTQQar5jv8I43zHqFffoiK5IZuIxieGZ3436ePOdnJI Qu1oY/SEHqd/PqCsxfRqr+eWvPNpMDaLg+xz7xz/qRCc1gp4+RNwvvfB+OHfQifGGrsqC2 cIvDSE2jFPW6jgHF/5yGF4XDsioodGgJzDEqNZUQRlDiz0O5WUCdqlf4DINnAX2amlg7aP J7pQylAk2dxHW95Rh5PXpK5WCoHSqnAlEqWufKQ0JQpUOknfop+q12u/YXeXMQ== From: Miquel Raynal To: Srinivas Kandagatla Cc: Greg Kroah-Hartman , Thomas Petazzoni , Robert Marko , Luka Perkov , Michael Walle , , Randy Dunlap , Chen-Yu Tsai , Daniel Golle , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Miquel Raynal Subject: [PATCH v7 5/7] nvmem: core: Rework layouts to become platform devices Date: Tue, 1 Aug 2023 20:21:30 +0200 Message-Id: <20230801182132.1058707-6-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230801182132.1058707-1-miquel.raynal@bootlin.com> References: <20230801182132.1058707-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: miquel.raynal@bootlin.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Current layout support was initially written without modules support in mind. When the requirement for module support rose, the existing base was improved to adopt modularization support, but kind of a design flaw was introduced. With the existing implementation, when a storage device registers into NVMEM, the core tries to hook a layout (if any) and populates its cells immediately. This means, if the hardware description expects a layout to be hooked up, but no driver was provided for that, the storage medium will fail to probe and try later from scratch. Technically, the layouts are more like a "plus" and, even we consider that the hardware description shall be correct, we could still probe the storage device (especially if it contains the rootfs). One way to overcome this situation is to consider the layouts as devices, and leverage the existing notifier mechanism. When a new NVMEM device is registered, we can: - populate its nvmem-layout child, if any - try to modprobe the relevant driver, if relevant - try to hook the NVMEM device with a layout in the notifier And when a new layout is registered: - try to hook all the existing NVMEM devices which are not yet hooked to a layout with the new layout This way, there is no strong order to enforce, any NVMEM device creation or NVMEM layout driver insertion will be observed as a new event which may lead to the creation of additional cells, without disturbing the probes with costly (and sometimes endless) deferrals. Signed-off-by: Miquel Raynal --- drivers/nvmem/core.c | 132 ++++++++++++++++++++++++------- drivers/nvmem/layouts/onie-tlv.c | 39 +++++++-- drivers/nvmem/layouts/sl28vpd.c | 39 +++++++-- include/linux/nvmem-provider.h | 11 +-- 4 files changed, 172 insertions(+), 49 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 0406fbc7b750..868a6f8b3227 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -80,6 +80,7 @@ static LIST_HEAD(nvmem_lookup_list); static DEFINE_MUTEX(nvmem_devices_mutex); static LIST_HEAD(nvmem_devices_list); =20 +struct notifier_block nvmem_nb; static BLOCKING_NOTIFIER_HEAD(nvmem_notifier); =20 static DEFINE_SPINLOCK(nvmem_layout_lock); @@ -795,23 +796,16 @@ EXPORT_SYMBOL_GPL(nvmem_layout_unregister); static struct nvmem_layout *nvmem_layout_get(struct nvmem_device *nvmem) { struct device_node *layout_np; - struct nvmem_layout *l, *layout =3D ERR_PTR(-EPROBE_DEFER); + struct nvmem_layout *l, *layout =3D NULL; =20 layout_np =3D of_nvmem_layout_get_container(nvmem); if (!layout_np) return NULL; =20 - /* - * In case the nvmem device was built-in while the layout was built as a - * module, we shall manually request the layout driver loading otherwise - * we'll never have any match. - */ - of_request_module(layout_np); - spin_lock(&nvmem_layout_lock); =20 list_for_each_entry(l, &nvmem_layouts, node) { - if (of_match_node(l->of_match_table, layout_np)) { + if (of_match_node(l->dev->driver->of_match_table, layout_np)) { if (try_module_get(l->owner)) layout =3D l; =20 @@ -868,7 +862,7 @@ const void *nvmem_layout_get_match_data(struct nvmem_de= vice *nvmem, const struct of_device_id *match; =20 layout_np =3D of_nvmem_layout_get_container(nvmem); - match =3D of_match_node(layout->of_match_table, layout_np); + match =3D of_match_node(layout->dev->driver->of_match_table, layout_np); =20 return match ? match->data : NULL; } @@ -887,6 +881,7 @@ EXPORT_SYMBOL_GPL(nvmem_layout_get_match_data); struct nvmem_device *nvmem_register(const struct nvmem_config *config) { struct nvmem_device *nvmem; + struct device_node *layout_np; int rval; =20 if (!config->dev) @@ -979,19 +974,6 @@ struct nvmem_device *nvmem_register(const struct nvmem= _config *config) goto err_put_device; } =20 - /* - * If the driver supplied a layout by config->layout, the module - * pointer will be NULL and nvmem_layout_put() will be a noop. - */ - nvmem->layout =3D config->layout ?: nvmem_layout_get(nvmem); - if (IS_ERR(nvmem->layout)) { - rval =3D PTR_ERR(nvmem->layout); - nvmem->layout =3D NULL; - - if (rval =3D=3D -EPROBE_DEFER) - goto err_teardown_compat; - } - if (config->cells) { rval =3D nvmem_add_cells(nvmem, config->cells, config->ncells); if (rval) @@ -1010,16 +992,21 @@ struct nvmem_device *nvmem_register(const struct nvm= em_config *config) if (rval) goto err_remove_cells; =20 - rval =3D nvmem_add_cells_from_layout(nvmem); - if (rval) - goto err_remove_cells; - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); =20 rval =3D device_add(&nvmem->dev); if (rval) goto err_remove_cells; =20 + /* Populate layouts as devices */ + layout_np =3D of_nvmem_layout_get_container(nvmem); + if (layout_np) { + rval =3D of_platform_populate(nvmem->dev.of_node, NULL, NULL, NULL); + if (rval) + goto err_remove_cells; + of_node_put(layout_np); + } + mutex_lock(&nvmem_devices_mutex); list_add_tail(&nvmem->node, &nvmem_devices_list); mutex_unlock(&nvmem_devices_mutex); @@ -1030,8 +1017,6 @@ struct nvmem_device *nvmem_register(const struct nvme= m_config *config) =20 err_remove_cells: nvmem_device_remove_all_cells(nvmem); - nvmem_layout_put(nvmem->layout); -err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); err_put_device: @@ -2137,13 +2122,100 @@ const char *nvmem_dev_name(struct nvmem_device *nv= mem) } EXPORT_SYMBOL_GPL(nvmem_dev_name); =20 +static void nvmem_try_loading_layout_driver(struct nvmem_device *nvmem) +{ + struct device_node *layout_np; + + layout_np =3D of_nvmem_layout_get_container(nvmem); + if (layout_np) { + of_request_module(layout_np); + of_node_put(layout_np); + } +} + +static int nvmem_try_matching_available_layout(struct nvmem_device *nvmem) +{ + int ret; + + if (nvmem->layout) + return 0; + + nvmem->layout =3D nvmem_layout_get(nvmem); + if (!nvmem->layout) + return 0; + + ret =3D nvmem_add_cells_from_layout(nvmem); + if (ret) + goto put_layout; + + return 0; + +put_layout: + nvmem_layout_put(nvmem->layout); + return ret; +} + +/* + * When an NVMEM device is registered, try to match against a layout and + * populate the cells. When an NVMEM layout is probed, ensure all NVMEM de= vices + * which could use it properly expose their cells. + */ +static int nvmem_notifier_call(struct notifier_block *notifier, + unsigned long event_flags, void *context) +{ + struct nvmem_device *nvmem =3D NULL, *tmp; + int ret; + + switch (event_flags) { + case NVMEM_ADD: + nvmem =3D context; + break; + case NVMEM_LAYOUT_ADD: + break; + default: + return NOTIFY_DONE; + } + + if (nvmem) { + /* + * In case the nvmem device was built-in while the layout was + * built as a module, manually request loading the layout driver. + */ + nvmem_try_loading_layout_driver(nvmem); + + /* Populate the cells of the new nvmem device from its layout, if any */ + ret =3D nvmem_try_matching_available_layout(nvmem); + if (ret) + return notifier_from_errno(ret); + + return NOTIFY_OK; + } + + /* NVMEM devices might be "waiting" for this layout */ + list_for_each_entry_safe(nvmem, tmp, &nvmem_devices_list, node) { + ret =3D nvmem_try_matching_available_layout(nvmem); + if (ret) + return notifier_from_errno(ret); + } + + return NOTIFY_OK; +} + static int __init nvmem_init(void) { - return bus_register(&nvmem_bus_type); + int ret; + + ret =3D bus_register(&nvmem_bus_type); + if (ret) + return ret; + + nvmem_nb.notifier_call =3D &nvmem_notifier_call; + return nvmem_register_notifier(&nvmem_nb); } =20 static void __exit nvmem_exit(void) { + nvmem_unregister_notifier(&nvmem_nb); bus_unregister(&nvmem_bus_type); } =20 diff --git a/drivers/nvmem/layouts/onie-tlv.c b/drivers/nvmem/layouts/onie-= tlv.c index 59fc87ccfcff..3d54d3be2c93 100644 --- a/drivers/nvmem/layouts/onie-tlv.c +++ b/drivers/nvmem/layouts/onie-tlv.c @@ -13,6 +13,7 @@ #include #include #include +#include =20 #define ONIE_TLV_MAX_LEN 2048 #define ONIE_TLV_CRC_FIELD_SZ 6 @@ -226,18 +227,46 @@ static int onie_tlv_parse_table(struct device *dev, s= truct nvmem_device *nvmem, return 0; } =20 +static int onie_tlv_probe(struct platform_device *pdev) +{ + struct nvmem_layout *layout; + + layout =3D devm_kzalloc(&pdev->dev, sizeof(*layout), GFP_KERNEL); + if (!layout) + return -ENOMEM; + + layout->add_cells =3D onie_tlv_parse_table; + layout->dev =3D &pdev->dev; + + platform_set_drvdata(pdev, layout); + + return nvmem_layout_register(layout); +} + +static int onie_tlv_remove(struct platform_device *pdev) +{ + struct nvmem_layout *layout =3D platform_get_drvdata(pdev); + + nvmem_layout_unregister(layout); + + return 0; +} + static const struct of_device_id onie_tlv_of_match_table[] =3D { { .compatible =3D "onie,tlv-layout", }, {}, }; MODULE_DEVICE_TABLE(of, onie_tlv_of_match_table); =20 -static struct nvmem_layout onie_tlv_layout =3D { - .name =3D "ONIE tlv layout", - .of_match_table =3D onie_tlv_of_match_table, - .add_cells =3D onie_tlv_parse_table, +static struct platform_driver onie_tlv_layout =3D { + .driver =3D { + .name =3D "onie-tlv-layout", + .of_match_table =3D onie_tlv_of_match_table, + }, + .probe =3D onie_tlv_probe, + .remove =3D onie_tlv_remove, }; -module_nvmem_layout_driver(onie_tlv_layout); +module_platform_driver(onie_tlv_layout); =20 MODULE_LICENSE("GPL"); MODULE_AUTHOR("Miquel Raynal "); diff --git a/drivers/nvmem/layouts/sl28vpd.c b/drivers/nvmem/layouts/sl28vp= d.c index 05671371f631..ad0c39fc7943 100644 --- a/drivers/nvmem/layouts/sl28vpd.c +++ b/drivers/nvmem/layouts/sl28vpd.c @@ -5,6 +5,7 @@ #include #include #include +#include #include =20 #define SL28VPD_MAGIC 'V' @@ -135,18 +136,46 @@ static int sl28vpd_add_cells(struct device *dev, stru= ct nvmem_device *nvmem, return 0; } =20 +static int sl28vpd_probe(struct platform_device *pdev) +{ + struct nvmem_layout *layout; + + layout =3D devm_kzalloc(&pdev->dev, sizeof(*layout), GFP_KERNEL); + if (!layout) + return -ENOMEM; + + layout->add_cells =3D sl28vpd_add_cells; + layout->dev =3D &pdev->dev; + + platform_set_drvdata(pdev, layout); + + return nvmem_layout_register(layout); +} + +static int sl28vpd_remove(struct platform_device *pdev) +{ + struct nvmem_layout *layout =3D platform_get_drvdata(pdev); + + nvmem_layout_unregister(layout); + + return 0; +} + static const struct of_device_id sl28vpd_of_match_table[] =3D { { .compatible =3D "kontron,sl28-vpd" }, {}, }; MODULE_DEVICE_TABLE(of, sl28vpd_of_match_table); =20 -static struct nvmem_layout sl28vpd_layout =3D { - .name =3D "sl28-vpd", - .of_match_table =3D sl28vpd_of_match_table, - .add_cells =3D sl28vpd_add_cells, +static struct platform_driver sl28vpd_layout =3D { + .driver =3D { + .name =3D "kontron-sl28vpd-layout", + .of_match_table =3D sl28vpd_of_match_table, + }, + .probe =3D sl28vpd_probe, + .remove =3D sl28vpd_remove, }; -module_nvmem_layout_driver(sl28vpd_layout); +module_platform_driver(sl28vpd_layout); =20 MODULE_LICENSE("GPL"); MODULE_AUTHOR("Michael Walle "); diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h index dae26295e6be..c72064780b50 100644 --- a/include/linux/nvmem-provider.h +++ b/include/linux/nvmem-provider.h @@ -154,8 +154,7 @@ struct nvmem_cell_table { /** * struct nvmem_layout - NVMEM layout definitions * - * @name: Layout name. - * @of_match_table: Open firmware match table. + * @dev: Device-model layout device. * @add_cells: Will be called if a nvmem device is found which * has this layout. The function will add layout * specific cells with nvmem_add_one_cell(). @@ -170,8 +169,7 @@ struct nvmem_cell_table { * cells. */ struct nvmem_layout { - const char *name; - const struct of_device_id *of_match_table; + struct device *dev; int (*add_cells)(struct device *dev, struct nvmem_device *nvmem, struct nvmem_layout *layout); void (*fixup_cell_info)(struct nvmem_device *nvmem, @@ -243,9 +241,4 @@ nvmem_layout_get_match_data(struct nvmem_device *nvmem, } =20 #endif /* CONFIG_NVMEM */ - -#define module_nvmem_layout_driver(__layout_driver) \ - module_driver(__layout_driver, nvmem_layout_register, \ - nvmem_layout_unregister) - #endif /* ifndef _LINUX_NVMEM_PROVIDER_H */ --=20 2.34.1 From nobody Mon Feb 9 00:55:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F7E3C0015E for ; Tue, 1 Aug 2023 18:22:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232319AbjHASWE (ORCPT ); Tue, 1 Aug 2023 14:22:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231339AbjHASVt (ORCPT ); Tue, 1 Aug 2023 14:21:49 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0206A2690 for ; Tue, 1 Aug 2023 11:21:47 -0700 (PDT) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3C5EBE0003; Tue, 1 Aug 2023 18:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1690914106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fgVWjsMD95oohAim9ffD6zzKWxq5jwXobYlPEBDHn2g=; b=Y5Dh9IwCXc6tDCKv/3n+PfJ37a5cV9pwH3K0jGu7CBnVp96Kchq50jp/tdKPxHvkzDeLlI itDJgHJUPKrWCgjHjJ5ORYV15lGWcGzs8eyXR65IKzDOXPVtAbECNL/0EW5hQRo8/d8j0w Fh/RXuomXPhCuLuz3wnd9xp6u47IOGabCRSTxuJkpwL78TAKkOfAqu58OAhyP3+5P+ei7y ZJRDM10sOr80MwV9kq4FRzEdIWR7HiHiUdAMGgOfb5JIN/veCVfdlWivbadg4ztZs3lhym f3LK2u67j8pkudU+wCTDQ9JTqqyqEmR63UQGfdgkVolTUinDblzI9FblIBKksA== From: Miquel Raynal To: Srinivas Kandagatla Cc: Greg Kroah-Hartman , Thomas Petazzoni , Robert Marko , Luka Perkov , Michael Walle , , Randy Dunlap , Chen-Yu Tsai , Daniel Golle , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Miquel Raynal Subject: [PATCH v7 6/7] ABI: sysfs-nvmem-cells: Expose cells through sysfs Date: Tue, 1 Aug 2023 20:21:31 +0200 Message-Id: <20230801182132.1058707-7-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230801182132.1058707-1-miquel.raynal@bootlin.com> References: <20230801182132.1058707-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: miquel.raynal@bootlin.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The binary content of nvmem devices is available to the user so in the easiest cases, finding the content of a cell is rather easy as it is just a matter of looking at a known and fixed offset. However, nvmem layouts have been recently introduced to cope with more advanced situations, where the offset and size of the cells is not known in advance or is dynamic. When using layouts, more advanced parsers are used by the kernel in order to give direct access to the content of each cell regardless of their position/size in the underlying device, but these information were not accessible to the user. By exposing the nvmem cells to the user through a dedicated cell/ folder containing one file per cell, we provide a straightforward access to useful user information without the need for re-writing a userland parser. Content of nvmem cells is usually: product names, manufacturing date, MAC addresses, etc, Signed-off-by: Miquel Raynal Reviewed-by: Greg Kroah-Hartman --- Documentation/ABI/testing/sysfs-nvmem-cells | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-nvmem-cells diff --git a/Documentation/ABI/testing/sysfs-nvmem-cells b/Documentation/AB= I/testing/sysfs-nvmem-cells new file mode 100644 index 000000000000..a1d140dcbd5d --- /dev/null +++ b/Documentation/ABI/testing/sysfs-nvmem-cells @@ -0,0 +1,21 @@ +What: /sys/bus/nvmem/devices/.../cells/ +Date: May 2023 +KernelVersion: 6.5 +Contact: Miquel Raynal +Description: + The "cells" folder contains one file per cell exposed by the + NVMEM device. The name of the file is: @, with + being the cell name and its location in the NVMEM + device, in hexadecimal (without the '0x' prefix, to mimic device + tree node names). The length of the file is the size of the cell + (when known). The content of the file is the binary content of + the cell (may sometimes be ASCII, likely without trailing + character). + Note: This file is only present if CONFIG_NVMEM_SYSFS + is enabled. + + Example:: + + hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name + 00000000 54 4e 34 38 4d 2d 50 2d 44 4e |TN48M-P-DN| + 0000000a --=20 2.34.1 From nobody Mon Feb 9 00:55:30 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FCA9C0015E for ; Tue, 1 Aug 2023 18:22:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232430AbjHASWP (ORCPT ); Tue, 1 Aug 2023 14:22:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231994AbjHASVv (ORCPT ); Tue, 1 Aug 2023 14:21:51 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC8AF269A for ; Tue, 1 Aug 2023 11:21:49 -0700 (PDT) Received: by mail.gandi.net (Postfix) with ESMTPSA id F359FE0005; Tue, 1 Aug 2023 18:21:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1690914108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wZXUbb+s305f0R0d6PSBqvTxl9Ubms9zy8HvCNQc7YE=; b=nOLMpLd4UInlbOOe3sFtYzpGem4yyavZiwBoz/6dbG4a60Njd723o1505zRpf2hWpTMcVb zg15v8iyqGn7ktDGmZw6tCI4ci1ILSP/0huHmt62q2mA/e1Wn+UNB1v5KRwK5GTSHbJmtP 2vIPc7RUgXBa5XtSrzqrG4Op/HzAyyedPXtNblcYej90xCSfnHg2UkLrQZOkiqzz5sefr0 IgQBGNUI9ut0dA5k3Zks2HDScjRV3V9fn0G3bH/aOblr87Dpivu2YMMIo5ThMNM06FPnp8 Moqn9kLD1MpIRWV+acaGQpgAeqlM1HCHdTzlIjWquR6poU4siWbMI1BpZnWDUA== From: Miquel Raynal To: Srinivas Kandagatla Cc: Greg Kroah-Hartman , Thomas Petazzoni , Robert Marko , Luka Perkov , Michael Walle , , Randy Dunlap , Chen-Yu Tsai , Daniel Golle , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Miquel Raynal Subject: [PATCH v7 7/7] nvmem: core: Expose cells through sysfs Date: Tue, 1 Aug 2023 20:21:32 +0200 Message-Id: <20230801182132.1058707-8-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230801182132.1058707-1-miquel.raynal@bootlin.com> References: <20230801182132.1058707-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: miquel.raynal@bootlin.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The binary content of nvmem devices is available to the user so in the easiest cases, finding the content of a cell is rather easy as it is just a matter of looking at a known and fixed offset. However, nvmem layouts have been recently introduced to cope with more advanced situations, where the offset and size of the cells is not known in advance or is dynamic. When using layouts, more advanced parsers are used by the kernel in order to give direct access to the content of each cell, regardless of its position/size in the underlying device. Unfortunately, these information are not accessible by users, unless by fully re-implementing the parser logic in userland. Let's expose the cells and their content through sysfs to avoid these situations. Of course the relevant NVMEM sysfs Kconfig option must be enabled for this support to be available. Not all nvmem devices expose cells. Indeed, the .bin_attrs attribute group member will be filled at runtime only when relevant and will remain empty otherwise. In this case, as the cells attribute group will be empty, it will not lead to any additional folder/file creation. Exposed cells are read-only. There is, in practice, everything in the core to support a write path, but as I don't see any need for that, I prefer to keep the interface simple (and probably safer). The interface is documented as being in the "testing" state which means we can later add a write attribute if though relevant. Signed-off-by: Miquel Raynal --- drivers/nvmem/core.c | 113 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 868a6f8b3227..beecb30a1642 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -330,6 +330,43 @@ static umode_t nvmem_bin_attr_is_visible(struct kobjec= t *kobj, return nvmem_bin_attr_get_umode(nvmem); } =20 +static struct nvmem_cell *nvmem_create_cell(struct nvmem_cell_entry *entry, + const char *id, int index); + +static ssize_t nvmem_cell_attr_read(struct file *filp, struct kobject *kob= j, + struct bin_attribute *attr, char *buf, + loff_t pos, size_t count) +{ + struct nvmem_cell_entry *entry; + struct nvmem_cell *cell =3D NULL; + size_t cell_sz, read_len; + void *content; + + entry =3D attr->private; + cell =3D nvmem_create_cell(entry, entry->name, 0); + if (IS_ERR(cell)) + return PTR_ERR(cell); + + if (!cell) + return -EINVAL; + + content =3D nvmem_cell_read(cell, &cell_sz); + if (IS_ERR(content)) { + read_len =3D PTR_ERR(content); + goto destroy_cell; + } + + read_len =3D min_t(unsigned int, cell_sz - pos, count); + memcpy(buf, content + pos, read_len); + kfree(content); + +destroy_cell: + kfree_const(cell->id); + kfree(cell); + + return read_len; +} + /* default read/write permissions */ static struct bin_attribute bin_attr_rw_nvmem =3D { .attr =3D { @@ -351,11 +388,21 @@ static const struct attribute_group nvmem_bin_group = =3D { .is_bin_visible =3D nvmem_bin_attr_is_visible, }; =20 +/* Cell attributes will be dynamically allocated */ +static struct attribute_group nvmem_cells_group =3D { + .name =3D "cells", +}; + static const struct attribute_group *nvmem_dev_groups[] =3D { &nvmem_bin_group, NULL, }; =20 +static const struct attribute_group *nvmem_cells_groups[] =3D { + &nvmem_cells_group, + NULL, +}; + static struct bin_attribute bin_attr_nvmem_eeprom_compat =3D { .attr =3D { .name =3D "eeprom", @@ -411,6 +458,64 @@ static void nvmem_sysfs_remove_compat(struct nvmem_dev= ice *nvmem, device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); } =20 +static int nvmem_populate_sysfs_cells(struct nvmem_device *nvmem) +{ + struct bin_attribute **cells_attrs, *attrs; + struct nvmem_cell_entry *entry; + unsigned int ncells =3D 0, i =3D 0; + int ret =3D 0; + + mutex_lock(&nvmem_mutex); + + if (list_empty(&nvmem->cells)) { + nvmem_cells_group.bin_attrs =3D NULL; + goto unlock_mutex; + } + + /* Allocate an array of attributes with a sentinel */ + ncells =3D list_count_nodes(&nvmem->cells); + cells_attrs =3D devm_kcalloc(&nvmem->dev, ncells + 1, + sizeof(struct bin_attribute *), GFP_KERNEL); + if (!cells_attrs) { + ret =3D -ENOMEM; + goto unlock_mutex; + } + + attrs =3D devm_kcalloc(&nvmem->dev, ncells, sizeof(struct bin_attribute),= GFP_KERNEL); + if (!attrs) { + ret =3D -ENOMEM; + goto unlock_mutex; + } + + /* Initialize each attribute to take the name and size of the cell */ + list_for_each_entry(entry, &nvmem->cells, node) { + sysfs_bin_attr_init(&attrs[i]); + attrs[i].attr.name =3D devm_kasprintf(&nvmem->dev, GFP_KERNEL, + "%s@%x", entry->name, + entry->offset); + attrs[i].attr.mode =3D 0444; + attrs[i].size =3D entry->bytes; + attrs[i].read =3D &nvmem_cell_attr_read; + attrs[i].private =3D entry; + if (!attrs[i].attr.name) { + ret =3D -ENOMEM; + goto unlock_mutex; + } + + cells_attrs[i] =3D &attrs[i]; + i++; + } + + nvmem_cells_group.bin_attrs =3D cells_attrs; + + ret =3D devm_device_add_groups(&nvmem->dev, nvmem_cells_groups); + +unlock_mutex: + mutex_unlock(&nvmem_mutex); + + return ret; +} + #else /* CONFIG_NVMEM_SYSFS */ =20 static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem, @@ -2148,8 +2253,16 @@ static int nvmem_try_matching_available_layout(struc= t nvmem_device *nvmem) if (ret) goto put_layout; =20 +#ifdef CONFIG_NVMEM_SYSFS + ret =3D nvmem_populate_sysfs_cells(nvmem); + if (ret) + goto del_cells; +#endif + return 0; =20 +del_cells: + nvmem_device_remove_all_cells(nvmem); put_layout: nvmem_layout_put(nvmem->layout); return ret; --=20 2.34.1