From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A35E6C9831E for ; Thu, 24 Sep 2026 23:03:01 +0000 (UTC) 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-Owner; bh=GPvYqy1yVRl5U5KmtYrIeioVA19fMzqHeRn3UnWmBPU=; b=JoD/BJUOrVk6yYCGZk2pbHmfo5 KA2k+0xBKg3CptkmduBw7Q9/2NvQYHxNuFNoB6YCjeMZyHHIFnlZx1WQePhqU+1mfURGcgK3HKgOA ttN6qsoEUsgZuNErDsuY6EyCb253A0PiAyZAVX2OiQig3LtplzUChQGQ57/m44uPzXTLZVkEUB8FI xgXInidb+vRULJ7upxdAUtBZaal6YU3JXIj0TOycpBJe3WWHGfVLaou+ReOKyzXpi90441T6Rwuao +yo4Bx1vvuRL70akgUEncXwl107um8zcakyFijUXcli/mEaHflmRAt3DZRd2Yyy8+GZYv16fucoa4 RF0mxEOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x9sSo-0000000CLbW-0NkO; Thu, 24 Sep 2026 23:02:50 +0000 Received: from mail-wm2-x11.google.com ([2a00:1450:4864:31::11]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x9sSg-0000000CLSK-3Ro6 for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2026 23:02:44 +0000 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e79a408deso1606925e9.2 for ; Thu, 24 Sep 2026 16:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790290961; x=1790895761; 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=GPvYqy1yVRl5U5KmtYrIeioVA19fMzqHeRn3UnWmBPU=; b=Jg68f1vTEJvC1lNmT6elIFhJMwkT9F4gFsM+dh44pZRX6t0DS1Vv2SqoIeg5hpldt2 5RAB1j268suYpZ86xXMWHe6O3/xspa09ktCx+CM3H7Ya+nRn/YKuS4rczwiqJ/6aeNii y7n7iSWoH1X1QJ7nPgjPP99FoRXQ6tyg6TN3ik/wD2IwEgIZthl0hH8//B8i2ZB/ZsBX LrdpBtZKngMVo08hYVaZxkugEsnB9YDjUNr8WUhXEnIHXDBLAomCEg87Sq+BcuYZ1Pul 9YugoE9pYPhT/A6E6IvqKk4O38LW23/zfLipDfBvfx7om/20NeO4LEca7BV/kzkQ6+BX dRLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790290961; x=1790895761; 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=GPvYqy1yVRl5U5KmtYrIeioVA19fMzqHeRn3UnWmBPU=; b=Gu0iNcF/IN/cLvN1pQEqYCOMkSqXJOnTlCIVokk1xOuGYj0m8fOsYgOhKazcHievkL IymK63GWGR30Y9QiY+ZrspKf9RVYNLrUCd6MHJtNq8+ZdYv29PsryBdcZyAGsDJjsqiU zXU6d1MKTQIG0HUcVdGyaqTpGb2NAek8/fD6q+6n61PRi8NPeM/7Sa9qjaDJ7/yBKIdI ph9n7w55F10GXKi0ww5KFP4/uzg6SNA6KUDYvGq+0UeD2v7NhIAqzhMujzcCI0tP5//p KQ0xDD8OoiHMft+9BQs7LVQpnAr6z+jdsqhaLzahmDFt7SlVN+rNKHHf+DzJV4b1A1Tg p9/w== X-Forwarded-Encrypted: i=1; AKwUvBwgRBAkiSIZ+tcEoxS7BTuRgJEO816rVrfXwjXESSRcmUttZAW/bOqEvI0yEM1DEJQBLa/HWwCoWKcgqEUUMAAg@lists.infradead.org X-Gm-Message-State: AFuF++n+T3ARxo+SPaoJjtkglgRRf5e5H9zxHmCkCbvFXj6DcNAQD5XA nvw4DopRCROMT/zzQoAwfzRZNqQfTyXXUImYH6d3f96ZDAOSe3TXmXySLL1HsQ== X-Gm-Gg: AYBFou1kMqvMesXIMTRWbFlpDbRif4X5nifxolhHnIlRDS1fTjA49QPp8aDseOIh11N pu8NJMDAlnr+brdn1gqZVzbhDV+nbnsFiGpJuE2i3j5PUfbJPgfQYNjMv9ZHNW8XrB07jF8Ff74 w/38IgKNkOrUrQgUbMHs3tp4f2a+CLnM/zbICWGbh0U92UNjpj8NSVFgaZ2TVyeWh51WkK6tTPx 1m+/DnzwGNNtfLbFt7MBCG9pG8eRy0+vXU7gwdcDGTfrWEwe8MmtNwEIQmgPLSIXDoaCN2dJi5D DOTG4aDDEEWCm+cNjxfSR26kjSf8rqX34hHip8K0B256fyGgB00ArnJ3FszPt4ZZomzY/BFHy73 sWP1KkYW4sGS2D7sKySLQn8Nd4Zc8K5+2HcUNkrdZteAbyy7GPPA7DramquFcdBGs03RiiKjd/I rhgWTPHAAs+FVPkDa9IMCAR4yIcGHbA4j1UzgUz6gcKV1txgP68kDKY3tYH5XMCeHm9z2teqirO Kz3KyAhCyqXJqz372ehE81Y9LY61aNG20ZGWHkPxC1wFiQL4f/MvOgb8eDD0R+vjw== X-Received: by 2002:a05:600c:3b1b:b0:49c:de80:b833 with SMTP id 5b1f17b1804b1-49fe66c8a1emr72075055e9.2.1790290960877; Thu, 24 Sep 2026 16:02:40 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-79-29-83-136.business.telecomitalia.it. [79.29.83.136]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-49ff06cbe57sm12288175e9.13.2026.09.24.16.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 16:02:40 -0700 (PDT) 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 v17 06/12] net: phylink: support late PCS provider attach Date: Fri, 25 Sep 2026 01:01:47 +0200 Message-ID: <20260924230211.11519-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260924230211.11519-1-ansuelsmth@gmail.com> References: <20260924230211.11519-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260924_160242_917046_FA921922 X-CRM114-Status: GOOD ( 27.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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, 118 insertions(+), 17 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 019ce3d89da0..b87655a09df8 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1928,6 +1928,27 @@ int phylink_set_fixed_link(struct phylink *pl, } EXPORT_SYMBOL_GPL(phylink_set_fixed_link); +static void 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); + + list_for_each_entry(tmp, &pl->pcs_list, list) + if (tmp == pcs) + return; + + list_add_tail(&pcs->list, &pl->pcs_list); + + /* Link PCS to phylink */ + pcs->phylink = pl; +} + static int phylink_fill_available_pcs(struct phylink *pl, struct phylink_config *config) { @@ -1960,7 +1981,7 @@ static int phylink_fill_available_pcs(struct phylink *pl, if (!pcs) continue; - list_add_tail(&pcs->list, &pl->pcs_list); + phylink_add_pcs(pl, pcs); } out: @@ -2006,27 +2027,57 @@ 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(); + /* + * On PCS provider deletion hold rtnl lock as one of + * PCS can be currently in use by the phylink instance + * and ethtool OPs can reference it. + */ + if (val == FWNODE_PCS_PROVIDER_DEL) + 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(pcs)) + continue; + + 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(); + + if (val == FWNODE_PCS_PROVIDER_DEL) + rtnl_unlock(); + return NOTIFY_DONE; } @@ -2046,7 +2097,8 @@ static int pcs_provider_notify(struct notifier_block *self, phylink_validate_mask(pl, NULL, pl->supported, &pl->link_config, pl->supported_interfaces); - rtnl_unlock(); + if (val == FWNODE_PCS_PROVIDER_DEL) + rtnl_unlock(); phylink_run_resolve(pl); @@ -2274,10 +2326,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) - 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