FAILED: patch "[PATCH] i2c: core: fix adapter probe deferral loop" failed to apply to 5.10-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.10-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 <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 158efa411c57111d87bf265a3776614f32d70007
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071657-book-manhandle-a0e6@gregkh' --subject-prefix 'PATCH 5.10.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 158efa411c57111d87bf265a3776614f32d70007 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Mon, 11 May 2026 16:37:09 +0200
Subject: [PATCH] i2c: core: fix adapter probe deferral loop
Drivers must not probe defer after having registered devices as that will trigger a probe loop if the devices bind to a driver (cf. commit fbc35b45f9f6 ("Add documentation on meaning of -EPROBE_DEFER")).
Move the recovery initialisation, where the GPIO lookup may fail, before registering the adapter to prevent this.
drivers/i2c/i2c-core-base.c +4 -4
@@ -1562,6 +1562,10 @@ static int i2c_register_adapter(struct i2c_adapter *adap) adap->dev.type = &i2c_adapter_type;device_initialize (&adap->dev); + res =i2c_init_recovery (adap); +if (res == -EPROBE_DEFER ) + goto err_put_adap; +/* * This adapter can be used as a parent immediately after device_add(), * setup runtime-pm (especially ignore-children) before hand.
@@ -1583,10 +1587,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)if (res) goto out_reg; - res =i2c_init_recovery (adap); -if (res == -EPROBE_DEFER ) - goto out_reg; -dev_dbg (&adap->dev,"adapter [%s] registered\n" , adap->name);/* create pre-declared device nodes */
Sasha Levin
maintainerPATCH 1/7 device property: Add fwnode_irq_get_byname
From: Akhil R <[email protected]>
[ Upstream commit ca0acb511c21738b32386ce0f85c284b351d919e ]
Add fwnode_irq_get_byname() to get an interrupt by name from either ACPI table or Device Tree, whichever is used for enumeration.
In the ACPI case, this allow us to use 'interrupt-names' in _DSD which can be mapped to Interrupt() resource by index. The implementation is similar to 'interrupt-names' in the Device Tree.
Stable-dep-of: 158efa411c57 ("i2c: core: fix adapter probe deferral loop")
--- drivers/base/property.c | 29 +++++++++++++++++++++++++++++ include/linux/property.h | 1 + 2 files changed, 30 insertions(+)
drivers/base/property.c +29 -0
@@ -1042,6 +1042,35 @@ int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index) }EXPORT_SYMBOL (fwnode_irq_get); +/** +* fwnode_irq_get_byname - Get IRQ from a fwnode using its name +* @fwnode: Pointer to the firmware node +* @name: IRQ name +* +* Description: +* Find a match to the string @name in the 'interrupt-names' string array +* in _DSD for ACPI, or of_node for Device Tree. Then get the Linux IRQ +* number of the IRQ resource corresponding to the index of the matched +* string. +* +* Return: +* Linux IRQ number on success, or negative errno otherwise. +*/ +int fwnode_irq_get_byname (const struct fwnode_handle *fwnode,const char *name) +{ +int index; + +if (!name) +return -EINVAL ; + + index =fwnode_property_match_string (fwnode,"interrupt-names" , name); +if (index <0 ) +return index; + +return fwnode_irq_get (fwnode, index); +} +EXPORT_SYMBOL (fwnode_irq_get_byname); +/** * fwnode_graph_get_next_endpoint - Get next endpoint firmware node * @fwnode: Pointer to the parent firmware node
include/linux/property.h +1 -0
@@ -120,6 +120,7 @@ struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode);void fwnode_handle_put (struct fwnode_handle *fwnode);int fwnode_irq_get (const struct fwnode_handle *fwnode,unsigned int index); +int fwnode_irq_get_byname (const struct fwnode_handle *fwnode,const char *name);unsigned int device_get_child_node_count (struct device *dev);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/7 i2c: smbus: Use device_*() functions instead of of_*()
From: Akhil R <[email protected]>
[ Upstream commit a263a84088f689bf0c1552a510b25d0bcc45fcae ]
Change of_*() functions to device_*() for firmware agnostic usage. This allows to have the smbus_alert interrupt without any changes in the controller drivers using the ACPI table.
Stable-dep-of: 158efa411c57 ("i2c: core: fix adapter probe deferral loop")
--- drivers/i2c/i2c-core-base.c | 2 +- drivers/i2c/i2c-core-smbus.c | 11 ++++++----- drivers/i2c/i2c-smbus.c | 5 +++-- include/linux/i2c-smbus.h | 6 +++--- 4 files changed, 13 insertions(+), 11 deletions(-)
drivers/i2c/i2c-core-base.c +1 -1
@@ -1464,7 +1464,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap) goto out_list; } - res =of_i2c_setup_smbus_alert (adap); + res =i2c_setup_smbus_alert (adap);if (res) goto out_reg;
drivers/i2c/i2c-core-smbus.c +6 -5
@@ -14,6 +14,7 @@#include <linux/err.h> #include <linux/i2c.h> #include <linux/i2c-smbus.h> +#include <linux/property.h> #include <linux/slab.h> #include "i2c-core.h"
@@ -699,13 +700,13 @@ struct i2c_client *i2c_new_smbus_alert_device(struct i2c_adapter *adapter, }EXPORT_SYMBOL_GPL (i2c_new_smbus_alert_device); -#if IS_ENABLED (CONFIG_I2C_SMBUS ) &&IS_ENABLED (CONFIG_OF ) -int of_i2c_setup_smbus_alert (struct i2c_adapter *adapter) +#if IS_ENABLED (CONFIG_I2C_SMBUS ) +int i2c_setup_smbus_alert (struct i2c_adapter *adapter) {int irq; - irq =of_property_match_string (adapter->dev.of_node,"interrupt-names" , -"smbus_alert" ); + irq =device_property_match_string (adapter->dev.parent,"interrupt-names" , +"smbus_alert" );if (irq == -EINVAL || irq == -ENODATA )return 0 ;else if (irq <0 )
@@ -713,5 +714,5 @@ int of_i2c_setup_smbus_alert(struct i2c_adapter *adapter) return PTR_ERR_OR_ZERO(i2c_new_smbus_alert_device(adapter, NULL)); } -EXPORT_SYMBOL_GPL (of_i2c_setup_smbus_alert); +EXPORT_SYMBOL_GPL (i2c_setup_smbus_alert);#endif
drivers/i2c/i2c-smbus.c +3 -2
@@ -13,7 +13,7 @@#include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/of_irq.h> +#include <linux/property.h> #include <linux/slab.h> #include <linux/workqueue.h>
@@ -178,7 +178,8 @@ static int smbalert_probe(struct i2c_client *ara,if (setup) { irq = setup->irq; }else { - irq =of_irq_get_byname (adapter->dev.of_node,"smbus_alert" ); + irq =fwnode_irq_get_byname (dev_fwnode (adapter->dev.parent), +"smbus_alert" );if (irq <=0 )return irq; }
include/linux/i2c-smbus.h +3 -3
@@ -30,10 +30,10 @@ struct i2c_client *i2c_new_smbus_alert_device(struct i2c_adapter *adapter, struct i2c_smbus_alert_setup *setup);int i2c_handle_smbus_alert (struct i2c_client *ara); -#if IS_ENABLED (CONFIG_I2C_SMBUS ) &&IS_ENABLED (CONFIG_OF ) -int of_i2c_setup_smbus_alert (struct i2c_adapter *adap); +#if IS_ENABLED (CONFIG_I2C_SMBUS ) +int i2c_setup_smbus_alert (struct i2c_adapter *adap);#else -static inline int of_i2c_setup_smbus_alert (struct i2c_adapter *adap) +static inline int i2c_setup_smbus_alert (struct i2c_adapter *adap) {return 0 ; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/7 i2c: core: Setup i2c_adapter runtime-pm before calling device_add()
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 60f68597024d5af727c8a5f5f3b11f246265192b ]
Platform glue code, which is not build into the kernel and thus cannot use i2c_register_board_info() may want to use bus_register_notifier() to listen for i2c-adapters to show up on which the platform code needs to manually instantiate platform specific i2c_clients.
This results in calling i2c_new_client_device() from the bus notifier which happens near the device_add() call.
If the i2c-core has not yet setup runtime-pm (specifically the no-callbacks and ignore-children flags) for the device embedded inside struct i2c_adapter and the driver for the i2c_client calls pm_runtime_set_active() this will trigger the following error inside __pm_runtime_set_status():
"runtime PM trying to activate child device %s but parent (%s) is not active\n"
and the i2c_client's runtime-status will not be updated.
Split the device_register() call for the adapter into device_initialize() and device_add() and move the pm-runtime init calls inbetween these 2 calls so that the runtime-status can be correctly set when a driver binds from the bus-notifier.
Note the moved pm-runtime init calls just override the initial value of some flags in struct device set by device_initialize() and calling these before device_add() is safe.
Stable-dep-of: 158efa411c57 ("i2c: core: fix adapter probe deferral loop")
--- drivers/i2c/i2c-core-base.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/i2c/i2c-core-base.c +11 -5
@@ -1458,7 +1458,17 @@ static int i2c_register_adapter(struct i2c_adapter *adap)dev_set_name (&adap->dev,"i2c-%d" , adap->nr); adap->dev.bus = &i2c_bus_type; adap->dev.type = &i2c_adapter_type; - res =device_register (&adap->dev); +device_initialize (&adap->dev); + +/* +* This adapter can be used as a parent immediately after device_add(), +* setup runtime-pm (especially ignore-children) before hand. +*/ +pm_runtime_no_callbacks (&adap->dev); +pm_suspend_ignore_children (&adap->dev, true); +pm_runtime_enable (&adap->dev); + + res =device_add (&adap->dev);if (res) {pr_err ("adapter '%s': can't register device (%d)\n" , adap->name, res); goto out_list;
@@ -1468,10 +1478,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)if (res) goto out_reg; -pm_runtime_no_callbacks (&adap->dev); -pm_suspend_ignore_children (&adap->dev, true); -pm_runtime_enable (&adap->dev); - res =i2c_init_recovery (adap);if (res == -EPROBE_DEFER ) goto out_reg;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 4/7 i2c: core: fix reference leak in i2c_register_adapter()
In reply to Sasha LevinFrom: Joe Hattori <[email protected]>
[ Upstream commit 3f8c4f5e9a57868fa107016c81165686d23325f2 ]
The reference count of the device incremented in device_initialize() is not decremented when device_add() fails. Add a put_device() call before returning from the function.
This bug was found by an experimental static analysis tool that I am developing.
Stable-dep-of: 158efa411c57 ("i2c: core: fix adapter probe deferral loop")
--- drivers/i2c/i2c-core-base.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/i2c-core-base.c +1 -0
@@ -1471,6 +1471,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap) res =device_add (&adap->dev);if (res) {pr_err ("adapter '%s': can't register device (%d)\n" , adap->name, res); +put_device (&adap->dev); goto out_list; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 5/7 i2c: core: fix irq domain leak on adapter registration failure
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 8ce19524e4cc2462685f596a6402fbd8fb984ab2 ]
Make sure to tear down the host notify irq domain on adapter registration failure to avoid leaking it.
This issue was flagged by Sashiko when reviewing another adapter registration fix.
Stable-dep-of: 158efa411c57 ("i2c: core: fix adapter probe deferral loop")
--- drivers/i2c/i2c-core-base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/i2c/i2c-core-base.c +3 -1
@@ -1472,7 +1472,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)if (res) {pr_err ("adapter '%s': can't register device (%d)\n" , adap->name, res);put_device (&adap->dev); - goto out_list; + goto err_remove_irq_domain; } res =i2c_setup_smbus_alert (adap);
@@ -1512,6 +1512,8 @@ static int i2c_register_adapter(struct i2c_adapter *adap)init_completion (&adap->dev_released);device_unregister (&adap->dev);wait_for_completion (&adap->dev_released); +err_remove_irq_domain: +i2c_host_notify_irq_teardown (adap); out_list:mutex_lock (&core_lock);idr_remove (&i2c_adapter_idr, adap->nr);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 6/7 i2c: core: fix NULL-deref on adapter registration failure
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 2295d2bb101faa663fbc45fadbb3fec45f107441 ]
If adapter registration ever fails the release callback would trigger a NULL-pointer dereference as the completion struct has not been initialised.
Note that before the offending commit this would instead have resulted in a minor memory leak of the adapter name.
Stable-dep-of: 158efa411c57 ("i2c: core: fix adapter probe deferral loop")
--- drivers/i2c/i2c-core-base.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/i2c/i2c-core-base.c +5 -4
@@ -1471,8 +1471,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap) res =device_add (&adap->dev);if (res) {pr_err ("adapter '%s': can't register device (%d)\n" , adap->name, res); -put_device (&adap->dev); - goto err_remove_irq_domain; + goto err_put_adap; } res =i2c_setup_smbus_alert (adap);
@@ -1509,10 +1508,12 @@ static int i2c_register_adapter(struct i2c_adapter *adap)return 0 ; out_reg: +device_del (&adap->dev); +err_put_adap:init_completion (&adap->dev_released); -device_unregister (&adap->dev); +put_device (&adap->dev);wait_for_completion (&adap->dev_released); -err_remove_irq_domain: +i2c_host_notify_irq_teardown (adap); out_list:mutex_lock (&core_lock);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 7/7 i2c: core: fix adapter probe deferral loop
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 158efa411c57111d87bf265a3776614f32d70007 ]
Drivers must not probe defer after having registered devices as that will trigger a probe loop if the devices bind to a driver (cf. commit fbc35b45f9f6 ("Add documentation on meaning of -EPROBE_DEFER")).
Move the recovery initialisation, where the GPIO lookup may fail, before registering the adapter to prevent this.
--- drivers/i2c/i2c-core-base.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/i2c/i2c-core-base.c +4 -4
@@ -1460,6 +1460,10 @@ static int i2c_register_adapter(struct i2c_adapter *adap) adap->dev.type = &i2c_adapter_type;device_initialize (&adap->dev); + res =i2c_init_recovery (adap); +if (res == -EPROBE_DEFER ) + goto err_put_adap; +/* * This adapter can be used as a parent immediately after device_add(), * setup runtime-pm (especially ignore-children) before hand.
@@ -1478,10 +1482,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)if (res) goto out_reg; - res =i2c_init_recovery (adap); -if (res == -EPROBE_DEFER ) - goto out_reg; -dev_dbg (&adap->dev,"adapter [%s] registered\n" , adap->name);#ifdef CONFIG_I2C_COMPAT
Signature · 1 line
2.53.0