From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.42 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794919214; b=QkydyxPqVbQ9e8fZo4nGlN3tnydFfjhcqMkCDrJ4XgZeEeVL73JYYfaVPSnYN4uCPlRm tMpeWvvcZ+7ffl5Iaa1fPVFMSnu59h/nA5OAJBFewQCGcXHzjOAY4FH+FucxbawUPtNo9 qIOZN9dA83x/CRdF3Tp9XpSI74sH1EIGeOYoNHq0rV/s3xSQ4R81LUqv30L98W1sfj+Rn /8dO6PYlrr634gg+Gf3PqaAcWhUBTkuKhldHh8jj1sue26vNTzsmlODz/CFXwqn2CRcLj hbaR+LoGKD55+yVcr0qGKs194HQcv0YnW5knECRxqx7/oT7YMSiCKrHEObVUIiznbEw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794919214; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=l3AZy4riXXi7OLtUVBY6GfrY+Mq1552Tq5et+9Ive2c=; b=JxX1aZQTn0JQ3os7745bsCS7utgjRUEzIiJlH1tVqCL5VyRTvb/tw0WCY88g2nkhB30X 7z/Jt4tLQbJUirZbiyy0hQdZt8kHzxW527PgtaXxUT8uKCmClP/WdL/OMa/5dy6O8eGuk v7Fdq0N9xwUzIXoa4UEHidA54NAPgu32ixmoRia1SRyrU3iu5Cbk7N3jXgbQDGhIPpxhx NkHzlMoO8tJQIsoK5qr4bUCLNx//23R6fWFlziUOO3a0tjFHL+ZM/uuQY7vAurrrqgLGQ qWgHqkwlTEx/vQBs2hKPvtx7ImFc80Qx06ncmupJPLtN+yzO5rifJ9UCHcRsEkIbf8w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=Fh2bEDIR; arc=none smtp.remote-ip=209.85.128.42 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE99560A3821 for ; Tue, 17 Nov 2026 12:40:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org AE99560A3821 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.a=rsa-sha256 header.s=20260707 header.b=Fh2bEDIR Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4bb6886d30aso21195495e9.3 for ; Tue, 17 Nov 2026 04:40:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794919212; x=1795524012; 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=l3AZy4riXXi7OLtUVBY6GfrY+Mq1552Tq5et+9Ive2c=; b=Fh2bEDIR/d4uWsXPkBfajsg5Nj7BImqYBDcRS4r+K6kCFwgeO+dcKNai4X+1/lmKmc 1gISntCorZBotrgw7gWmMS29Ac1jNLiXIbTNJJci4zTdvWCsrgMm7m0aKIk9NHFx1UJP QHP770xVZniMTDC45tVGF2RNJERWAAfLIMPoV9QmQvL0citbFzUX90QPouysWgIJ/f1n AXgfs7Aj60F2QXBV2EB1MZy6FXJkE72sj2yoZFtNwX2brRbnryjsuoMBIHhotID6UXRj nxUHsoTME3V609QEQcv8buE5iT8roh1KFQUJ/X0GjBiThB/lsqoBJcrO9xvw26IercKs pcnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794919212; x=1795524012; 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=MvJzb73MJyQB4On4mTPzP6bJ2dKUmQJwmmTAd2sFyBW+23sCE3mH3+WWK02TJxid9v uQo8Y1+HrcvWi7javaff6hZ8YPjhLa2ttJw5LmuKKj3ubXIe8QLda19+6LXkhRXXXDhl 63kAolr/m6thL/YidVkHsTg3vJq0YbaRyQ4TMwAjKd4Eo7eq+XHQVeLJSoxZ1z8Tjwp+ GfQc+JeSXWr9WEIGwHE7sN8bNqoUvUFo5su990Qh9vpyppjzC4iaRsJz+BmipyFxKdUz dvlHtzDXJ1bHCLzPw+io+ay7dKSwsgka0+fNaXCm/4nDWdwIs+8tAiarTapWVQG0ZeN7 vYjQ== X-Forwarded-Encrypted: i=1; AL+hErGFrhpOWsWT+jaOjUumdATPr9sGRHmZ1nWA0RLxGOCPffoWi2PHTztMPCgiOJOWe9/Z1bOFXqDQpao=@vger.kernel.org X-Gm-Message-State: APuU4Z/HVFkrI0Z2I1CXX9nPbBAxoIxWOfWU/Gyr0bbyR2UWJaXWx+qv LQzOSsJEhk/rCwUSI06C0HKgPeDyPWG/L/7m6QBycty8RSomeEqutiKz X-Gm-Gg: AYBFou0liib6+Z42PVvkGBOfBGvJRnPlk1x1J1384H6AYfPYWKLXCxxPnWP3i9N/QPB xGniCaAzpIwUhhvr+AXd5NmDJj/l6E8IlVL1zt3JNddgzsxEND5t0c8b9wOB3SkII2w/qoYHQzS gUXq4ndVo71bFufYgELg/4uh32DwmxvqXi1jFDoM/q++bOb7SzvKICYzKg7Kg0YkmL9DRIOt/ZL XftF/JHLRor01EpzImTuzI+c2+5lCtHouOZWMM+28F29KJMv949peNExeSTJBE1PApt9gTXh4b7 W18zqVu347oMqmxJmXwZ9wBHwKbEsvN20peAzm8a9F7yF/qPOyddaeNAvvPAjkwq/0tIbxn3PUW s24kClKjOGuLxptk6QYROTlSoTIJX8zNeM0BA9poKmEgU8OVx8aPPFLLMQ5RgWvqxeg2TTEVjXS sy4YHoRrY7ZAUb27s0V+TWvj+hquHoduDL0e8blgThBCM3YzGgtbdm9ediBmD/t5LecTPBtm5cU jPqSr7nY7tDjeKixcHEElN7CFVl/YmfO5KeIh11of14Q+qeWazJu4ehz+XEwges0Wi+yOdjoQEa E80mbiYOiN89zoIx9J7PqAbEKI4BDTFSGT2WOOpBQC+QBIf4XMgK9DP1GgxmbtBlo5D/Bi8ox9n lDLi7POQFApoMTH9CYuibtWci6gINNqaH66B8Vf5cACc90XaC3dnGCRU= X-Received: by 2002:a05:600c:4f07:b0:4bb:6a5a:7834 with SMTP id 5b1f17b1804b1-4bb6a5a7a48mr183926425e9.20.1794919212027; Tue, 17 Nov 2026 04:40:12 -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 5b1f17b1804b1-4bb78386902sm73367065e9.1.2026.11.17.04.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 04:40:11 -0800 (PST) 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 , Randy Dunlap , Christian Marangi , Lorenzo Bianconi , Heiner Kallweit , Russell King , Maxime Chevallier , 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 v22 02/15] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Tue, 17 Nov 2026 13:39:42 +0100 Message-ID: <20261117123956.11981-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261117123956.11981-1-ansuelsmth@gmail.com> References: <20261117123956.11981-1-ansuelsmth@gmail.com> X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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 | 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