From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 6B9073BB693 for ; Fri, 7 Aug 2026 13:13:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786108403; cv=none; b=nL0CEGwKSNwcEMtlokdYkBz/VRGTgUnQ4LM2kQngJ2ooHKVLJDmplalcTw7px7w8//N2N4/FU6OXq+DRhtyS0+QE5uCVBrj8MBTn/M0QelZTyKp/5K6yzaNF7N5bphnWFaJPLptyiaeT5r/7RZUYfZI43/LUsALcaD+gKwUWmf8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786108403; c=relaxed/simple; bh=NH+vbbaxZiG6Y0t+Ae1nwybjPC/wrZUjqEzfT2sfGrs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uRj++2jqwe6K3sp0tkYJDJn7lRnprUmC+9m0jcaeRUr0pMS6/Tq5FBD+Dc3vb6r/7z3O25TgoncvtXfY2BxB1O9mch3yKsu5Z48VkqXEDxhDmdDvqcQVnx+2wkuVZ6um8NTp8UbAmU1EMqN6q2D+E4UEv6z1oYpciybsEQu91Io= 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=IlmkawxR; arc=none smtp.client-ip=209.85.128.51 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="IlmkawxR" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-49800c6a846so27499835e9.3 for ; Fri, 07 Aug 2026 06:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786108394; x=1786713194; 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=IlmkawxRsT62aobFbJ4plJeaOL3z5PJhXmki8EuAS2bL+/Q1hCJC4VJ8UKl/pH2EHZ hCr+sorVfmZoc09ADNHqMufsitwgkaiEhMHI18verzjY5+vJRPogmKaPNUbLrY0oyXpR /iQCrXyHX6DwGzTeCmZsq3WFH5GV/wcH/NsH4t/7oBY3hy+Uj/McjYtwKAwSvE9opqSA d3on5MehzZQ1+dw9n8EoBun3OHP7KVfbpVmH6INCGbgYkamHTtLAvmRpmBk9REN5Q1Yh 9oj//QXRk71UbqyIMyViEvkmut1FRXN1sAgwTWSITzbMW6rnFkhdJ4epCBxbEqdTtYYC IgtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786108394; x=1786713194; 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=SRiA+MuX+/Fm9AUFy6OCh1guEdfcEpl1GiAMC3m2kf1CbBQKLW+EMc61n21ixV1Mn+ md+L9EYcvqVehXzA71yNlQOSMvwr92xjkzKURfKh7BjAwAVWP3yhRQaBq8XJF2S01N7Y gVQ2X7RH7rqANomn0NgsWiUsTC0txkUCaPKwnJNQvdUTSY+JMXiir02Z7ahKuq9T0A3B wjKu+BtcszBJKG9P9sWZS5vVeEUuGhwmNHidUeABPB92wOap8OxWmWqfOWdzBkeDfom4 EK66I0GLNWRdMB/dbFb9tXmpigZ2RLqgpoc3VBgo4jPf7IACL2Ym5UD9sspfhAX4Fg7T rHSQ== X-Forwarded-Encrypted: i=1; AHgh+RoRPhZXuftSgz8PtV+lrbCjX0KGAIEYywfzY+33+3VaWaw/tr/QhylIbq0ill3O25m9zewUyYQfUJwm@vger.kernel.org X-Gm-Message-State: AOJu0YzUnJff3t/G8Xepj+yGdF+Y36hrmERYhQSqMBGxyyrNhF1WHO/B 4mESa2EVYxFRvcEc1atGSL4Px2zGE1fA9wVWuwFsc9vTrAXQPctTT6g2 X-Gm-Gg: AR+sD13OAbL2ADNgm94PTDnNlpNtyGBPrHnafm6BJacvoXk0JbyWN/iaiZk8dGw7TGP lQK+QYQ5dprycCGC5y99ybnoBt11OKVQJoKzhjM4QGRH2hThBkVtQFgsU5EgAfDrErZTTtlF5DZ BhebJIbFQN2i7Fd/jM9zzw1KyHTUR5Eg0qakW3yMm2N8SRpp3l/JgY3Q8ks/pJ+RK6IMdDFuPO4 FdM1Z9A0Qf8E6BdYJp80NCrKhdaIbLEexj2krk1xpmILIkusr2JXC1Xj0MyVzmvou+3voo5jSEH o9iiVdGPErj6gFHeL9aPu60QKZrgVaPwFmI5IdNe29H7nCciIvIxE2Q9yvVgxMlB4deoYK/PqmF swCYUiu35jJRLvPRbA9qjSw0XRtqJrs2AN+PReuhAtFuxTfPw8IQ1DFogdv6qqSQ4ZqqB5YbYC9 IPfHlhTxS6uWP6RWY/EnAF3V5M5GkAU+qwmzDHFJVBrDYTgVIdc32ei61KSuKbl9BS3wktrlKwZ AY8RQziPxHjylsuLVN5DMLZit/dodSykw+wz8V3f+Vm3uHltxSN7w== X-Received: by 2002:a7b:cc0b:0:b0:496:cb48:5eb8 with SMTP id 5b1f17b1804b1-49959e38ecamr104184045e9.15.1786108394327; Fri, 07 Aug 2026 06:13:14 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-87-19-255-168.retail.telecomitalia.it. [87.19.255.168]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4995c7b2b68sm58827665e9.4.2026.08.07.06.13.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2026 06:13:13 -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 v11 01/12] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Fri, 7 Aug 2026 15:12:43 +0200 Message-ID: <20260807131301.192060-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260807131301.192060-1-ansuelsmth@gmail.com> References: <20260807131301.192060-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: devicetree@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