* FAILED: patch "[PATCH] i2c: mark device nodes only in case of successful" failed to apply to 4.8-stable tree
@ 2016-11-06 11:55 gregkh
2016-11-06 13:15 ` [PATCH] i2c: mark device nodes only in case of successful instantiation Ralf Ramsauer
0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2016-11-06 11:55 UTC (permalink / raw)
To: ralf, geert+renesas, pantelis.antoniou, wsa; +Cc: stable
The patch below does not apply to the 4.8-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 6a676fb69dcbf3310b9e462c1db66c8e7f6ead38 Mon Sep 17 00:00:00 2001
From: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
Date: Mon, 17 Oct 2016 15:59:57 +0200
Subject: [PATCH] i2c: mark device nodes only in case of successful
instantiation
Instantiated I2C device nodes are marked with OF_POPULATE. This was
introduced in 4f001fd30145a6. On unloading, loaded device nodes will of
course be unmarked. The problem are nodes that fail during
initialisation: If a node fails, it won't be unloaded and hence not be
unmarked.
If a I2C driver module is unloaded and reloaded, it will skip nodes that
failed before.
Skip device nodes that are already populated and mark them only in case
of success.
Fixes: 4f001fd30145a6 ("i2c: Mark instantiated device nodes with OF_POPULATE")
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
[wsa: use 14-digit commit sha]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 5ab67219f71e..1704fc84d647 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1681,6 +1681,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
static void of_i2c_register_devices(struct i2c_adapter *adap)
{
struct device_node *bus, *node;
+ struct i2c_client *client;
/* Only register child devices if the adapter has a node pointer set */
if (!adap->dev.of_node)
@@ -1695,7 +1696,14 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
for_each_available_child_of_node(bus, node) {
if (of_node_test_and_set_flag(node, OF_POPULATED))
continue;
- of_i2c_register_device(adap, node);
+
+ client = of_i2c_register_device(adap, node);
+ if (IS_ERR(client)) {
+ dev_warn(&adap->dev,
+ "Failed to create I2C device for %s\n",
+ node->full_name);
+ of_node_clear_flag(node, OF_POPULATED);
+ }
}
of_node_put(bus);
@@ -2299,6 +2307,7 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action,
if (IS_ERR(client)) {
dev_err(&adap->dev, "failed to create client for '%s'\n",
rd->dn->full_name);
+ of_node_clear_flag(rd->dn, OF_POPULATED);
return notifier_from_errno(PTR_ERR(client));
}
break;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] i2c: mark device nodes only in case of successful instantiation
2016-11-06 11:55 FAILED: patch "[PATCH] i2c: mark device nodes only in case of successful" failed to apply to 4.8-stable tree gregkh
@ 2016-11-06 13:15 ` Ralf Ramsauer
2016-11-09 8:30 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Ralf Ramsauer @ 2016-11-06 13:15 UTC (permalink / raw)
To: gregkh, geert+renesas, pantelis.antoniou, wsa
Cc: stable, Ralf Ramsauer, stable
commit 6a676fb69dcbf3310b9e462c1db66c8e7f6ead38 upstream.
Instantiated I2C device nodes are marked with OF_POPULATE. This was
introduced in 4f001fd30145a6. On unloading, loaded device nodes will of
course be unmarked. The problem are nodes that fail during
initialisation: If a node fails, it won't be unloaded and hence not be
unmarked.
If a I2C driver module is unloaded and reloaded, it will skip nodes that
failed before.
Skip device nodes that are already populated and mark them only in case
of success.
Fixes: 4f001fd30145a6 ("i2c: Mark instantiated device nodes with OF_POPULATE")
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
[wsa: use 14-digit commit sha]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
---
Hi Greg,
this one is the backport for 4.8.y. Only hunks and surrounding context lines
shifted slightly, no functional changes compared to its upstream commit
6a676fb69dcbf.
Best
Ralf
drivers/i2c/i2c-core.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index da3a02ef4a..4f8ac45267 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1592,6 +1592,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
static void of_i2c_register_devices(struct i2c_adapter *adap)
{
struct device_node *node;
+ struct i2c_client *client;
/* Only register child devices if the adapter has a node pointer set */
if (!adap->dev.of_node)
@@ -1602,7 +1603,14 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
for_each_available_child_of_node(adap->dev.of_node, node) {
if (of_node_test_and_set_flag(node, OF_POPULATED))
continue;
- of_i2c_register_device(adap, node);
+
+ client = of_i2c_register_device(adap, node);
+ if (IS_ERR(client)) {
+ dev_warn(&adap->dev,
+ "Failed to create I2C device for %s\n",
+ node->full_name);
+ of_node_clear_flag(node, OF_POPULATED);
+ }
}
}
@@ -2201,6 +2209,7 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action,
if (IS_ERR(client)) {
dev_err(&adap->dev, "failed to create client for '%s'\n",
rd->dn->full_name);
+ of_node_clear_flag(rd->dn, OF_POPULATED);
return notifier_from_errno(PTR_ERR(client));
}
break;
--
2.10.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] i2c: mark device nodes only in case of successful instantiation
2016-11-06 13:15 ` [PATCH] i2c: mark device nodes only in case of successful instantiation Ralf Ramsauer
@ 2016-11-09 8:30 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2016-11-09 8:30 UTC (permalink / raw)
To: Ralf Ramsauer; +Cc: geert+renesas, pantelis.antoniou, wsa, stable, stable
On Sun, Nov 06, 2016 at 02:15:07PM +0100, Ralf Ramsauer wrote:
> commit 6a676fb69dcbf3310b9e462c1db66c8e7f6ead38 upstream.
>
> Instantiated I2C device nodes are marked with OF_POPULATE. This was
> introduced in 4f001fd30145a6. On unloading, loaded device nodes will of
> course be unmarked. The problem are nodes that fail during
> initialisation: If a node fails, it won't be unloaded and hence not be
> unmarked.
>
> If a I2C driver module is unloaded and reloaded, it will skip nodes that
> failed before.
>
> Skip device nodes that are already populated and mark them only in case
> of success.
>
> Fixes: 4f001fd30145a6 ("i2c: Mark instantiated device nodes with OF_POPULATE")
> Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Acked-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
> [wsa: use 14-digit commit sha]
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> Cc: stable@kernel.org
> ---
> Hi Greg,
>
> this one is the backport for 4.8.y. Only hunks and surrounding context lines
> shifted slightly, no functional changes compared to its upstream commit
> 6a676fb69dcbf.
Thanks for the backport, now applied.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-09 8:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-06 11:55 FAILED: patch "[PATCH] i2c: mark device nodes only in case of successful" failed to apply to 4.8-stable tree gregkh
2016-11-06 13:15 ` [PATCH] i2c: mark device nodes only in case of successful instantiation Ralf Ramsauer
2016-11-09 8:30 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.