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 ECA203E8C64 for ; Mon, 15 Jun 2026 12:30:34 +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=1781526641; cv=none; b=e15SCixTdXBCQAp+SQqnt2mgEpycTYNxaNLxvzC9yCIIbBHudAkzA3J1LBHY/VyLDR+NJDREMBmuNgBrVV0hlEaCSay4IcJ2SdXrKMDMu61H2klVykC7Uwq1/2XSv7SPyMxLI4hQy0gVNCWKUwIpHBIKC8YtB7bst08hknpDbg4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781526641; c=relaxed/simple; bh=ZcRVlQJeNRXK2M0MgaksgKzLa1cJRySbcnQ11oZN5aQ=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=si4LQWCBzhFC/4plsyH0mcd/YNO8MFZA+RhEVw1vW6lQgDoT7OF2T3YwUvPOJKPy2D3FF+3Fa00u9JGRkxFpmC+2KB+MSeudBgqWN9Y+stKCk+dFrTe+Ix1VJEv+gSvSNPeubwrkqYIA8pQckoaqNXS2sMjJevdGHs2gZRYZlqA= 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=svtum2do; 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="svtum2do" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-490be03d47bso34453855e9.0 for ; Mon, 15 Jun 2026 05:30:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781526633; x=1782131433; 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; bh=Q0DEjqI/MjSZk63smQxo8R3imVIUNR3yg/nfskjDHjk=; b=svtum2doVe9mpepR2bydarhDBBiT+D+SO7Z6D0pbICjBuNZKCdm5vw7mSryOtiOoLo 8kRQ/IB9Irw7EJO09puqDe3xKYY0VKVtkNQYnZXfpHrM5mNifCH/lsu5AcarepxZDm/B 85TpXxxt8R5+HcNocKFGNFiXqAie5tzq3QJye5q6PX4XDEkgld1MEFETV1fM6JDZ9Zi3 KzZ0kyjHIIGuVrWWCdGtqMTmAF8uVBnGBGnZ2FiWZK965WUjFfcMok9v4TZ+1noyDSkQ jEBV4VrN2E6wWzlqTLNuz1wJMQ7bsz5yn2rcI+A5xNOVYUDQZne0LT66nd1ae0apQ0Cn cSMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781526633; x=1782131433; 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=anGmWKgL9/4LfjRg4E34awnS8+b9+x6w062wLhd1yfAgtkfzitKN6FSdQhfvZFoN8f wT482++FgqAhmxap0P7kpeBuTFoYnELjMshtiFG3kAbz4zq+YE3CehUdDJ3UsMagGHAh RmXwgkqYF/+MQeRXaBZB8IqAvhSG0ce5iXnRJivDkJ/obqoriWKbwlBQwzI5/O8+h2gF KSQNXsb7DGOFrm1HwIwr64X48PaKwdd0BI5Jgd0TF72rJLgvusVdYxj80CRHfw6uGsZg K83uuKeHo3kywqPshLGkB7uZvyoEDKZaLMt83tXStPOG+4oPUmCgW5+fnc/zJoBFQ4Gm bing== X-Forwarded-Encrypted: i=1; AFNElJ9ZYPiVQKFMa8p2wJDZn9ovJqq7nKOyHRlDrQVycci7hxFwCw/Lmdxu/xPYQQqu9ZaGyHziHSQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyzT0a5vOc0MyO0QiZbdCSg1I73fJqDuPTHMGSn/vMLw4j02oYq QvBtSaOilMyjkOFBQ9F/PgiCSE0+QNwCdjZnb+hFNavt/yxftE+IYb1d X-Gm-Gg: Acq92OE07Ds1Mj9LdPDgIok1Vmzu7NDkV2VxKqzAghJgrrP2TGjtS+ycL3r/bs2HH52 etADT5vFv/MeImLuLrVQoyLo2rmWqg995DwE0FpS5C8ApLvOHsBIuajsBb9zIgPH95FkQoatNkV ANJvi/PPHFNResuNlEQzYanNfGlPszd2Bgsk/WIOmUB5PgHKyP2rCGwzRsrbIpDGiXlC+/znBhT nJfFWRhwSM7oGiwQMcH4ddRkUvp5t+c7VGRrqZ3bRfhrtNHUFipH+rL6qmajhPx3H5mvK03DmNE DeyuGIk7zjes61LRLLwsF+FvUjKvLiz/n+n/lH/NmA80c5HGLlw4iJECmiXFKqIcPJJFb5UL2k1 Z0+i17rrZqRCKDwD5vImo4Q4O3nn4XwG+snHis+leZnVXzdVcwe73gXDUIaZslfpXoQrwJoWsUF aHdNsrYNCCyefF14IaPJezMUO0NslZlw+ykbfUxMpTc1qAt+OfLC35Zbo= X-Received: by 2002:a05:600c:4753:b0:490:be9e:fd03 with SMTP id 5b1f17b1804b1-490ec4bf9a6mr188542715e9.7.1781526632715; Mon, 15 Jun 2026 05:30:32 -0700 (PDT) Received: from Ansuel-XPS24 (93-34-88-103.ip49.fastwebnet.it. [93.34.88.103]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-490ea95c512sm191426435e9.2.2026.06.15.05.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 05:30:32 -0700 (PDT) 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 , Christian Marangi , Lorenzo Bianconi , Heiner Kallweit , Russell King , Saravana Kannan , 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 v7 01/12] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Mon, 15 Jun 2026 14:29:37 +0200 Message-ID: <20260615122950.22281-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260615122950.22281-1-ansuelsmth@gmail.com> References: <20260615122950.22281-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: netdev@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. 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