From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 75C0C3D9DBD for ; Sun, 9 Aug 2026 20:31:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786307506; cv=none; b=N5b/TYfiMbIYoi0ShMjeJcSGmnieqW3tGt3++D7dZLOVTakYnOgDpaCjuSuvTugaA/sNGeX+XUkA7dLKccQxUhKCdqxDlQ5a0RrVCJZzPofXpV5CaZBjzNhqPgxPbLPmnMZJUV1h0VCyIKqIR9ajMFE8Flv16UixYveg4FnPKSI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786307506; c=relaxed/simple; bh=SBoZVuiPaB1Xto3b3O9oj61DLWvc+qqeKeGW/57MWXY=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DJ9xpZh1M6xRmnEj5IZT8FU9t0/LmUm2hxgPF9yhwbp+LpRyODS5SgQsRc1aTeYxqd/7cCj3BZNGA2p9uCOy8RT1jdXqGJL+CkaUmQUD9n1JpzwFURakLmhlnunHOldOdnx2AKvn7aH0LL7vBiLA+SuPL0ZFyKwBY4bRji2h93A= 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=Bqsj7GEq; arc=none smtp.client-ip=209.85.128.47 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="Bqsj7GEq" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4954afac04bso13293705e9.0 for ; Sun, 09 Aug 2026 13:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786307501; x=1786912301; darn=vger.kernel.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=dlxFxuCU78lVU09E4RtDg01ZSBTP1Ohfhu61a6QHxlE=; b=Bqsj7GEqMoa6aWGlQuwoanAiDmfruoGlcPxgoE2pRbrSEyZYyiFxbs67eta3c53w15 JMJRC3RwpIDjmS0aROT4r0u42lErgiFhBBJBrheuZAFyToC7OaM6dT7Rh237K/NOsVhs i24y0tZfkt1uo810OFtQOU+bjmTFJeut2RYrU/lgsDrT1mji636LB6DEWb8o69CD+LoR Pwpltu20jeq/sgFDqKZakVDgLNo2KFM4mMySpQ1c8MMI4vgCNLlNggPpgmo9ht2N8Pea fXXpLx1eMBi6FISn4EdylSFUHIvImto9oiOSKI0npOSpEtiQXbZ7B9jAukP7yizR5d1x lZAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786307501; x=1786912301; 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=dlxFxuCU78lVU09E4RtDg01ZSBTP1Ohfhu61a6QHxlE=; b=JpdAAtx1RR8l4JqLo9vP0Zopi5XabEofGHPWKbKLMK/kGEeaqTQY/uQEkpKlt65ozE Vg5Xe6DMlDc2wM+HSp2ii6adzljqEDDgAANTF95+0jWzR7dAEnrjVU5czKRMAhfP15MH ug21XU23D6pqh2g5VgtARJAVVNyyXKWBOsGPsJulGMKBOFh8m0rx8U1rPM3Cq8qgym2L aMNoaSVcHW2DLOv00K2xK+XpCmjLFec00noyyTLIYiWCSmvf5VV+j+24qxdtmEK+t3sT YHHKSaW8a68sI1fxDefe2PEgYVvY99GsuUPZtOxJ6keZHWGhHhBBKkMAVnetq8kD0/PY leXQ== X-Forwarded-Encrypted: i=1; AHgh+RoeqXpA3lNVikX/Gr7oyJM0qNsoJyhMkF8C/zwD9zUh9sy5R45weyC3CVVGxaJnk3Vffnh4dAg=@vger.kernel.org X-Gm-Message-State: AOJu0YyWzUEw8o+USfJzhqYa3O9I20u8UBIXhE1/pxjIB6ulJQa/9fZZ ZLC4YZFYogo8FzssQ2AAYTflY3ePIuk0fJJgKMrTTs1e0lTsJZPjl1i2 X-Gm-Gg: AR+sD12vZ/MWyvcIiuLqE0SqJDyfJW0Yspjm725etssH7zvdNaC0YLHNkEcwdkrFoNN mZnhBbbpFgf6axg5E16cFsSHFWWjKlDy/HC8z0jVYnS3/v5bkzKKx1P+gMP2+/PJ8MwKj+9tf4c voYSCLLzIdFeGRmPLcgyB1OYx7x1UsL3xHTrKEay/XSI9442XNQa32NVpzqZSWLRJmrpKNdssuz 3MQv9zqopcnnqq/9Z8ixZBbrXp5uVC2d7ImwRHr9fCwzg2Py2wlopcvuyx44GNwcZj5qurQrqn6 DI1lkf8CYQb7H9lg00rKItl9g8sdwHZvRPdMww5kR5Q0VWUGa+zK/vRIzJZ6jLfoWIHcktb9ghy J7MXnF60EmcilxHiktx9+OBc/01QlZQQt4QQoP8VnkuXPQq+CiKNrtiDa6KyYAjoFuVjzDWRQGu Gx3x+zWpG7UBCySKBX01SD/tfHMdK7qOs/c7jy0U2pbGsWh7wwcYOx7xVwXds6uSC5CGtOikCVv 4ytaAjvSibmVPx8Eyrk80MEFHXbG89WNGr1MAYG2FnYRhpP X-Received: by 2002:a05:600c:1d23:b0:499:51cc:4e57 with SMTP id 5b1f17b1804b1-499617f7699mr188949035e9.0.1786307501400; Sun, 09 Aug 2026 13:31:41 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-87-20-3-207.retail.telecomitalia.it. [87.20.3.207]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4995e9ea92csm229357065e9.4.2026.08.09.13.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2026 13:31: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 , 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 v12 06/12] net: phylink: support late PCS provider attach Date: Sun, 9 Aug 2026 22:31:03 +0200 Message-ID: <20260809203116.640271-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260809203116.640271-1-ansuelsmth@gmail.com> References: <20260809203116.640271-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 | 83 +++++++++++++++++++++++++++++++-------- include/linux/pcs/pcs.h | 31 +++++++++++++++ 3 files changed, 119 insertions(+), 17 deletions(-) diff --git a/drivers/net/pcs/pcs.c b/drivers/net/pcs/pcs.c index 52097466ce91..92d346755acc 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, + fwnode); + 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 1d7223e95474..191c902d4008 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1912,6 +1912,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) { @@ -1943,7 +1964,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); } mutex_unlock(&pl->state_mutex); @@ -1990,26 +2011,57 @@ static int pcs_provider_notify(struct notifier_block *self, struct phylink_pcs *pcs, *tmp; bool resolve = false; - 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: + int count, i; + + 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; + + 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; + 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; } @@ -2023,7 +2075,8 @@ static int pcs_provider_notify(struct notifier_block *self, mutex_unlock(&pl->state_mutex); - rtnl_unlock(); + if (val == FWNODE_PCS_PROVIDER_DEL) + rtnl_unlock(); phylink_run_resolve(pl); @@ -2106,10 +2159,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.53.0