From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 6DF9C3D649F for ; Sun, 9 Aug 2026 20:31:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786307493; cv=none; b=N6+urnMfOYpkBO/Pwoqmv3qklOp/39lH9jimbw4NMlBV7PbsGi3xlv4c8jACO6TuZp2caUc8C2cfG2ZAhKiJhRHIDfJp+vAdejZabPhGhxJTMZIqbfznScbrmMLO5/TVUMZPF2I/DWxmlydXEpLcHexs7aUoITtevZJ06K/+Zzw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786307493; c=relaxed/simple; bh=NH+vbbaxZiG6Y0t+Ae1nwybjPC/wrZUjqEzfT2sfGrs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NiYA+sG4KRSAQp22pc4lkG6ZZwTCfaJaDXAjuwvoa+Wd5IQ6yq1s3jp//FiokmEtSMs3p9hl3r4iunIhOLD68iHFPyITI6prAL2fbTj8YOJo1qInQI8SFEQaiGyDXFhkuvmk8iBUkXJdt52b/vvO39NhJSkXNLPnLYVeOqO0ofs= 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=oo8y8Izt; arc=none smtp.client-ip=209.85.128.43 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="oo8y8Izt" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-496bb7cdf51so17372925e9.2 for ; Sun, 09 Aug 2026 13:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786307488; x=1786912288; 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=tBl3GBctv61bQMyEd2S/uBaFdUwcRcdsqM3BfaYguhk=; b=oo8y8IztUWaG8tUTvu/wDsYiXXoInR35quWchXPlHGh0k+dJGaJtma/hXrTU9x+MlI r2aQ+zToLRDCj8brSCicR/Y67FOj2Ayn+e1SoGbMBKVXCOlKefjmtXK2AI5eQ6Z/g470 mrHK3j865O9tfR4f7zGfd0DkiBEuumieKfKT4WhSVCeflSVZZ+Lw+81073H6j68rVOzL l65CXDKvJZM0HeuOeM7CpNFRThOFDBjSLvrszFHCkYUUlkJzd2Jm2FFnwcN7KaDKcQGj p0GvjOFg5Hi25G2AtQ1Noy5evHtoABD/vf2qR6qhC5ZT3UJ9xtrB2nEx0GB34wzctlpB 7VLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786307488; x=1786912288; 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=tBl3GBctv61bQMyEd2S/uBaFdUwcRcdsqM3BfaYguhk=; b=n09lYWLO/JLiLijOz2vEprPu9NcqFc4wGMMFOHNNaicoMxYE/9apjNTFt5NXb0R1hO o7GqpbDG85CrSO7eZ33a2BZ2ayXfEIUdynWwn6Q32n2k9cPs4vJBJx5KUcw+Zl19q8pY epSyCKP5O/oME3dfzdvdXxq9XsLTH4cKJL3nEDoPqkRZSyZ9BKx5ltrY53U85SILSPvW bLWVr0/HQLdowOBGB1YfxIkKg4sh3bGLHIz4f9ucOlf/VWJKWIjwAQliD0NQkmTbmwMb ZjByLb1WIM6/SrxbKGDmp+OJlkB3DoY5hIr/GjbO4osoJEW7ATN/HImztOsVloZsqpcE eHrQ== X-Forwarded-Encrypted: i=1; AHgh+RpWRLDqXrAGYajhI6q+nHLyqCPFv/+NzNrEKHVJas4bq8ArCwehEhEjcrqo6TryTWngD4qpXTCbxMEUqT0=@vger.kernel.org X-Gm-Message-State: AOJu0YxQZhGSk22cdgufA/9qAOV5n9QPJ7tTg6pYv2CWbHldiM+3Hybh URwD5+k+SbkkTjuLHeqXwZ/5RCf0aRU/VxPXJgS3YxcJthTkLzpykwYl X-Gm-Gg: AR+sD106Sx2Ft0Y1sWvu715PBdDD/EzDLUSvLadbVWWOyX+Rv9mKiwgS0CSOOilnxgt nNp+zmYgJxF7rvuuKH34zPj5Vpo1CvCLBM4Q0qZGIIcTxUIEDC8A0DdVGm/Has2d78jEs4s51Cj gOxUNydT+5dCvlazNXe7HM7COJ0qsNhfp3AJh3wuYl26Vxd2u1n3WbUVPL/UfaMSdxY39bkPLnn NpdK17cP21iRdDayxFIPqYEtXmpTkkdJXzjv5KwtZk9dYFuLitJjhZ0gGMTU3v2xv6XALO/gk1l 4IgKSEMHYZGlNJjqU6W7znv0zYY5kPveaQf+DWdaBL4LVu9Z+yuG2UignjcSyPONZXOsAT+XU1J yNULSiipBMsUyV7Rm7QEZKSEVuxZPvFfAldy89d4RhcP6dpAFu2lQLJ2ZDB6zbn2FWRpoVqA5eL YOi2orirOnnIpqkEqLgNgpjpQCe/UXrPkGZL2J/m6pkmCenGtnknY3Z+Sg/vfId0UdsehLpFnyo nIpnrqNYLPQsACTOS1hB4pXeZ3HDDRnf7ILci12ujE53mqw X-Received: by 2002:a05:600c:1d23:b0:499:51b8:d649 with SMTP id 5b1f17b1804b1-49951b8d652mr428256435e9.3.1786307488474; Sun, 09 Aug 2026 13:31:28 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2026 13:31:28 -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 01/12] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Sun, 9 Aug 2026 22:30:58 +0200 Message-ID: <20260809203116.640271-2-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: 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. Tested-by: Maxime Chevallier Reviewed-by: Maxime Chevallier 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 b241768edbcb..b7180ae76cc8 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; @@ -628,7 +633,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, @@ -1878,6 +1883,9 @@ struct phylink *phylink_create(struct phylink_config *config, goto free_pl; } + phy_interface_copy(pl->supported_interfaces, + pl->config->supported_interfaces); + pl->mac_supports_eee_ops = phylink_mac_implements_lpi(mac_ops); pl->mac_supports_eee = pl->mac_supports_eee_ops && pl->config->lpi_capabilities && @@ -2024,7 +2032,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"); @@ -2824,12 +2832,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; } @@ -3757,14 +3765,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"); @@ -3935,7 +3943,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