From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49536606D193 for ; Fri, 13 Nov 2026 00:33:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=utEGXN4I; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=FsvVz8G7 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=gzJwJGqA9QMdUQ3iiH69qz7c5FpfkTATIbRSyZyT2vY=; b=utEGXN4Ie/Lp7k VXyl0AoEg9mSq/axHzGMXrzP2eSQqhfR+hh9HS0gFEtu0tjbbvNsINMf2xzTBKOLYNj4kwLmT/VdE zNoZrVT+dBExVGtpmReDoFMKWjGTOk68x7kBvOTw+6H5RRhlAuvRNvclQh2HNEVfQZWQsKIN3jJsw tJoWcTDOjVup9pvlHHbuqcHdm3zZWjMUzmHvGSPZA4cba8FhWdkes3kzl6ZyZ6uSfou67dOeeog4w vlLLDebra2JqBrV20Lh5jso8Vk4d2KfeVC+gT4j7Bnq8ENe/xaskUgw3YxFi8lqY0cBq8/P9wXs+Y +0hD5GOl4GhjkU8Ym/DQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xRfDv-0000000BJcd-4AUk; Fri, 13 Nov 2026 00:33:00 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xRfDp-0000000BJPl-0Lmq for linux-mediatek@lists.infradead.org; Fri, 13 Nov 2026 00:32:55 +0000 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-4922523d1afso163413f8f.0 for ; Thu, 12 Nov 2026 16:32:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794529971; x=1795134771; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=gzJwJGqA9QMdUQ3iiH69qz7c5FpfkTATIbRSyZyT2vY=; b=FsvVz8G7PuD2fUkmSD7HPs74R4hIzW7MXWm48BXHwoGjpMgQbi+qhR8IIp+cnPHq2/ o4MrHV75sk/EI+iXTAUgqevaaQsiEbfaD+KWShAXfcghQNgttfVAA/X1KdZsggaYzlUQ WfuYZVwE09/RZnUpOGj3JFhHsiGwaH9TRwB85N8qZOLOHN6u635pvIJu0At1LBihzHi+ JUYprH9ud+i1JU9RxhsgTuPkdsRtXWEK/oXa2AqjPEof5Lq83FzbJf4q3wrslfjTldN3 zfdfyIzUPetyfARutDD9DBjrB/lJXFc+YsSM2KOUVENii/6iXf8c+/WkHKEJdVzvwJ/0 ZbBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794529971; x=1795134771; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=gzJwJGqA9QMdUQ3iiH69qz7c5FpfkTATIbRSyZyT2vY=; b=WhLw1mxFFmgay/r7xcX5w7WG5uVvSty+JGPoGq0jeSChjc9kXi1o0RQqdBshlSN/Pd yvnbZlQrwcrjfdLwCUhzrHBF0X1N3SqGeVPMeYdTrWHvP7ZNdK3mNihkjzPNxV1kW/h4 PBvvqo6HPHKpPPEDFBfrBWPY4E6jtqus/HLFNCk/TIfYrP06OnxJptd36bLVBCipVEVU xeH5aWlel4TkUpbdbLlitrPZjOsEJSSMga5dy6QOdbZh4CvRQYVF9p4IdW1GM19Ng5uw 3Fd0WMfIUf9ufTnJI644ErIOD19ByX8NUmzPJLGzzF+bV9z/oOzNFDRoL0+CzwT72+mN kikw== X-Forwarded-Encrypted: i=1; AL+hErHblclZB0ysZF+oftmWYEGWkmeu4Vt1x3XeNZhLtUBBmyDA7Dd6wZlRXEvrx6UTQzmLVhyXXpWJY0y9SGU1Xw==@lists.infradead.org X-Gm-Message-State: APuU4Z85FpKZXmS2Bh1PI9zV34ah4+FxIXKzbVi9hYwhSqyRdw5no9Yq ooMDOauEHPDtLgcogwQpXWhc3XtdOx7dRTJL1ZKNQ0rRv75u4BQKsrsh X-Gm-Gg: AYBFou0fi+K/muaIYc/p7fA8n/KjEKwU9M5yUIb0PTRTyzL8z/MuLClMG+x2HXPeG1l TVF4Em8pe3ma2g09l4MY6yZ1knsctpHFFe+ztYEa5oLsT7mmts6a/elhz6XY0J5jYhhHZhZQ9qm EQdWQBh3g8d73PIfy3BwUaArLYtCJLeWHaqwHZcCnoRODJsRRJn1zlucf2yZ7KknR2+g+g1+qx+ Lt9H4usgUHRyFWDudahDGughx9mpo2kKDxSjUFZTiIbHMEp8eUgwVr9thFdXjkw5rjtqqpk7pg/ td8xr7/AlZB5NK5M0GDsKgd8BPGZWF6J0v6OjlSdoV7ykAP0CYTM415L9YzgOKLD37pydfFj1wL +Q5effcECuBiO6WnZ3Cpb6IGtpTedjoJAZhSx8yuOeLbx7NJs2JoS+WYG8Z4p3JLejrQ5bKhhZI /X405qF8zmksljG2yprW3ayLUD6g1tnt1VaogMV+5sOAYQf4i7umDc7hRU1kBd/rLxd77ILA+Z5 +DpNhL2Yg9Zj7A044IFIj9vHS8kUScTDwiW9GV2EwLDnYj2tTJAYVcuZ33X2xAoX21AkR6VBP5h 2ztyjERGtQc0lI/DQr9wQ9vK2RGeZs6seg3ql4fDJZU93lIPGEBxJZxFFTZR6zv62HniPOBi8Av srOmF//b/scbbKWFEtD+LVNi/t+NQvZ19kHtizczKClnFwai7iL1JmMDxr1D8GVVSqhiFQIfShp 0= X-Received: by 2002:adf:e003:0:20b0:48e:679a:4b03 with SMTP id ffacd0b85a97d-49c7467a911mr1512554f8f.45.1794529971402; Thu, 12 Nov 2026 16:32:51 -0800 (PST) Received: from Ansuel-XPS24.localdomain (host-212-171-11-167.retail.telecomitalia.it. [212.171.11.167]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-49c5f7828a4sm2029768f8f.23.2026.11.12.16.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2026 16:32:50 -0800 (PST) From: Christian Marangi To: Maxime Chevallier , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Simon Horman , Jonathan Corbet , Shuah Khan , Randy Dunlap , Christian Marangi , Lorenzo Bianconi , Heiner Kallweit , Russell King , Philipp Zabel , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, llvm@lists.linux.dev Subject: [PATCH net-next v19 09/15] net: phylink: support late PCS provider attach Date: Fri, 13 Nov 2026 01:31:59 +0100 Message-ID: <20261113003217.197757-10-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261113003217.197757-1-ansuelsmth@gmail.com> References: <20261113003217.197757-1-ansuelsmth@gmail.com> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261112_163253_169029_0310FED5 X-CRM114-Status: GOOD ( 27.35 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Add support for late PCS provider attachment to a phylink instance. Similar to FWNODE_PCS_PROVIDER_DEL, FWNODE_PCS_PROVIDER_ADD is added to address the case where a PCS provider is added after a phylink instance is created and started. The PCS notifier will emit the event FWNODE_PCS_PROVIDER_ADD every time a new PCS provider is added. If a related PCS is found, then such PCS is added to the phylink instance PCS list. Such PCS is then linked to the phylink instance and the supported interfaces of the phylink instance get refreshed. If we are in a major_config_failed scenario an interface reconfiguration is triggered in the next phylink resolve. In the example scenario where the link was previously torn down due to removal of PCS, the link will be established again as the PCS came back and is now available to phylink. Signed-off-by: Christian Marangi --- drivers/net/pcs/pcs.c | 22 +++++++++++ drivers/net/phy/phylink.c | 82 ++++++++++++++++++++++++++++++--------- include/linux/pcs/pcs.h | 31 +++++++++++++++ 3 files changed, 116 insertions(+), 19 deletions(-) diff --git a/drivers/net/pcs/pcs.c b/drivers/net/pcs/pcs.c index 25b3248e8b93..fef560eddf2a 100644 --- a/drivers/net/pcs/pcs.c +++ b/drivers/net/pcs/pcs.c @@ -69,6 +69,10 @@ fwnode_pcs_add_provider(struct fwnode_handle *fwnode, mutex_unlock(&fwnode_pcs_mutex); + blocking_notifier_call_chain(&fwnode_pcs_notify_list, + FWNODE_PCS_PROVIDER_ADD, + pp); + pr_debug("Added pcs provider from %pfwf\n", fwnode); return pp; @@ -201,6 +205,24 @@ struct phylink_pcs *fwnode_pcs_get(const struct fwnode_handle *fwnode, unsigned } EXPORT_SYMBOL_GPL(fwnode_pcs_get); +struct phylink_pcs *fwnode_pcs_get_from_provider(struct fwnode_pcs_provider *provider, + const struct fwnode_handle *fwnode, + int index) +{ + struct fwnode_reference_args pcsspec; + struct phylink_pcs *pcs; + int ret; + + ret = fwnode_parse_pcsspec(fwnode, index, NULL, &pcsspec); + if (ret) + return ERR_PTR(ret); + + pcs = __fwnode_pcs_get_from_pcsspec_provider(&pcsspec, provider); + fwnode_handle_put(pcsspec.fwnode); + return pcs; +} +EXPORT_SYMBOL_GPL(fwnode_pcs_get_from_provider); + bool fwnode_pcs_matches_provider(struct fwnode_pcs_provider *provider, const struct fwnode_handle *fwnode, struct phylink_pcs *pl_pcs) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 243110e21e4b..7f91cf3eb951 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -2049,6 +2049,35 @@ int phylink_set_fixed_link(struct phylink *pl, } EXPORT_SYMBOL_GPL(phylink_set_fixed_link); +static bool phylink_add_pcs(struct phylink *pl, struct phylink_pcs *pcs) +{ + struct phylink_pcs *tmp; + + /* + * Make sure state mutex is locked to protect concurrent + * access to phylink instance PCS list from + * initial fill_available_pcs and late PCS attach + */ + lockdep_assert_held(&pl->state_mutex); + + /* Make sure PCS is not already in the list */ + list_for_each_entry(tmp, &pl->pcs_list, list) + if (tmp == pcs) + return false; + + if (WARN(rcu_access_pointer(pcs->phylink), + "%s: PCS already attached to a phylink instance\n", + __func__)) + return false; + + list_add_tail(&pcs->list, &pl->pcs_list); + + /* Link PCS to phylink */ + rcu_assign_pointer(pcs->phylink, pl); + + return true; +} + static int phylink_fill_available_pcs(struct phylink *pl, struct phylink_config *config) { @@ -2081,12 +2110,7 @@ static int phylink_fill_available_pcs(struct phylink *pl, if (!pcs) continue; - if (WARN(rcu_access_pointer(pcs->phylink), - "%s: PCS already attached to a phylink instance\n", - __func__)) - continue; - - list_add_tail(&pcs->list, &pl->pcs_list); + phylink_add_pcs(pl, pcs); } out: @@ -2133,26 +2157,50 @@ static int pcs_provider_notify(struct notifier_block *self, struct fwnode_pcs_provider *pp = data; struct phylink_pcs *pcs, *tmp; bool resolve = false; + int count, i; rtnl_lock(); mutex_lock(&pl->state_mutex); - /* - * Loop all the PCS for phylink instance and check if - * this notification is relevant for some of them. - */ - list_for_each_entry_safe(pcs, tmp, &pl->pcs_list, list) { - if (!fwnode_pcs_matches_provider(pp, pl->fwnode, pcs)) - continue; + switch (val) { + case FWNODE_PCS_PROVIDER_ADD: + count = fwnode_phylink_pcs_count(pl->fwnode); + for (i = 0; i < count; i++) { + pcs = fwnode_pcs_get_from_provider(pp, pl->fwnode, i); + if (IS_ERR_OR_NULL(pcs)) + continue; + + /* Trigger a resolve only if a PCS is actually added */ + if (phylink_add_pcs(pl, pcs)) + resolve = true; + } + + /* Force an interface reconfig if major config fail */ + if (resolve && pl->major_config_failed) + pl->force_major_config = true; - phylink_del_pcs(pl, pcs); - resolve = true; + break; + case FWNODE_PCS_PROVIDER_DEL: + /* + * Loop all the PCS for phylink instance and check if + * this notification is relevant for some of them. + */ + list_for_each_entry_safe(pcs, tmp, &pl->pcs_list, list) { + if (!fwnode_pcs_matches_provider(pp, pl->fwnode, pcs)) + continue; + + phylink_del_pcs(pl, pcs); + resolve = true; + } + break; } /* Exit early if nothing has changed */ if (!resolve) { mutex_unlock(&pl->state_mutex); + rtnl_unlock(); + return NOTIFY_DONE; } @@ -2398,10 +2446,6 @@ struct phylink *phylink_create(struct phylink_config *config, mutex_lock(&pl->state_mutex); - /* Link available PCS to phylink */ - list_for_each_entry(pcs, &pl->pcs_list, list) - rcu_assign_pointer(pcs->phylink, pl); - phy_interface_copy(pl->supported_interfaces, pl->config->supported_interfaces); diff --git a/include/linux/pcs/pcs.h b/include/linux/pcs/pcs.h index 83e0a2ad4b09..00a636c82c65 100644 --- a/include/linux/pcs/pcs.h +++ b/include/linux/pcs/pcs.h @@ -5,6 +5,7 @@ #include enum fwnode_pcs_notify_event { + FWNODE_PCS_PROVIDER_ADD, FWNODE_PCS_PROVIDER_DEL, }; @@ -50,6 +51,28 @@ int unregister_fwnode_pcs_notifier(struct notifier_block *nb); struct phylink_pcs *fwnode_pcs_get(const struct fwnode_handle *fwnode, unsigned int index); +/** + * fwnode_pcs_get_from_provider() - Retrieve a PCS from a specific provider + * @provider: PCS provider to use + * @fwnode: firmware node + * @index: index fwnode PCS handle in firmware node + * + * Get a PCS from the firmware node at index specifically provided by + * passed PCS provider. + * + * Unlike fwnode_pcs_get(), this function does not search the global list of + * PCS providers. The caller must provide the provider responsible for the + * referenced PCS. + * + * Returns: a pointer to the phylink_pcs or a negative error pointer. Can + * return -ENODEV if the PCS is not present in global providers list (either + * due to driver still needs to be probed or it failed to probe/removed) or + * can return -EINVAL if the PCS provider doesn't expose any PCS for the fwnode. + */ +struct phylink_pcs *fwnode_pcs_get_from_provider(struct fwnode_pcs_provider *provider, + const struct fwnode_handle *fwnode, + int index); + /** * fwnode_pcs_matches_provider() - Check whether a PCS belongs to a provider * @provider: PCS provider to check @@ -120,6 +143,14 @@ static inline struct phylink_pcs *fwnode_pcs_get(const struct fwnode_handle *fwn return ERR_PTR(-ENOENT); } +static inline struct phylink_pcs * +fwnode_pcs_get_from_provider(struct fwnode_pcs_provider *provider, + const struct fwnode_handle *fwnode, + int index) +{ + return ERR_PTR(-ENOENT); +} + static inline bool fwnode_pcs_matches_provider(struct fwnode_pcs_provider *provider, const struct fwnode_handle *fwnode, struct phylink_pcs *pl_pcs) -- 2.55.0