From: Herve Codina <herve.codina@bootlin.com>
To: Andrew Lunn <andrew@lunn.ch>, Rob Herring <robh@kernel.org>,
Saravana Kannan <saravanak@kernel.org>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>,
Luca Ceresoli <luca.ceresoli@bootlin.com>,
Andi Shyti <andi.shyti@kernel.org>,
Peter Rosin <peda@lysator.liu.se>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org,
Allan Nielsen <allan.nielsen@microchip.com>,
Horatiu Vultur <horatiu.vultur@microchip.com>,
Daniel Machon <daniel.machon@microchip.com>,
Steen Hegelund <steen.hegelund@microchip.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Herve Codina <herve.codina@bootlin.com>
Subject: [PATCH v10 6/6] i2c: atr: Create missing devlink between ATR and adapter physical device
Date: Wed, 18 Nov 2026 14:39:15 +0100 [thread overview]
Message-ID: <20261118133927.366482-7-herve.codina@bootlin.com> (raw)
In-Reply-To: <20261118133927.366482-1-herve.codina@bootlin.com>
When removing an i2c controller device handling an i2c bus where an i2c
ATR (address translator) is connected to, the removal process hangs and
is stuck in the wait_completion() call done in i2c_del_adapter().
The i2c_del_adapter() tries to removed the i2c adapter related to the
i2c controller device and the wait_completion() is waiting for the i2c
adapter device release. This release is performed when the device is no
more used (i.e. refcount reaches zero).
When an i2c ATR is involved in an i2c path, the struct dev topology is
the following:
+----------------+ +-------------------+
| i2c controller | atr->parent | deserializer |
| device | +----------- | device |
| (supplier) | | | (atr->dev) |
| ^ | | +-------------------+
| | | |
| dev's parent | | +-------------------+
| | | | | serializer |
| i2c adapter <-------+ | device |
| device <------------------- | (desc->parent) |
| (no driver) | i2c client | ^ |
+----------------+ | | |
| dev's parent |
| | |
| i2c adapter chanX |
| device |
| (no driver) |
+-------------------+
When an i2c ATR channel adapter is created, a reference is taken to its
adapter dev's parent. This parent is the device owning the channel
adapter (desc->parent), not necessarily atr->dev.
No relationship exists between the device owning the ATR channel adapter
and the i2c controller device (physical device) in order to have that
device calling i2c_del_adapter() to remove its downstream adapters and
so, release references taken to the upstream adapter.
This consumer/supplier relationship is typically a devlink relationship.
Also, i2c ATRs can be chained and so, the upstream adapter can be
supplied by either an i2c controller device or an other i2c ATR or mux
device.
In order to get the physical device of the adapter an ATR is connected
to, rely on the newly introduced i2c_adapter_get_physdev() and create
the missing devlink between the device owning the ATR channel adapter
(desc->parent) and the physical device of the adapter the ATR is
connected to.
With that done, the device owning the ATR channel adapter is removed
before the device handling the upstream i2c adapter (i2c controller
device or i2c mux/ATR device). All references are released and the
i2c_del_adapter() call performed by driver handling the upstream adapter
device is not blocking anymore.
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
drivers/i2c/i2c-atr.c | 46 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c
index 7c599d2d09c4..5bc7e31ba998 100644
--- a/drivers/i2c/i2c-atr.c
+++ b/drivers/i2c/i2c-atr.c
@@ -788,9 +788,12 @@ int i2c_atr_add_adapter(struct i2c_atr *atr, struct i2c_atr_adap_desc *desc)
struct fwnode_handle *bus_handle = desc->bus_handle;
struct i2c_adapter *parent = atr->parent;
char symlink_name[ATR_MAX_SYMLINK_LEN];
+ struct device *parent_physdev;
struct device *dev = atr->dev;
u32 chan_id = desc->chan_id;
struct i2c_atr_chan *chan;
+ struct i2c_client *client;
+ struct device_link *dl;
int ret, idx;
if (chan_id >= atr->max_adapters) {
@@ -864,6 +867,49 @@ int i2c_atr_add_adapter(struct i2c_atr *atr, struct i2c_atr_adap_desc *desc)
chan->alias_pool = atr->alias_pool;
}
+ /*
+ * There is no relationship set between the device registering the ATR
+ * channel adapter and the physical device handling the parent adapter.
+ * Create this missing relationship so that the consumer device (the one
+ * owning the ATR channel adapter) and the downstream adapters attached
+ * to it are removed before the supplier (the physical device handling
+ * the ATR upstream adapter).
+ */
+ parent_physdev = i2c_get_adapter_physdev(parent);
+ client = i2c_verify_client(desc->parent);
+ if (!parent_physdev) {
+ dev_warn(dev,
+ "no physical device for the parent adapter, skip device link\n");
+ } else if (parent_physdev == desc->parent) {
+ /*
+ * The parent physical device is the parent adapter itself
+ * itself. Skip the device link
+ */
+ put_device(parent_physdev);
+ } else if (client && client->adapter == parent) {
+ /*
+ * The device owning this ATR channel adapter is an I2C
+ * client on the parent adapter. i2c_del_adapter(parent)
+ * will unregister it and remove the channel adapters it
+ * owns before waiting for the parent adapter to be
+ * released. No device link is needed, and adding one
+ * would make the driver core unbind it before the parent
+ * physical device's .remove() callback.
+ */
+ put_device(parent_physdev);
+ } else {
+ dl = device_link_add(desc->parent, parent_physdev,
+ DL_FLAG_AUTOREMOVE_CONSUMER);
+ if (!dl) {
+ dev_err(dev, "failed to create device link to %s\n",
+ dev_name(parent_physdev));
+ put_device(parent_physdev);
+ ret = -EINVAL;
+ goto err_free_alias_pool;
+ }
+ put_device(parent_physdev);
+ }
+
atr->adapter[chan_id] = &chan->adap;
ret = i2c_add_adapter(&chan->adap);
--
2.56.0
prev parent reply other threads:[~2026-11-18 13:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 13:39 [PATCH v10 0/6] lan966x pci device: Add support for SFPs, i2c part Herve Codina
2026-11-18 13:39 ` [PATCH v10 1/6] media: rtl2832: Use I2C client device as mux device Herve Codina
2026-11-18 13:39 ` [PATCH v10 2/6] i2c: core: Introduce i2c_get_adapter_physdev() Herve Codina
2026-11-18 13:39 ` [PATCH v10 3/6] i2c: mux: Set adapter physical device Herve Codina
2026-11-18 13:39 ` [PATCH v10 4/6] i2c: mux: Create missing devlink between mux and " Herve Codina
2026-11-18 13:39 ` [PATCH v10 5/6] i2c: atr: Set " Herve Codina
2026-11-18 13:39 ` Herve Codina [this message]
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=20261118133927.366482-7-herve.codina@bootlin.com \
--to=herve.codina@bootlin.com \
--cc=allan.nielsen@microchip.com \
--cc=andi.shyti@kernel.org \
--cc=andrew@lunn.ch \
--cc=daniel.machon@microchip.com \
--cc=horatiu.vultur@microchip.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=luca.ceresoli@bootlin.com \
--cc=mchehab@kernel.org \
--cc=peda@lysator.liu.se \
--cc=robh@kernel.org \
--cc=saravanak@kernel.org \
--cc=steen.hegelund@microchip.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=tomi.valkeinen@ideasonboard.com \
--cc=wsa+renesas@sang-engineering.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®