From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 6FB4E31B803 for ; Tue, 11 Aug 2026 05:02:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786424575; cv=none; b=Rg1FqpQnizk39BAk3+oeQqwCAIvTmEw7/oS0T57GU6p9dOLYVJEJrBs730KRhz0MIhE5q5Rvcbc+TpUipyy0GzWdKc8H92VMYHyJS+JdozjRIBH2TYJbbAPhg3i+vYS1RTMMbhDXXvMjfePkRKvHM0deqVAKXsqVRlEW5AeLI4M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786424575; c=relaxed/simple; bh=umZL5fn54uXO5itW8ulnK8HBtP6zF1pdNSWeGLlPGMw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gLI1xeZwBCF+nFZxbET7RbzhaUiuLG6bRDPjk4F7NEGmH7kkR/4ZDQH0BNDaxTdtd6kggggG55K9hB2xzWJoao7i89dc9SWUnFobl/WWWrZa1VbuqZxUUN37KOSraePhSHcIg7xhk8Q7vzJBOrlAITlT25N1yKH9il/Cf4Avhw8= 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=oGdUgFkQ; arc=none smtp.client-ip=209.85.216.54 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="oGdUgFkQ" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-38e69bdb0fcso2364436a91.1 for ; Mon, 10 Aug 2026 22:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786424572; x=1787029372; 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=Unu0bdi+4TO6yVD3obvp/HhqPNGfRa0ua+IlLQHYNqs=; b=oGdUgFkQAt2/jUvrXsDKMRk3l+XzskqVkBRDpeHUntjcfw4feSMKgsdpJvuhFUjMow aELEz5QedJlMe8VW1lIW0KGarfhsIFLByZBYQA0R4T0yjAniSbjlamQvyx6U/AZZp38w qtZCAi8x5DsT/rP0OPfWRyzCQ9Jr1FANeHbG7DBUmazzfWtqHz0MzFgPg1qBwj/smKPG NB2L2KGu1lUQ8GiQ4TADRZF03GOW6Qa4qswW3aytR97oycAK6V3jtGhTwOdce1bz6mQh Ecy7MdMGR20vuqHjXro3WEXRKqYtz0zP+KpgZpJ7QsAmURscD/3gs39aED+zFtt3w0gj cD0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786424572; x=1787029372; 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=Unu0bdi+4TO6yVD3obvp/HhqPNGfRa0ua+IlLQHYNqs=; b=TRoEWpb0XXaOb1kTMIlsbLdGxipb241YgcW/yPopOYcXAWmOmSZqwOORzHGJhwuDH5 wajRm6BGDW9365xyIAeLSV7nt9VHyvwsQ2ISGA/4uZEYOclUHdj4gUaQoXgEG7BWF9e6 hAOyX/Wl4JWYb2IxP5Y5DFU5mwFuew9aUso69SG1fA/WF/rHp2pn/Ttd4srTEGwxx0z6 ALd9J4BEg6Gfv4Zsc86396pjWLMUrWUZZs4AxhVTl18HPnnswoHGj1bOfFk9SnREnXKD Y3JA5DeOa4LjbMRD2XC5xGiyTdZtM9Vw1EA1kyUnbCkWQgKKETIBmdiQ4GYHTWeI+ze1 iloA== X-Gm-Message-State: AOJu0YzSjZy/bcTnnhNIsnZucZFCvNKAdlhHtTls8Bp7rmrdQqlpqPyR +Nzci7VDc9D6aLjfoNiqT2s+7edTKayWRPCM2AQQzH+QnSa7kNyCGpUCUfYpvKTxFOA= X-Gm-Gg: AR+sD13JEDSEupXB1OZYFK28+uAIGav+hf4Wz6Oc9lfT/kts80WZKR0qXqa7NQJy7pc C3sjz8wUftIrxJdki3ba3luSR5xnALMZBDxQmiMm1UBE9NWQTNck4qgccThwVOG4sa0QRS9A842 a7sTUE7oJOH/bmT7jN2IIYiVjcL5cLBwCXN/pMIp1c1dqy2swBDz4HlMEjSaHa3pxr7NC2jtTUJ +Qi+th330v06SjIHXnA9QAB5YJkbd/GAlUwgVhISgIGSDnZMACzrw+67YhQMvltj0JmyPQ9vUCa gu/1qPkJg8Y6e78ZVHF2rQF6zM/i4bogaBX1vV6WwJQapQza5ipSHdW5Z6BPk6YEggYPsfFKB8V 3WxxC63fysejt0EO4ERqyG1oLvna6eGuuY5jzFG/Sty0xerq5l15kjbrUcnthto1a22HtFg4are OsW/FRRaZiqlkIO9LAHTiz/JfrdDKjDYIDXf9zc/if2R2CL7ZMRrC/awSSY4DgtaVqrawM0Plu7 Wp6UJszOjDQotfcGv6ebj5t601JsHNJq4HTOZF182juGnJdVA== X-Received: by 2002:a17:90b:3b42:b0:37f:f8c5:93c2 with SMTP id 98e67ed59e1d1-392ec6e960emr616624a91.21.1786424571561; Mon, 10 Aug 2026 22:02:51 -0700 (PDT) Received: from Mac.localdomain (198-27-228-154.fiber.dynamic.sonic.net. [198.27.228.154]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-31c619cf07dsm660421eec.4.2026.08.10.22.02.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Aug 2026 22:02:51 -0700 (PDT) From: Ahmad Byagowi To: netdev@vger.kernel.org Cc: Lee Jones , Pavel Machek , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Nam Tran , Kees Cook , "Gustavo A. R. Silva" , Peter Rosin , Andi Shyti , Richard Cochran , Vadim Fedorenko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH net-next v3 3/5] i2c: mux: Propagate software nodes to channel adapters Date: Mon, 10 Aug 2026 22:02:42 -0700 Message-ID: <144d1e75321e084642f10086e554cccf51fa98ac.1786423898.git.ahmadexp@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@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 | 69 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 681a201c239b..8b54bb13c613 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -20,11 +20,13 @@ */ #include +#include #include #include #include #include #include +#include #include #include @@ -264,6 +266,55 @@ 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; + + /* A software node supplementing ACPI is the secondary fwnode. */ + if (!is_software_node(dev_node)) { + if (IS_ERR_OR_NULL(dev_node)) + return NULL; + dev_node = dev_node->secondary; + } + 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) { @@ -324,8 +375,8 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, priv->adap.lock_ops = &i2c_parent_lock_ops; /* - * Try to populate the mux adapter's of_node, expands to - * nothing if !CONFIG_OF. + * Associate the mux adapter with its DT or software-node channel. + * DT support expands to nothing if !CONFIG_OF. */ if (muxc->dev->of_node) { struct device_node *dev_node = muxc->dev->of_node; @@ -364,6 +415,18 @@ 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; + const struct software_node *swnode; + + fwnode = i2c_mux_get_channel_swnode(muxc, chan_id); + if (fwnode) { + swnode = to_software_node(fwnode); + ret = device_add_software_node(&priv->adap.dev, swnode); + fwnode_handle_put(fwnode); + if (ret) + goto err_free_priv; + } } /* @@ -408,6 +471,7 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, return 0; err_free_priv: + device_remove_software_node(&priv->adap.dev); kfree(priv); return ret; } @@ -429,6 +493,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc) sysfs_remove_link(&muxc->dev->kobj, symlink_name); sysfs_remove_link(&priv->adap.dev.kobj, "mux_device"); + device_remove_software_node(&priv->adap.dev); i2c_del_adapter(adap); of_node_put(np); kfree(priv); -- 2.50.1 (Apple Git-155)