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 196CD606A881 for ; Mon, 16 Nov 2026 16:34:35 +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=NKrpgZNk; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=TkJszxdX 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=l3AZy4riXXi7OLtUVBY6GfrY+Mq1552Tq5et+9Ive2c=; b=NKrpgZNkklToWM vPNHB08wYXlpNxIMg6JddrmKPWyUGPselih8HAjjuIuqUuFJ0mKz4F7I1W2T6j1RpkFCUUw4AzElf 3soQTL5dbS+SCMWBUxHVnGf+EpDfoKKKFwYken+cyO8rqiGVyl7Bu0k27rATAjuKOzbkYI6JWbOBt WUmbxq7ByFG+dLZu8VviQ1M/om3jRUufXDFWtloV6qFyS77l9MqmFO2ea/MeaXVG0ZG/ZTEDD+lmW bJ9WT8OwBjhy0Umow1TLuLRVYLW+mRupIKLZ5SLYTWZn1yRDDi28o0C8Wem3G7yqufPJkRlq0uex8 JOcfEIZPlUKDS5aS+e1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xSzf8-00000003FEr-3Pxc; Mon, 16 Nov 2026 16:34:34 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xSzf1-00000003F5U-3Cd7 for linux-mediatek@lists.infradead.org; Mon, 16 Nov 2026 16:34:29 +0000 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-492f0a1b685so2604236f8f.0 for ; Mon, 16 Nov 2026 08:34:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794846866; x=1795451666; 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=l3AZy4riXXi7OLtUVBY6GfrY+Mq1552Tq5et+9Ive2c=; b=TkJszxdX+7+QR+mBmWvYIxHHdTQryID7YTMqtWGIe9j4X9Pabwgdq2NajSFy448Ogk kbl+oAoYCTs7vWS7XpiqLayVt0FoHudyOxmgMh+b8GXXD21PaF8jvWR4wMp6qad/ZK3M yfK0nr0TaYXptYokVLd0He8f4Wd3Uhi7rl8Ozsb1NUZ3jVzm6SxRk99vA79zKrN9Uhib 79i67yjUQ7/FVnBdKUM0P+r7Gu3Y/Yd9W+1YaPyfr2CuaGhSyXhzySNbaxF5Js9AgsJ2 SjuRrkLeyoP/lurx3ACZ0KydfJKdhI/CROcx5S24UZEzYE8bxTU+yv+IpDIqoTaNyl1+ bFdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794846866; x=1795451666; 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=l3AZy4riXXi7OLtUVBY6GfrY+Mq1552Tq5et+9Ive2c=; b=quv30XslSVF4W3yaAlbrDKfoeSqTi9rU+/30A2BiCclc37HyHzjo7S8DrhVBFiqzDH ErnE+K/Jo7uJJ9FyRB9eWtThrAu5ZTlEtfLqyq09jmdYltqhBUcQGOCwyU4cqk+9lXJK LEDeOeTWqzPA8ZJ7XH/sx00fzdfZ+TOS8lXKdfC2k4NgyQjb/ORCE4znbdPQsfbxB6M+ 7Ro41aNv6HWhaiKEpuR22bmooAvbqunfFxv5zBf2V8zDuwC/PplgTg+FSnfcgVaYLu7S h3XuDWI4gnT08yyv1+XT2pFifXVtrCVp37CRA5PWL6nH2qYj7+uyZ1cOAAPr7A4dctQg jZdg== X-Forwarded-Encrypted: i=1; AL+hErHQErOO1V9JIuxcv9Ynq8zGhI54leDqqln0CttoGviDP2YLEcxjDcfiajvLfjQcLOMhFdk+Z4qwFdcvvOs7IA==@lists.infradead.org X-Gm-Message-State: APuU4Z/JDKTJIRffVNrqeY9oQ1LpoeRK2iCqOURZ/hTlru8Io9DVg37z Z6ssYWF0IZrPwodL4Y3K7T7dkLLrFIy/z70UMJ68tHuWiAB7+q+wGJiV X-Gm-Gg: AZFdTZfbQUkATfkh3nm9WaovK91zPntkJ3cTRWIkXL2HjxNGc9Xx29QAnnUV9l02mjw HJQ9kVa7T6vYXzfsBwcrHQDNDz3QCWiX0IusdLn2tZuiKQyKaDSAYfBwxGXL/6fBMWqO6fwdYWY Rry2osBPL4+iAGLr7BbJUZnWsZ5fgQReg096LOrp7dEgSrPpV+Xl6oPLuYPX9z88Vh5yidltJnS f6o5Yb9nM9WA5VW6HZ6RPbQ5d9Zi6tnqVt/ChOMLDEyzKfjp6vRtZTj7rTKWj4xDzu9L2GD+WiG 4mvms01WQMl3S7ekQfOglVnDrulZvCWLH3SridtcLdYMky5WxiyA59ad3T8QAi8R3Qg2nJeqzBo hmcVrFUajOcVqKIbNouj/I0h6d3ccITUXFNt+IvEwO1w3cX6W0qY2Khw/HiByGmCwHjNd+RztCx CTNsJ5qVms2UX6qzX6hjLkSzpEMUzSDAvikYNPU+Db2VPTrjtmnj272HTsbtxQgbuLXpaoeT4Q9 L1gEtSxVT24IlOF5hP/fne501vtPQjdv7xkckW18OV/d63DZXZKZswhlPG8A/uqa7F9sSsjdS18 VRT/hPjYHYLHNbtrLnfZLzbgB0pf7uEJV86JFMtBmtH1XCR6SXw4jQ9BHIcYRfyrwPusmdIyPpp +NCa4gVvUKWWtJcDXH9HayfhRSjxKf6hp6A== X-Received: by 2002:a05:6000:46db:b0:492:9630:6a7f with SMTP id ffacd0b85a97d-49c73350ba7mr14457094f8f.55.1794846865873; Mon, 16 Nov 2026 08:34:25 -0800 (PST) Received: from Ansuel-XPS24.localdomain (93-34-92-103.ip49.fastwebnet.it. [93.34.92.103]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-49c5d223a29sm23840506f8f.8.2026.11.16.08.34.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 08:34:24 -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 , "Russell King (Oracle)" , 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 v21 02/15] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Mon, 16 Nov 2026 17:33:45 +0100 Message-ID: <20261116163412.551438-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261116163412.551438-1-ansuelsmth@gmail.com> References: <20261116163412.551438-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-20261116_083427_848495_694CA0FE X-CRM114-Status: GOOD ( 17.16 ) 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 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. Tested-by: Maxime Chevallier Reviewed-by: Maxime Chevallier Signed-off-by: Christian Marangi --- drivers/net/phy/phylink.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index d9d0ace2042e..f482dc608810 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -63,6 +63,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; @@ -633,7 +638,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, @@ -1788,7 +1793,7 @@ static int phylink_create_sfp_cage_port(struct phylink *pl) port->is_mii = true; port->active = true; - phy_interface_and(port->interfaces, pl->config->supported_interfaces, + phy_interface_and(port->interfaces, pl->supported_interfaces, phylink_sfp_interfaces); phy_port_update_supported(port); @@ -2091,6 +2096,9 @@ struct phylink *phylink_create(struct phylink_config *config, __set_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state); timer_setup(&pl->link_poll, phylink_fixed_poll, 0); + phy_interface_copy(pl->supported_interfaces, + pl->config->supported_interfaces); + linkmode_fill(pl->supported); linkmode_copy(pl->link_config.advertising, pl->supported); phylink_validate(pl, pl->supported, &pl->link_config); @@ -2218,7 +2226,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"); @@ -3037,12 +3045,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; } @@ -3921,14 +3929,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"); @@ -4166,7 +4174,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); phy_set_upstream_port(phy, pl->sfp_cage_port); -- 2.55.0