mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
	<linux-kernel@vger.kernel.org>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Michael Walle" <michael@walle.cc>,
	"Rafał Miłecki" <rafal@milecki.pl>,
	"Robert Marko" <robert.marko@sartura.hr>,
	"Luka Perkov" <luka.perkov@sartura.hr>,
	"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Frank Rowand" <frowand.list@gmail.com>,
	devicetree@vger.kernel.org,
	"Miquel Raynal" <miquel.raynal@bootlin.com>
Subject: [PATCH v3 10/20] nvmem: core: handle the absence of expected layouts
Date: Wed,  8 Mar 2023 16:31:50 +0100	[thread overview]
Message-ID: <20230308153200.682248-11-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20230308153200.682248-1-miquel.raynal@bootlin.com>

Make nvmem_layout_get() return -EPROBE_DEFER while the expected layout
is not available. This condition cannot be triggered today as nvmem
layout drivers are initialed as part of an early init call, but soon
these drivers will be converted into modules and be initialized with a
standard priority, so the unavailability of the drivers might become a
reality that must be taken care of.

Let's anticipate this by telling the caller the layout might not yet be
available. A probe deferral is requested in this case.

Please note this does not affect any nvmem device not using layouts,
because an early check against the "nvmem-layout" container presence
will return NULL in this case.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Tested-by: Michael Walle <michael@walle.cc>
---
 drivers/nvmem/core.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index b9be1faeb7be..51fd792b8d70 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -755,7 +755,7 @@ EXPORT_SYMBOL_GPL(nvmem_layout_unregister);
 static struct nvmem_layout *nvmem_layout_get(struct nvmem_device *nvmem)
 {
 	struct device_node *layout_np, *np = nvmem->dev.of_node;
-	struct nvmem_layout *l, *layout = NULL;
+	struct nvmem_layout *l, *layout = ERR_PTR(-EPROBE_DEFER);
 
 	layout_np = of_get_child_by_name(np, "nvmem-layout");
 	if (!layout_np)
@@ -938,6 +938,13 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
 	 * pointer will be NULL and nvmem_layout_put() will be a noop.
 	 */
 	nvmem->layout = config->layout ?: nvmem_layout_get(nvmem);
+	if (IS_ERR(nvmem->layout)) {
+		rval = PTR_ERR(nvmem->layout);
+		nvmem->layout = NULL;
+
+		if (rval == -EPROBE_DEFER)
+			goto err_teardown_compat;
+	}
 
 	if (config->cells) {
 		rval = nvmem_add_cells(nvmem, config->cells, config->ncells);
@@ -970,6 +977,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
 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:
-- 
2.34.1


  parent reply	other threads:[~2023-03-08 15:33 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-08 15:31 [PATCH v3 00/20] [PATCH v3 00/20] nvmem: Layouts support Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 01/20] of: Fix modalias string generation Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 02/20] of: Update of_device_get_modalias() Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 03/20] of: Rename of_modalias_node() Miquel Raynal
2023-03-08 15:38   ` Mark Brown
2023-03-08 15:31 ` [PATCH v3 04/20] of: Move of_modalias() to module.c Miquel Raynal
2023-03-09  2:22   ` Rob Herring
2023-03-08 15:31 ` [PATCH v3 05/20] of: Move the request module helper logic " Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 06/20] usb: ulpi: Use of_request_module() Miquel Raynal
2023-03-08 15:50   ` Heikki Krogerus
2023-03-08 15:31 ` [PATCH v3 07/20] of: device: Kill of_device_request_module() Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 08/20] dt-bindings: nvmem: Fix spelling mistake "platforn" -> "platform" Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 09/20] nvmem: core: introduce NVMEM layouts Miquel Raynal
2023-03-10 10:55   ` Srinivas Kandagatla
2023-03-10 11:00     ` Rafał Miłecki
2023-03-08 15:31 ` Miquel Raynal [this message]
2023-03-08 15:31 ` [PATCH v3 11/20] nvmem: core: request layout modules loading Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 12/20] nvmem: core: add per-cell post processing Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 13/20] nvmem: core: allow to modify a cell before adding it Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 14/20] nvmem: imx-ocotp: replace global post processing with layouts Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 15/20] nvmem: cell: drop global cell_post_process Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 16/20] nvmem: core: provide own priv pointer in post process callback Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 17/20] nvmem: layouts: sl28vpd: Add new layout driver Miquel Raynal
2023-03-10 11:03   ` Srinivas Kandagatla
2023-03-10 11:16     ` Miquel Raynal
2023-03-10 11:43       ` Srinivas Kandagatla
2023-03-08 15:31 ` [PATCH v3 18/20] MAINTAINERS: add myself as sl28vpd nvmem " Miquel Raynal
2023-03-08 15:31 ` [PATCH v3 19/20] nvmem: layouts: onie-tlv: Add new " Miquel Raynal
2023-03-08 15:32 ` [PATCH v3 20/20] MAINTAINERS: Add myself as ONIE tlv NVMEM layout maintainer Miquel Raynal
2023-03-14 11:28 ` [PATCH v3 00/20] [PATCH v3 00/20] nvmem: Layouts support Srinivas Kandagatla

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230308153200.682248-11-miquel.raynal@bootlin.com \
    --to=miquel.raynal@bootlin.com \
    --cc=devicetree@vger.kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luka.perkov@sartura.hr \
    --cc=michael@walle.cc \
    --cc=rafal@milecki.pl \
    --cc=robert.marko@sartura.hr \
    --cc=robh+dt@kernel.org \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®