From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4DD2C982D2 for ; Wed, 16 Sep 2026 23:52:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4CVtSRo73kcxXzyXjS3Uh97Hci0HJhAxnJFberGLSLg=; b=xIYWWhrAUZPHMHnTGQSLcgrTuQ 6KHyWyjBLGwSb/ffxai5FLgSVNlWC/6x89NZTXFCYRiI8fXMw9qxGx4aNQyMc72wCb79hMfPu/oA/ o+N0gzH01bddXC3vgWdLDbpSUiKOXczOhEfglh5t+Zz4s0VrpFv5kRuaulsk/LYXH4VJuwEmtgDsA bMMv6q4tU8gouI6/y+gkVThmlqTb5aCDUkDfbQm5AS+Nex0JLLMp1fyU7OxmigjNP/6tPsDGkjuKG VGGXcYjlQbWl/T4wXgu5W47X0oGlykkJLi/WDgJ6AWVOOiB7LhgeAKpghHVq0SOfdIj5gIGdRToAE d8Y5ZSfA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x6zQM-0000000AGK4-0dCp; Wed, 16 Sep 2026 23:52:22 +0000 Received: from mail-wr2-x10.google.com ([2a00:1450:4864:30::10]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x6zQF-0000000AGFp-3WKB for linux-arm-kernel@lists.infradead.org; Wed, 16 Sep 2026 23:52:17 +0000 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-4834977ae75so135387f8f.3 for ; Wed, 16 Sep 2026 16:52:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789602734; x=1790207534; darn=lists.infradead.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=4CVtSRo73kcxXzyXjS3Uh97Hci0HJhAxnJFberGLSLg=; b=JxKw2XTnOOfwdCExfbktlidCO8oSFqRxHUNTEgOJUySD2fDyxd5CuGtD5VnTCFtGh0 +jAwgUCjeRRu9hAxwGIQXXeDyx1i4dasGuO70tG75HYvmJtjIFa3xWcWMvNA4ahjdzor 1jue3a+/wkKcJ5u33aJfXov80Dl6FviWVfXybcIEhsQU3GJ3+JPEz0W62ZfvlJGQkg2F yXPW/7lnsNVrEZWNrAxVGl673aTwspfWW2rSRIbX2YDgREv3lJjOwzPwGtCTIAPEOES2 iMdrhJu/fKxJF/ZTVqtwYl18mrifQ56XBlZ0p+uWjJmF2mHyCgAYgqdvvgiyQsWDLyD5 jIqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789602734; x=1790207534; 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=4CVtSRo73kcxXzyXjS3Uh97Hci0HJhAxnJFberGLSLg=; b=Duwc4SHiGws+NHqUYYljLHs6pf4Icy0O3cWSM3TQS8mXofQUfwTrWe9QOpr0XAOrzn vxXl8iARw/9WOACULCfhnYB4kVp2CYSPexYE/7N0XhbQvyT0RjCmdNQXCApox2TiEC9P 5DGTAsrI9oXybfB4CnF6Hrh8BZbYfIocAfUfm0ERsd7HOZEOja2RZa0LP+TD9R5qsoNL 3rxSYDZXBrR9q6/T24B8bnP/+qsFzmH+cCh5i9B9QydUM1kz/vYtbRhVXEHXuv0D0lia /wKJmmQODKo/Ab+RN8twPnmQILr+9KWXUVYno+eTjOlK7e47VogobhUnzuThyEpXSL2s M5sw== X-Forwarded-Encrypted: i=1; AKwUvBwm+Il2w/hJZtXLXdsZUNYNVEpj1ro4GeuEZjMWAgLG0L1OwfQzRRZwSp7ms5H7oujUO/VX6F4eu3iyJNQph1mh@lists.infradead.org X-Gm-Message-State: AFuF++lz+bNVN2qWN0yoAfphSOexc35om2TxRP4BzwFCSle0TDptKm/f 0bJ+4pmrQvNfgaXR2puEk25y3c6DI9TCWTSVRJPKfpqJNSaxTU4lwX// X-Gm-Gg: AYBFou1NyePJ+XHMCy675eakhjBsmL1V4JfqD0f1Kvp9xbWQAZ1/Ok1nQ3biD6p0tFU 8Cpr3wh/Adu2xW3rW2f9GcuFhyEX2nUFbWMa1iYpJhli8cOWtdjSmf+IfKYI4g5Jl27i+TmJcm1 2wDqCsEfc805q9My0ElM8QhtbsNEMItb7YPybPFP6PW0/uEYVXvw1agTf3liRF469VmJAUK7GQh V6JvyoT2qKuOFndnFXVa06irnQhRHedWlQKxjomqod2oN3D8v+1el0F7mlUI2SB04m+9l89UDLV rwZLDJtZHGS7u18e3xPAuK2zEedISFoR0c93OdFwgDRPKefF342ZenjcW4c7sk65jqJAbv+Hrq3 WSID/1UxEUTgAVy9mWb3DvpvH8D5T41pVRzwRgxY6Vrugt0V01wQcM9xBdrSWGdnhdX61ZJsq0V fK7XMlTHvVrXuSRHeoesLvcWkR03MdlL23jjyUvQt4/g3Em3rTQCz4CJjSrkw3OpfOTHhiNpDnC f+bKxYWYUiKMgDkyappvZaxHvQn3lSr/DlHpoHtcJW9TSsKuSzvIXvSxGgcZMI= X-Received: by 2002:a05:6000:1868:b0:487:980:b42c with SMTP id ffacd0b85a97d-4870cef14b3mr9005287f8f.11.1789602734011; Wed, 16 Sep 2026 16:52:14 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-79-26-252-140.retail.telecomitalia.it. [79.26.252.140]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-4870bef7687sm11861104f8f.1.2026.09.16.16.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 16:52: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 , Randy Dunlap , 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 v16 01/12] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Thu, 17 Sep 2026 01:51:27 +0200 Message-ID: <20260916235200.20712-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260916235200.20712-1-ansuelsmth@gmail.com> References: <20260916235200.20712-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260916_165215_905431_2B9388CF X-CRM114-Status: GOOD ( 19.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 390d3eb3e6f7..d67a5184c524 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, @@ -2026,6 +2031,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); @@ -2147,7 +2155,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"); @@ -2947,12 +2955,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; } @@ -3831,14 +3839,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"); @@ -4009,7 +4017,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.55.0