From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 E52093F6C26 for ; Thu, 18 Jun 2026 12:58:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781787494; cv=none; b=P15GSr+k762Tvp+cpZJfEAkGiRGvzV/R9g9vJvzv64BHvfve8OuW1afhzmHpAh2TV9VJOXDY+Swbm0efpx+/6peeb/C0lN5s7Znn4zkEvurdYiC3ntwu6qDZ3f4BkvSDyqP/GpAcQCXCAGzoNY9itrU7C7/L26h4hKz04ZK4k8Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781787494; c=relaxed/simple; bh=ZcRVlQJeNRXK2M0MgaksgKzLa1cJRySbcnQ11oZN5aQ=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k9xkxboEIgM8/lcRQWwqSMlyszvWQ5XXegW24xBbHbRWu+h8rcgGV5gdyWhi0MGIPHxS6y12x2MK54Sewj3xfOx1zDdKgAy6q7uBzUg6MYUXPBi+r7MyMlMPGFazDwJAOs7J6BBt+qClSU3KV6VB/DD+HhQhnhbEpML1hnw1m0c= 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=dHCJAI+I; arc=none smtp.client-ip=209.85.128.52 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="dHCJAI+I" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-490b9318997so6025135e9.2 for ; Thu, 18 Jun 2026 05:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781787491; x=1782392291; 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; bh=Q0DEjqI/MjSZk63smQxo8R3imVIUNR3yg/nfskjDHjk=; b=dHCJAI+Ie3nAXIE8Bj/+/eoqtaAv7lYZzZ2Ap3nUY1D53R/VhXVgMp0YMJ8nVtKEvD UiIVtEk4lgqL97eotn5p0BCAPfXkNe2kVilVuFgyzYmZ4y0hd+pYt3X4MBeELaKwCGmT hDSFBMneevhAA2ls/5XEAQTwmLspXzhW19X3ZzerzPqYnHec5nrTbT0KQMr6WK1BOeY7 O8ftJoNwygfoV+uXUkKMmC8OmYbRhrJFN1s//OyuSmOdADScSS4uUi53aWZMmIvbz29M 8+LHckJ9QC9EqzYElkSyuvbuLqhipe6qtBkXfqFr/W5ZpSNMI4yXZvw7tRjSGazD18bb Rw1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781787491; x=1782392291; 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; bh=Q0DEjqI/MjSZk63smQxo8R3imVIUNR3yg/nfskjDHjk=; b=P6wksD3dnR31d02rAYmxkPUo5mqIB4aBBZRRcAnP/xw9eaTtnLdYis+SQ5mlMdCRJq I3sUhix1gwdFraJRnvRKkSLl+sYIotUafsIefBl3ig6wLNBmt1kmE0gXTdpX7EcRbRtN aU52Llkn5gPkGKWJDlM57rOpjx1ZcExt/3VyHVYyHrRHWtJmENhFBRRuA3/uc+2knS8s fs0xO4lAv7zlOP62lPr/QMb31L8wNkXNEjG/9wsQB+I62xAKFG9v5DBXYTDCyHvhklHu DF2cV/d8V0uC502uK+kW+n6R6aB6uDQestCvw1nl0abzAfTgIlBHUiRDZ8+p1zHYeMys ajdQ== X-Forwarded-Encrypted: i=1; AFNElJ/5vnouio7xKtslVzSZnUDWd9Zqq5cwBuiOyLjeElln7sZOsSjPTRiRaqLY0+emOafSQgsdHtfVPG3K0X0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0r+0uTHS9348XOI1WrWnkEmRpVc5JoA7hOup4xHvSA/A78eGh KvwQ5DQYR4rbw992GWIUMJYccbok8sLepIpbAJqagN3QnJUNRzyOnS/7 X-Gm-Gg: AfdE7ckz9a1bUVJdHd1GFENccwm5LQkdXP1R1Dtr1vLC2DtwHlUsJLYwOupT+j0xN7M owrT9tdPR8AF8V/BGhqLtw9AzUsacMsdJWoAd6GLnHWBmg9s2iVn3Px/BHbn/AC5ukcAY8qcNle sLE7gO+M6Zc5abtUinvwyLW3Uiy6mVfVs0p30CW+u7uc/JGztRcFGtJc/FjCvBq5GoRWVqEyU+I ywHA96DPoOv3qzL8WNygWes1W/NtMwrhzEx0HV2uFuyqlzpZaqYdP55uWRYcGcKCghwtp8WGK7P wR21qQvaxIZsLMoUJ7oDsZVa8Rc/T4Ow6ceKvhSWHZ/Inej14YECK6QdvMNItMBGjos4JeEyneh tbRK0K+rQzsM8vrZHZids3pVG0zM6S6P1YYCbfet/siiPrnviInxi436UF1/gPZu+LUC+Cy7WTe x28lPcgQfAEiFKp0YcIowOv0Zm8QR8OT/ZaxYDHWmef/fB8qMT/W/OXiW3JfIz8A== X-Received: by 2002:a05:600c:5297:b0:492:3c7e:57aa with SMTP id 5b1f17b1804b1-4923c7e57c1mr12852015e9.0.1781787491038; Thu, 18 Jun 2026 05:58:11 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (93-34-88-103.ip49.fastwebnet.it. [93.34.88.103]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-49230a458f2sm241451585e9.3.2026.06.18.05.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 05:58:09 -0700 (PDT) From: Christian Marangi To: 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 , Saravana Kannan , 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, Maxime Chevallier Subject: [RFC PATCH net-next v8 01/12] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Thu, 18 Jun 2026 14:57:09 +0200 Message-ID: <20260618125752.1223-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260618125752.1223-1-ansuelsmth@gmail.com> References: <20260618125752.1223-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add in phylink struct a copy of supported_interfaces from phylink_config and make use of that instead of relying on phylink_config value. This in preparation for support of PCS handling internally to phylink where a PCS can be removed or added after the phylink is created and we need both a reference of the supported_interfaces value from phylink_config and an internal value that can be updated with the new PCS info. Signed-off-by: Christian Marangi --- drivers/net/phy/phylink.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 087ac63f9193..4d59c0dd78db 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -60,6 +60,11 @@ struct phylink { /* The link configuration settings */ struct phylink_link_state link_config; + /* What interface are supported by the current link. + * Can change on removal or addition of new PCS. + */ + DECLARE_PHY_INTERFACE_MASK(supported_interfaces); + /* The current settings */ phy_interface_t cur_interface; @@ -629,7 +634,7 @@ static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy, static int phylink_validate(struct phylink *pl, unsigned long *supported, struct phylink_link_state *state) { - const unsigned long *interfaces = pl->config->supported_interfaces; + const unsigned long *interfaces = pl->supported_interfaces; if (state->interface == PHY_INTERFACE_MODE_NA) return phylink_validate_mask(pl, NULL, supported, state, @@ -1868,6 +1873,9 @@ struct phylink *phylink_create(struct phylink_config *config, mutex_init(&pl->state_mutex); INIT_WORK(&pl->resolve, phylink_resolve); + phy_interface_copy(pl->supported_interfaces, + config->supported_interfaces); + pl->config = config; if (config->type == PHYLINK_NETDEV) { pl->netdev = to_net_dev(config->dev); @@ -2026,7 +2034,7 @@ static int phylink_validate_phy(struct phylink *pl, struct phy_device *phy, * those which the host supports. */ phy_interface_and(interfaces, phy->possible_interfaces, - pl->config->supported_interfaces); + pl->supported_interfaces); if (phy_interface_empty(interfaces)) { phylink_err(pl, "PHY has no common interfaces\n"); @@ -2828,12 +2836,12 @@ static phy_interface_t phylink_sfp_select_interface(struct phylink *pl, return interface; } - if (!test_bit(interface, pl->config->supported_interfaces)) { + if (!test_bit(interface, pl->supported_interfaces)) { phylink_err(pl, "selection of interface failed, SFP selected %s (%u) but MAC supports %*pbl\n", phy_modes(interface), interface, (int)PHY_INTERFACE_MODE_MAX, - pl->config->supported_interfaces); + pl->supported_interfaces); return PHY_INTERFACE_MODE_NA; } @@ -3761,14 +3769,14 @@ static int phylink_sfp_config_optical(struct phylink *pl) phylink_dbg(pl, "optical SFP: interfaces=[mac=%*pbl, sfp=%*pbl]\n", (int)PHY_INTERFACE_MODE_MAX, - pl->config->supported_interfaces, + pl->supported_interfaces, (int)PHY_INTERFACE_MODE_MAX, pl->sfp_interfaces); /* Find the union of the supported interfaces by the PCS/MAC and * the SFP module. */ - phy_interface_and(pl->sfp_interfaces, pl->config->supported_interfaces, + phy_interface_and(pl->sfp_interfaces, pl->supported_interfaces, pl->sfp_interfaces); if (phy_interface_empty(pl->sfp_interfaces)) { phylink_err(pl, "unsupported SFP module: no common interface modes\n"); @@ -3939,7 +3947,7 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) /* Set the PHY's host supported interfaces */ phy_interface_and(phy->host_interfaces, phylink_sfp_interfaces, - pl->config->supported_interfaces); + pl->supported_interfaces); /* Do the initial configuration */ return phylink_sfp_config_phy(pl, phy); -- 2.53.0