From patchwork Tue May 30 10:09:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 100719 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2070536vqr; Tue, 30 May 2023 03:16:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4KxfgG3VXMd8sL1bSjMvkUfBKPRKMdmSJwHqoZkgeCZiAPnWaAA40XeQjG33tXiQnDbx6h X-Received: by 2002:a17:90a:bb91:b0:255:929c:5166 with SMTP id v17-20020a17090abb9100b00255929c5166mr2015641pjr.26.1685441780625; Tue, 30 May 2023 03:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685441780; cv=none; d=google.com; s=arc-20160816; b=mkUhHxZ1sN6sBJ2SLWpomCNnTAfpdSHTQBeAl93STCf4Fko8My7MrSowAvINkygZus Xe2+lYx9eEAhAbKGz8FgySVVrlLiuodtjXcg5Ej5vEG8XeAZsDRs5cGnd/v90b1kRGbv rxbXin1CochwQKY7JADbjIL9kw4y9J66qNpz9thE0xFun8Z5wz9noS7JS9gPjUYZf20l Ufwj3Dn4iiKzXLuD2qB9+B13PDoIWug7rkevg8feD9Y4iFxEcXKuG1aOnIIBhEhdkBvY TrS+Exd4XBC/R/Xu2S2oTbZyfx1SaGKG4erg8Wqny68s5a3a8K6g0SyjsyrV/0MtrlhD A6Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sGMXklHRpmowRNAZplbcx525aq6V1AzIWaohqk4ud74=; b=hwt95NF7/qLVZMRrazJ9XCRzA14/JQXRYNnHLBd/SirXXXo1uWJ/Y0aP9gLFZOog+G iNzZelGJjCn5uBeNUsJkG3RtVDxptIeu5R2pWJQ3ZzAioceKM034Ysu7IiL2CPEW9ucy +qstUBzjswC5osB1Vjx+lUAP1/SGYifLxe7dBHsbT9LoVXeVeYhzVNxaja/W/ld4qg8z KwE7Zc8ks89hZ2AlcawlWp3mGvG6BjzVqgO4NfGT/UvrELyAV1xDncrE9UZktkFRaZij R8MbZQ51qk+9ZavmbaXXUU44H4kdcqCO3iK2X32rt7ZZwOnESb/yeRgR79HvBcwS/pbs nFrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=nrvvN2Wv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oa6-20020a17090b1bc600b0023fb875a929si11897536pjb.106.2023.05.30.03.16.06; Tue, 30 May 2023 03:16:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=nrvvN2Wv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230475AbjE3KJl (ORCPT + 99 others); Tue, 30 May 2023 06:09:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229712AbjE3KJh (ORCPT ); Tue, 30 May 2023 06:09:37 -0400 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27ECFAB for ; Tue, 30 May 2023 03:09:32 -0700 (PDT) X-GND-Sasl: miquel.raynal@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1685441371; 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=sGMXklHRpmowRNAZplbcx525aq6V1AzIWaohqk4ud74=; b=nrvvN2WvhX4s87UxfKRyisDZwPKXvHTJmfnNskwPJ7Jn45Nz5jvtIQYX+NiueTwwrfIBc4 ujOR8HeDopnQeort1lxjGQYx4QDo3ywoFvTCUWVRBuREoi7CsFcbIU+PDJlX6eKvtHBN7d ygT4zn1u0cyiIDTCgnQUs+ISYgsdnKNZzEomPERAD3OzL1CVH/pHC3FBu2opLHhlLy2XZJ rmqcgjvN7tn3ZoZAKxdTpWAPH8w04hHCaHMcuAiOx2PPy3bwc5a9a2WaeTBbfSxig2XVox 7Ns9rMe6Mqjaz+sdbKhqPUq4vN8UNoBBq8TIpYwg7uexTquBedcOuqNyxvsqUg== X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id F04BE20008; Tue, 30 May 2023 10:09:30 +0000 (UTC) From: Miquel Raynal To: Srinivas Kandagatla Cc: Greg Kroah-Hartman , Luka Perkov , Robert Marko , Thomas Petazzoni , , Miquel Raynal Subject: [PATCH v2 1/2] ABI: sysfs-nvmem-cells: Expose cells through sysfs Date: Tue, 30 May 2023 12:09:28 +0200 Message-Id: <20230530100929.285235-2-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230530100929.285235-1-miquel.raynal@bootlin.com> References: <20230530100929.285235-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767313800219976607?= X-GMAIL-MSGID: =?utf-8?q?1767313800219976607?= 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 --- Documentation/ABI/testing/sysfs-nvmem-cells | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-nvmem-cells diff --git a/Documentation/ABI/testing/sysfs-nvmem-cells b/Documentation/ABI/testing/sysfs-nvmem-cells new file mode 100644 index 000000000000..bee4acc5bfcb --- /dev/null +++ b/Documentation/ABI/testing/sysfs-nvmem-cells @@ -0,0 +1,19 @@ +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 the cell name. + 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 + + ex:: + + 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 From patchwork Tue May 30 10:09:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 100726 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2072967vqr; Tue, 30 May 2023 03:21:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kmZGL1cqJsW6C99ByICKoAZLMcLvWWgQEonGFupJTBtrjYEF61sZcrrUMp/z8nVNqMUXe X-Received: by 2002:a05:6a20:914c:b0:110:c8f:b53b with SMTP id x12-20020a056a20914c00b001100c8fb53bmr2101282pzc.62.1685442085971; Tue, 30 May 2023 03:21:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685442085; cv=none; d=google.com; s=arc-20160816; b=zg3qVLXa7c81unfwa0UkqWl1E1xri8nWS1yl502p+Tud1E6Vv2LoBP6e12cXQcGW95 JCUn/wXtm2hK4FbyFzeYraZMmkWzogIoJ+kJ5a8/iTDmhweLPEFy37xfCjSuvgz5ncT6 1PFnk1IeXMR0Gmgk1a9dbAmptPrNL/LC3EjTrj+HCQzdsJ+2t2ZgGI0ITL/g378Lot3u /5jVYqGeo4UaalDDbfW6pdgM2erJppRjD1Ph/IJop1C2U2GnvqQt3x1LQUt9vvmCEF7C wjNiUBctEgG1xwfCtbcHlkqq+MdxjnMI9tZvtFge5XRYOFPFOnrVaDkjJyre7K1fTCGk mKmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=l5vWXNsNdS/hPaop3iFdkJyayWYNcFVl9HWFFY4YVvg=; b=Oxrj6a3Z+uelDwJ3zxwTIY3db6XU56XpugVCq7YtJvhFzgK42C03XKGEvvmfV6+Qqi ESzOgZS2u+n2bmVwxR6FV8RQeMb15oql+Jfm06z6dau1zN0GdF4SuMtymF3hJPQniidv +bUphYS8x1IiVwqsBWOXOSRD6CX2t5gY5B02hZRwrYC4YZSOyl1kI3vM7buUFBhH5tIL plWr5GsB2bO5yupJMQG98lbhIKkFyWhYCP33Uv7YxvOMQMEvXAAGiRsdRKa+P+r6q0kZ 1hzC6OguZ6zBo32YmKhODHfNEjjT9tTVnXFNi2faIs3Pkw9YT2UAAH/qwgFGrdSp0pJ2 k5jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=iLMUWVkH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o25-20020a637319000000b0050bea5bf413si11314429pgc.705.2023.05.30.03.21.12; Tue, 30 May 2023 03:21:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=iLMUWVkH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231235AbjE3KJr (ORCPT + 99 others); Tue, 30 May 2023 06:09:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229873AbjE3KJi (ORCPT ); Tue, 30 May 2023 06:09:38 -0400 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DBD3C9 for ; Tue, 30 May 2023 03:09:33 -0700 (PDT) X-GND-Sasl: miquel.raynal@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1685441372; 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=l5vWXNsNdS/hPaop3iFdkJyayWYNcFVl9HWFFY4YVvg=; b=iLMUWVkHEyPk7pu1M7c2c27hr1Flj7ii4Cr7fqE/xFjqfX9qzlt8ldsCdhh8D5HFQLE8PD ZT4dAktEFQiN+r8xuKOiFoacZsV78jF8eY3NM8+s9ZUcf9wYaEnbiDb5R0yamvdMhgyNVC WAVU7HQvLfhdf0cO+Jc0cLakqtNgeLi7lpiCwV3PvppBv0QLXR6YPs4PzAAzEHDcySsqVf FKjevi2NaxA/pDq1Xkb7V17uGHdNcUe/XlpqHOBiE/osIYfKyOzFLXANQDoN8EkuOzV3p7 puVmiW8lcv3RQBbe8DBOiG9705hiNr2wowN6dRUg7o4YeZ9m9pSYH+7lBu+tMg== X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com X-GND-Sasl: miquel.raynal@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id AB03120017; Tue, 30 May 2023 10:09:31 +0000 (UTC) From: Miquel Raynal To: Srinivas Kandagatla Cc: Greg Kroah-Hartman , Luka Perkov , Robert Marko , Thomas Petazzoni , , Miquel Raynal Subject: [PATCH v2 2/2] nvmem: core: Expose cells through sysfs Date: Tue, 30 May 2023 12:09:29 +0200 Message-Id: <20230530100929.285235-3-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230530100929.285235-1-miquel.raynal@bootlin.com> References: <20230530100929.285235-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767314120816607727?= X-GMAIL-MSGID: =?utf-8?q?1767314120816607727?= 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. 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. Of course the relevant NVMEM sysfs Kconfig option must be enabled for this support to be compiled-in. The current implementation leads to the 'cells' folder to be always present even when no cell is actually exposed. This is due to a sysfs limitation which might in the future be overcome. In order to be as close as how sysfs was designed, despite the cells .bin_attrs attribute group member being assigned at runtime (and thus, not movable to a RO section), we provide a .is_bin_visible hook which might become really useful if the series avoiding the creation of empty directories borns. There is one limitation though: if a layout is built as a module but is not properly installed in the system and loaded manually with insmod while the nvmem device driver was built-in, the cells won't appear in sysfs. But if done like that, the cells won't be usable by the built-in kernel drivers anyway. Signed-off-by: Miquel Raynal --- drivers/nvmem/core.c | 145 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 141 insertions(+), 4 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 342cd380b420..02b70f065ebc 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -325,6 +325,76 @@ static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj, return nvmem_bin_attr_get_umode(nvmem); } +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 *kobj, + struct bin_attribute *attr, char *buf, + loff_t pos, size_t count) +{ + struct nvmem_cell_entry *entry; + struct nvmem_cell *cell = NULL; + struct nvmem_device *nvmem; + size_t cell_sz, read_len; + struct device *dev; + void *content; + + if (attr->private) + dev = attr->private; + else + dev = kobj_to_dev(kobj); + nvmem = to_nvmem_device(dev); + + mutex_lock(&nvmem_mutex); + list_for_each_entry(entry, &nvmem->cells, node) { + if (strncmp(entry->name, attr->attr.name, XATTR_NAME_MAX)) + continue; + + cell = nvmem_create_cell(entry, entry->name, 0); + if (IS_ERR(cell)) { + mutex_unlock(&nvmem_mutex); + return PTR_ERR(cell); + } + + break; + } + mutex_unlock(&nvmem_mutex); + + if (!cell) + return -EINVAL; + + content = nvmem_cell_read(cell, &cell_sz); + if (IS_ERR(content)) { + read_len = PTR_ERR(content); + goto destroy_cell; + } + + read_len = 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; +} + +static umode_t nvmem_cells_is_visible(struct kobject *kobj, + struct bin_attribute *attr, int i) +{ + struct device *dev = kobj_to_dev(kobj); + struct nvmem_device *nvmem = to_nvmem_device(dev); + umode_t mode = 0444; + + mutex_lock(&nvmem_mutex); + if (list_empty(&nvmem->cells)) + mode = 0; + mutex_unlock(&nvmem_mutex); + + return mode; +} + /* default read/write permissions */ static struct bin_attribute bin_attr_rw_nvmem = { .attr = { @@ -346,8 +416,15 @@ static const struct attribute_group nvmem_bin_group = { .is_bin_visible = nvmem_bin_attr_is_visible, }; +/* Cell attributes will be dynamically allocated */ +static struct attribute_group nvmem_cells_group = { + .name = "cells", + .is_bin_visible = nvmem_cells_is_visible, +}; + static const struct attribute_group *nvmem_dev_groups[] = { &nvmem_bin_group, + &nvmem_cells_group, NULL, }; @@ -406,6 +483,60 @@ static void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem, device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); } +static int nvmem_populate_sysfs_cells(struct nvmem_device *nvmem) +{ + struct bin_attribute **cells_attrs, *attrs; + struct nvmem_cell_entry *entry; + unsigned int ncells = 0, i = 0; + int ret = 0; + + mutex_lock(&nvmem_mutex); + + list_for_each_entry(entry, &nvmem->cells, node) + ncells++; + + /* Allocate an array of attributes with a sentinel */ + cells_attrs = devm_kcalloc(&nvmem->dev, ncells + 1, + sizeof(struct bin_attribute *), GFP_KERNEL); + if (!cells_attrs) { + ret = -ENOMEM; + goto unlock_mutex; + } + + nvmem_cells_group.bin_attrs = cells_attrs; + + /* Without exposed cells, successfully exit after assigning an empty attributes array */ + if (!ncells) + goto unlock_mutex; + + attrs = devm_kcalloc(&nvmem->dev, ncells, sizeof(struct bin_attribute), GFP_KERNEL); + if (!attrs) { + ret = -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 = devm_kstrdup(&nvmem->dev, entry->name, GFP_KERNEL); + attrs[i].attr.mode = 0444; + attrs[i].size = entry->bytes; + attrs[i].read = &nvmem_cell_attr_read; + if (!attrs[i].attr.name) { + ret = -ENOMEM; + goto unlock_mutex; + } + + cells_attrs[i] = &attrs[i]; + i++; + } + +unlock_mutex: + mutex_unlock(&nvmem_mutex); + + return ret; +} + #else /* CONFIG_NVMEM_SYSFS */ static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem, @@ -976,16 +1107,22 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (rval) goto err_remove_cells; + rval = nvmem_add_cells_from_layout(nvmem); + if (rval) + goto err_remove_cells; + +#ifdef CONFIG_NVMEM_SYSFS + rval = nvmem_populate_sysfs_cells(nvmem); + if (rval) + goto err_remove_cells; +#endif + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); rval = device_add(&nvmem->dev); if (rval) goto err_remove_cells; - rval = nvmem_add_cells_from_layout(nvmem); - if (rval) - goto err_remove_cells; - blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); return nvmem;