From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 4926E4ADD8D for ; Tue, 5 May 2026 18:27:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778005650; cv=none; b=JjAJqzFqxZe2sISvRSGgr3Vy/Ql4ku/8k3/o4ZrDiLb8ZiTaqFnmQLPdWKYOziFMqBFNRprzSXSmI0wLWYb8MRN7l6wybBSItTsBwN8fxgrZJAGFop1JIb47idX/J4kaYrroXHRljIDOFfy592H6pbvCgKN9wHZ6YFSE9sxh39k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778005650; c=relaxed/simple; bh=ZcRVlQJeNRXK2M0MgaksgKzLa1cJRySbcnQ11oZN5aQ=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kz5BvpANvzBLR3H/jMzKlozmaUvMSMauFZHihZwzbqjGFN0GeDQgwMNAaBgYgH5rxwVCoz1zXubAKpW3dTkWSiEPxUs+C1/MMhtUbJUKDvNZhYSuOV/dCHKjDug4IucDbfeKJ0U3ntPUJtFsHr0aoy3ojAX19zX0YbjhECcPSko= 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=bmIRkkhW; arc=none smtp.client-ip=209.85.128.48 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="bmIRkkhW" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-48d102471a4so23157445e9.2 for ; Tue, 05 May 2026 11:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778005647; x=1778610447; darn=lists.linux.dev; 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=bmIRkkhWNptOBV08GHvDA4v7ZSF+ld/eGgcFLhHuhEgR7OoYG5+D95LzXOc2ozMji6 8V59zMRnJl1r0JE0Fs8dfGxV7F0+kzRIrrRnG3q/Hf/w3GK0qgx4hScz0+DNav7b7AFb u8SR+nroEMWHm2bJId0DQPYswiQcT8h6VoIMhlXisxwpxo6ODEdecWKdL+dhxeynIzJf ulL006rqKeAqykbEziVusQosA9WTaUt6RdiDZvjbyXvODI4dPgPuczxWQxfBulRN49Bt Lx2bt3Sm8SfljqTAbpB65zsgPRlN1Q4d1fJrh8MydpETSZsbytRIOVp2YdK/zp9+5Xws hzKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778005647; x=1778610447; 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=kGNGXTanRx1RTigBQObdHbVB5B2BC1Xoc2hnyRGjzzWgH2d0MViNHfhpEoeEsEMwCj JE0iv/PEvU+IpBRbLjZZp74tqFBW8AJR5WEWcEOl/IHotKJuY9/oYLFZFgS2kpcajuAL S6butn5bBc6JKf/WrFRiWHsI2YQFKCLZKTfVbJ3chdIzAQL3n5ila5mJueW55PsTT0+H r2BuN+6sAQGknPfYyFDtZOFW9uLp3YiX52wxTcHYqWMGguh7CcV9ADi96BMNpSHp+zzk y5JJMXVM6ofz4MWXiazaruGt6Y1+56Yy6njd22tW1SdnexcIfXJMcMPAr0SYBf9O3h77 h0zQ== X-Forwarded-Encrypted: i=1; AFNElJ8ghtHBrn4TLebPXJi2pHPg2B+e5waGZsKbnWT9EDk9hzwYYORix3JqvIkNYx3Ug3K+6JxM@lists.linux.dev X-Gm-Message-State: AOJu0Yzm5AMFVxkt6mFhWNcqBArRNaA+BYPPUL0vCv2fzSxOd5X+5Vey ChXT0x0bzx0l8S93wnKjhmUcBZ9aQgJAeqYPL3oAfdX5julqwNk/BQWg X-Gm-Gg: AeBDietMB5QtoLKaZXNeiXbqxEh0cFbBV0No+oKF33pGTFUcxd4ToephgztnyKZtdbp ENusivy9HRdHrLCuJOhzSzpnWgBsAG9T6CthYUhhvTNjigTesSDXXLwFD7rx6DPKNtWazO3im7y svPYSmZaLtzfgu967X+h+R3IIpIwSDE3tjeCyJwDNFEJkWFkZz5+FpZy1oz++lJ0fhH+AMmNQiK uoVZHYp1er4JU5HLBg5ZyJLQITDuqjHkKd0CN9Q+qOzhtamB9bhDpUrrYjKwK86rGgA6bo5zjgy KVxzelvV9MGp1xhLfgZcatjfQbNPPzU99Lk8/4kTemr4+VJSuhkDFX3tbXEYqB1k5MtPENhkNOk zKuHhgtqOxPhY0PYrr72icnItvTM/7eDUma1G6lrIEzhZ0KPJNmUDs9QEIXS1sNX8KnlctfQ2D8 caPmdsK2FSl6jbqRc1Ma+b5AvslY6xpW+4hTOm78twywzUrKacvWMfl7+dSZK3ZGhZL1cOyCtAU QNu9UU= X-Received: by 2002:a05:600c:a412:b0:48b:339:73cf with SMTP id 5b1f17b1804b1-48e51f184ebmr5001945e9.1.1778005646464; Tue, 05 May 2026 11:27:26 -0700 (PDT) Received: from Ansuel-XPS24 (host-82-59-227-65.retail.telecomitalia.it. [82.59.227.65]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-48a820c865esm408208245e9.5.2026.05.05.11.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 11:27:26 -0700 (PDT) From: Christian Marangi To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lorenzo Bianconi , Heiner Kallweit , Russell King , Philipp Zabel , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Christian Marangi , Daniel Golle , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, llvm@lists.linux.dev Subject: [net-next RFC PATCH v5 01/10] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Tue, 5 May 2026 20:27:02 +0200 Message-ID: <20260505182713.27644-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260505182713.27644-1-ansuelsmth@gmail.com> References: <20260505182713.27644-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev 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