From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DDBC342146 for ; Mon, 3 Aug 2026 20:50:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785790234; cv=none; b=BsYB0BNHsMek30dboAcL71mSDbeojB3ruI8ncdDczHFUdxD2qpliSPb4dg/q5rwyAwvAeiJYJakA9NTiLOPUS53vm9BFtMA8C/acHP6dRKIaRFGnmnIYCplLZ2qE3a80x3xJei1Fbc/Wiu2vfK+kujdh7hNsFJumhfPxYHwDPS0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785790234; c=relaxed/simple; bh=Mv2fB5QTMgzygfKi4oX9eQwPWNNkjLy2vCUnRHb4K0E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YZl6sJYUM9s2m6t1Z6x23kzeULOoAR6fttFQF9nMMz7lUn/ALz0Sr0HtDi1Kl2oYYqvP0EiG5CufkLdhgON+wJXmN8UapBWN1W8rC4MjiKTEdz4dyxLKMqNcSCBynO/WCM+HJxoE3IViqHd79rtxjsUSlR5y+1/Ha3Ph8aN49b4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=R5/NJ34K; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R5/NJ34K" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-38e071ed6aeso2899500a91.0 for ; Mon, 03 Aug 2026 13:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785790230; x=1786395030; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=jXjf3n6y2o2sUp9ziyNWD3SU5x1Q1/QeHjG5pG2QUDY=; b=R5/NJ34KbgbSSSwP/mL7/dZ/mxx+64Oj39jF8LRMthrCM21JJAEe9emil60hag8QPu nVAiKqVQ5JkM893S+WpcxRS8TZpKxim9FquWzc9SyaIB8Ijh3lXCr4+vDyq5CerCcgrw LZg75+PfFwImIuT/JAOZMFSdKyMb1rhviawBF7V73lMvl2JUbcNchdVxqde8bhe1tbj5 rrxbhvvh1dTpyHdVhQoC6rY6jHOmNsDuR14gQXJqsZVfEK4Oly3LWWQz68rIgapkToDf vfDnp5I4EsbeeViocd1l3xMKGjNGzs4YBBUPH/xeeWOd6tLHBhih0ZjLxtZaiDDd+FLk C2+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785790230; x=1786395030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=jXjf3n6y2o2sUp9ziyNWD3SU5x1Q1/QeHjG5pG2QUDY=; b=iS0feuS8Nyw6Zh3wNMUKFkak0r84qWw8+QUVZQp6UIu18pBkvz8mQCvFaWIyFq59fX UBgwRaNtAhIIwHb5rAc/aNFSG30EEeGysfSUm2pCRxlNKQwRawOFiJI0LQIiGp6UyMvd +RqXp9H4ZMzKGHTzKavL8UFHV9/51rWRJDt52hVgRXkSsYRg8JZEzOLQ0qfYCpXyl0z3 V9RXjht5BGq/gDKHfXLCnfPWUr4Q27Eg8a++BuOEeNmLLfZXXUYEar8Kc9rkmEq9cUzP v1sBghKzznru4KxRnIL/YpxNEoN5XS+wEvsGdZ9L4hAu1ANDbjOCj6WrE2F8zy2dbzPu SIDg== X-Forwarded-Encrypted: i=1; AHgh+RpM5/iTl8siUkQQffHjtb86SSsNOFWUA8MWO5WGqL4T1rHW4E4MzA0vL6HHeLeQuNd310QD4dAWMmLnz2ZEymk=@vger.kernel.org X-Gm-Message-State: AOJu0Ywr3JKQVIu588aTWHLaxUkORk/YGSDnNeDDs79vWqDDIVZeH9UO pUf9sTQJha7PIGTVdAjMW+YltSB/+gW26AYhNZKAHxxgyaWB9/Gsfbv4 X-Gm-Gg: AR+sD13sX5zUwnxLZEUiiS6CWcoXv0L5ZN5RAikIF8fOqXsBDjD9rrWN4O1oTXhVJdo HhXZuIscGT/rZx9xyr/VIKKmQl7PHhs5u1Zxc4kCiMdBa2pfcIUI9GAdyFh3TgrI1mJ8qpFVbD7 4e7V+1wEl4AmvaLN9spjEVmOEU5a3A1lA+uDuMtQt4ci2AoOu5e2+kaSizncBNfSgGD+rC6fOZr pZONBSsr/2hs3DW+JLdtjC+1fF68HciBErlKoi1G9VOAvNy9FbtyoYFD78Riqa6jSz3roH5gnRJ tpDSeY+ex8EVSwp3EWbhmyTd2vKAfO0zAXJ/G9mmwZbbOxLz3tXf8tvZ5KUaxfpwRMV+y3E1qa4 wFLfpzSqnGsdBDGiB6GeYo8fcVUqOQ7QwRKPI8Np2sgt7cSPeCuA9zIWeUdYc11DN00mWpnn+2e ajdAdISVWt25JFl1WGVzbbeggFDhDUjBzIbShPsTH4srfe4bQMYYLM8zZ/E0L4yl1g7Fim7yDJu p73sw== X-Received: by 2002:a17:90b:53c7:b0:38d:a150:ee04 with SMTP id 98e67ed59e1d1-38fbc4ef153mr9786906a91.30.1785790229767; Mon, 03 Aug 2026 13:50:29 -0700 (PDT) Received: from Mac.net ([12.162.234.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13fab4d10bbsm33112324c88.11.2026.08.03.13.50.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 03 Aug 2026 13:50:28 -0700 (PDT) From: Ahmad Byagowi To: linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-i2c@vger.kernel.org, netdev@vger.kernel.org Cc: Lee Jones , Pavel Machek , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andi Shyti , Peter Rosin , Nam Tran , Vadim Fedorenko , Richard Cochran , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Kees Cook , "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC net-next v2 3/6] i2c: mux: Propagate software nodes to channel adapters Date: Mon, 3 Aug 2026 13:50:08 -0700 Message-ID: <20260803205011.1249-4-ahmadexp@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260803205011.1249-1-ahmadexp@gmail.com> References: <20260803205011.1249-1-ahmadexp@gmail.com> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Device Tree channel nodes are associated with the adapters created by i2c-mux, but equivalent software-node descriptions are not. Find the software-node child whose reg value matches the channel and assign it to the new adapter. Keep a reference for the adapter lifetime so downstream clients can find the channel by firmware node. Signed-off-by: Ahmad Byagowi --- drivers/i2c/i2c-mux.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 681a201c2..1e587ea4e 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -264,6 +265,49 @@ static const struct i2c_lock_operations i2c_parent_lock_ops = { .unlock_bus = i2c_parent_unlock_bus, }; +static struct fwnode_handle * +i2c_mux_get_channel_swnode(struct i2c_mux_core *muxc, u32 chan_id) +{ + struct fwnode_handle *dev_node = dev_fwnode(muxc->dev); + struct fwnode_handle *mux_node, *child = NULL; + u32 reg; + + if (!is_software_node(dev_node)) + return NULL; + + if (muxc->arbitrator) + mux_node = fwnode_get_named_child_node(dev_node, "i2c-arb"); + else if (muxc->gate) + mux_node = fwnode_get_named_child_node(dev_node, "i2c-gate"); + else + mux_node = fwnode_get_named_child_node(dev_node, "i2c-mux"); + + if (mux_node) { + /* A "reg" property indicates an old-style firmware entry. */ + if (!fwnode_property_read_u32(mux_node, "reg", ®)) { + fwnode_handle_put(mux_node); + mux_node = NULL; + } + } + + if (!mux_node) + mux_node = fwnode_handle_get(dev_node); + else if (muxc->arbitrator || muxc->gate) + child = fwnode_handle_get(mux_node); + + if (!child) { + fwnode_for_each_child_node(mux_node, child) { + if (fwnode_property_read_u32(child, "reg", ®)) + continue; + if (chan_id == reg) + break; + } + } + + fwnode_handle_put(mux_node); + return child; +} + int i2c_mux_add_adapter(struct i2c_mux_core *muxc, u32 force_nr, u32 chan_id) { @@ -364,6 +408,12 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, priv->adap.dev.of_node = child; of_node_put(mux_node); + } else { + struct fwnode_handle *fwnode; + + fwnode = i2c_mux_get_channel_swnode(muxc, chan_id); + if (fwnode) + device_set_node(&priv->adap.dev, fwnode); } /* @@ -408,6 +458,8 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, return 0; err_free_priv: + if (is_software_node(dev_fwnode(&priv->adap.dev))) + fwnode_handle_put(dev_fwnode(&priv->adap.dev)); kfree(priv); return ret; } @@ -420,6 +472,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc) while (muxc->num_adapters) { struct i2c_adapter *adap = muxc->adapter[--muxc->num_adapters]; struct i2c_mux_priv *priv = adap->algo_data; + struct fwnode_handle *fwnode = dev_fwnode(&adap->dev); struct device_node *np = adap->dev.of_node; muxc->adapter[muxc->num_adapters] = NULL; @@ -430,6 +483,8 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc) sysfs_remove_link(&priv->adap.dev.kobj, "mux_device"); i2c_del_adapter(adap); + if (is_software_node(fwnode)) + fwnode_handle_put(fwnode); of_node_put(np); kfree(priv); } -- 2.50.1 (Apple Git-155)