From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.51 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794653077; b=gJmst/Blae/8i4JL231adncBGZK9PBBzYHhkvg/WXD32InruuvWT3yQ9JR822cIM1nGZ 02/ZA1MAA+M6JK4UxZ5fqGzBto4HhQKRVtkzN24OyDbyDni329FQjdZBeTamT5bA3wgY6 FrNpySmiyBZdkDw34m0xtcB1afWaRbDTrlEbBMvDMNFT+UgSDqh7vmQ9aY4+ScG7f0oX0 XOAZQ/xQwmtp5GZlo4OQH1H9p+43B7ngOn/3cfkgyHVkI34rFEX29sebpkd6XsMcHFuOi slDbrQfwH6CMjUDmStZHzZQlQyLno15rxiTlaJ2KItdIroozwi+KJwN3Qzm9xkxkE9Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794653077; 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=TeLAZiZGj+97MWa7ReJZxgbnws7A1jvXyF4Ap0n10zw=; b=j5uCoAzJvQEuwppFuFFAKhEu5lAs4RozTHc/yQL2b2pLW1cBCu2EhjxMxKSW77ceERI4 /P/p7LVpJXtld0aEOvlX/M13LNHZmXCOgXua3UyyF6A+MLyoYlSi7JYo0swhKLzogj/zr tZ1dC6qxh7Xh9/TByl7dOol+h643/6g/tcKWLcXTM8fsfGKbl5IF59yLYr0ewuIgOxFyz IWl6pNt8p8M4c9H6Wf+5/YTt3W1+dMR9Lo5cnHBBczl8wdDo1IsL5DnqKNKy5JNWH+hX1 ke5qVBIcFwb6F33BbQJA+Y9uiuQB+A9oXCoXbe/mloc5du6JV1ELzKIGrZSeSDIi5lQ== 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=ZpaORhkx; arc=none smtp.remote-ip=209.85.128.51 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 98B81606A887 for ; Sat, 14 Nov 2026 10:44:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 98B81606A887 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=ZpaORhkx Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4b7252a32c8so25241365e9.0 for ; Sat, 14 Nov 2026 02:44:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794653075; x=1795257875; 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=TeLAZiZGj+97MWa7ReJZxgbnws7A1jvXyF4Ap0n10zw=; b=ZpaORhkxfgHskmS7Tyg/sZApKd0c4evYnbZ+R70mFfFkAQczDt4xteRVZ0bknhasjr +rO8uBnEzWnrrfBVR60b4mE50aJJDUqZ8Ohx4z6O4UU+saGPasWRVOJDnRnwfbv9bVov +88JqW21RAEJxnuzsT9Sh62pTF5OPMBgzB5n8/CquLut72d8GRe/vopnvQjiTUzcuzjU H2Cm3l4j2Lk7g4yY5COGFUjv658BG2QkV9n3wUWW/CYqJ0hs0CYb629OQbpVzMJP5sAY 4O8PryyHCsf5bMKvOrxo6xKUMNSeR899I4Y8YFQtyJ5mgtX80If7Ws92dHQsvcLrW3QS TRSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794653075; x=1795257875; 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=TeLAZiZGj+97MWa7ReJZxgbnws7A1jvXyF4Ap0n10zw=; b=Fx7Egz4r/uTEM0Ihrd3aNnXJRPf+wEWWs8HSTiu60YohbRNMMpBgIWN54SNTFeGu7C weO/6QpHvO6U4eCl4BDiGuBUndDIeqjm5vjs3vWOh0J39D4PmTCJebhkZNIr1rxs1qk8 WXgpJMIFkHVKbNogD2LoFMy9S++/rT0G3yCQrUhbfgCIHoEeabkkEIEmgFnWILg4oGal kAA1lEyD+T/G4FM3803/DaQrOIFcmjO4D6QFVIoOOzN/BlRw2UUqkDU4y7BihFKd6D8l ttOZnCMMT3qRyWP1dDG41iY+EA220MBP5wfn9viMJhFEntkbLfMC4f1HdqGYwp+WUZOk QzTA== X-Forwarded-Encrypted: i=1; AL+hErF+Eu/UzDgiiYCOS+M7HEEf9TmLdCV90vru5OkSIbj9Umd1AEKv+xU7PNsrNjGkoU2+m7GH1sPZVQ0=@vger.kernel.org X-Gm-Message-State: APuU4Z98KE8Dg3G5cgrvigXZTS05Ky/T696c0Iq4r6M8BJMfY5DVVM4j pPQbuJBfUOAjbbVQswIkeeMstCvU83iFF3ekZ11RJGuMkU2GNf0LjKfEOV/S5+qu X-Gm-Gg: AYBFou0YdljXL2dmG4pYCSuNSi8hUqjNJ1qkBu5z5RvF/wRLDMC6j6L6S1wCVMR+wDa UnXP0BakQCVRcjyf730gosjBg+yZZL/NLBcmlMOlx8dqpDmCLeA/p/7UyDwA2WVR4PGqLDrpTuu uEVzo0TxAFuG8ar+AM1vSxznwkUwuWYRBxag8taAg8AcmQmSAgNrQZaXdbwmwozzKEtBTNmlu2K +PQwmqF1JhspQmM73JFSWufc2LPPqPNpLkjK+oenbPMwIyfTM0yzRDXsFXup+ncQvQzwLx1YxHr KojvUgSBFKU7HLVA8W+HAVqDKIvRiCvglqxpjgZMeR12tFLeW8BerBmty4T56K1Z0WDJ7rTZoe+ fxNRED0L0eQuVaEYA7YDT7KcDnFwgX73mp5/1o8/r+GU+JGRDeqsouS2P/GFktGCikkTwDQjnrU CNjHxUYIaenkWws5pyTeoGxY2KaQKxdlFdbT7Q5k7zEMJoHI629gEnAtkaAP24QrbLiHLfxRPn6 AP4NcXVuwB85kLlPzxj+w+kNyGz/9bYvCgho3L0ExXAM1F/zCBCvbs9Avvn8mjsbX21kleV6GG5 yeagb/BIBmzq7X7fgiGbwj4TwlDqrx45cAcW9sKRSYHBsaxVMNHmI8aC8WY2btX+kCT59b9qewY UA7MaByuXW2NhkX0LDQ5yPg/3/vCVqlS/hhg= X-Received: by 2002:a05:600c:3495:b0:4bb:6847:7943 with SMTP id 5b1f17b1804b1-4bb68477c73mr8647025e9.26.1794653074802; Sat, 14 Nov 2026 02:44:34 -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-4bb56719391sm52858285e9.1.2026.11.14.02.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2026 02:44:34 -0800 (PST) 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 v20 01/15] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Sat, 14 Nov 2026 11:43:40 +0100 Message-ID: <20261114104426.235620-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261114104426.235620-1-ansuelsmth@gmail.com> References: <20261114104426.235620-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 | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index e7734e45376c..5d649903be9e 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -62,6 +62,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; @@ -632,7 +637,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, @@ -2090,6 +2095,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); @@ -2212,7 +2220,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"); @@ -3026,12 +3034,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; } @@ -3910,14 +3918,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"); @@ -4155,7 +4163,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