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 A7FD0C54FDF for ; Thu, 30 Jul 2026 10:25:01 +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=gzxG+LmD3OJBziXxFrZNUzc+hlymbEKWiIuouLUjQy0=; b=WXxzFWI41cVHU/XsYIx63g9dm4 80wmx7hK8WQpF/YED0wsSNa3P4LxV6+Dv/mDpM+5akkXfmkewfI1WuR3CB2zDWF29W9EcIFyU1h62 1OyRj+OsvlrNjt0qGOmnCYFjGXP7RXPkV7+NXLWjzN41ASAAu6htosm5FM6+ujyCuyHwxF8QpY8PG uMR+KWceAp0d1kbBWkVXLQe8UJB5aNcEpIbdDY2E92o106H9keSGK5bG3BQuHvWVW0g1r5legWMHk RmhUWh7iOIBO8zh1bvNmAF+DCKBeEM8mqwLPwTy6PdMkEmerBozTELMVuzrSr1HSGVmDOrrbiXKjx WOq/0Jaw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpNwi-0000000ABRC-2chM; Thu, 30 Jul 2026 10:25:00 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpNwg-0000000ABOw-3EWM for linux-mediatek@lists.infradead.org; Thu, 30 Jul 2026 10:24:59 +0000 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4954aff6088so17961395e9.3 for ; Thu, 30 Jul 2026 03:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785407097; x=1786011897; 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=gzxG+LmD3OJBziXxFrZNUzc+hlymbEKWiIuouLUjQy0=; b=YDCV5fwlYf0txGKRQDC8ZhS+bQdX8AZzaVv2HeZsQDFxiJfx9RDSRhMHV3lx7PhfjO 6/+FFIzpxxqgqwbHqz3csECWNtVZpdKlJuJM717dxbzzaw6E9Lk2nMGC0ZpxUAqPlfmA ltUW1pNH984nqVvSY1bUospcamDoCj+OKBAs8dHm6PlQBk5BiaZb/FkEGWnMnAuLPLMi qoZWgI/bG87BHxouBo4HsvtfOuKgax7DL9tJ9vG7TI+sHT+wIFxDj1W1y7yWObFy+CkN ibms3f1gqx6gGsMJSpVGngY5e3PqWvi+JmSbSc5AhVRUPkwspquAjYsVGrDtYJ6iD2qe WYWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785407097; x=1786011897; 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=gzxG+LmD3OJBziXxFrZNUzc+hlymbEKWiIuouLUjQy0=; b=rI1tOEqydaXD8+brlviSV1aakg9m6zcRXEEabhu75XepPuGA3tNAYZoW7POUCM4c/t elj5hrZSLyh7ZX1xU3oeuiaMPOiy04LzTnAocYDR2GPhNNlTiISA5ddepgleIjNrcMuN OQYv+KLnGHlbvr8cFmscbnMOpH+16m4dIqeZhjTEjLChOKRBM9gdA99GTL+mLjZV59ce s+zuH06uu+oncDnsRqA8VDw1B3qN9eRic94m100qEUp1/4OiDBsATbjw6TI3dQ8hnt+h ELzQFbhbBY++H+XY1trlL9Bd6jUERnppiBezCio4QjbJDl2Gbqs+2FctQXJ62Vqg4nf2 0L1Q== X-Forwarded-Encrypted: i=1; AHgh+RpMYrRCWpNCjQBLukkt4tH9VUFaYB8sjoAQ3yszc4ZHsO/KHSLuKTK8tjmrBC7nS08R2BcFTm1rH7gKqcZYNg==@lists.infradead.org X-Gm-Message-State: AOJu0YzY9Ba8s+HTwKJ1bJlldEr9LB8qSrtL67oNnoASeS3UOVcVEvCF F1yMlOlOk9WczUeOJLzEwJzCvkTV389pydccZbjntaK0bu94003lKb3G X-Gm-Gg: AR+sD12orJg5sPeAaVzevPWh1LAh8ZmQOcr5qSUM6Z01d7SIwfVYCc1YCyrxpdLJrNw CFwmtcqswEvKfUDANO5LutsEabPAIADwXArQgoQjghLBdnPVrsxkFLhFKZyPky7VdacWHvKpnfg Z+/5hW03VbyHXR7oNYIPhgT46HsMfTkZo7D29fYC3VurO6BB22HS6T2g0rGHZ4Yu2HguIZdtu3N SsYki1RIvOyreC7e0inWInnBleGg1JMxa+fP8g3dLF1iKFlOSNjEqeT0XzdVuho8JAHTg6awh4Q NZWaRMkgf3TlVZHadGbJhynWx9fF1Dcopw66uItJADhPjJMqgYGQO6tq+EZvgUOsDGh47OSBSpL 9eFUOBYpXiIOHrC2ORkpazpYlivQeIkf5RtLBn+FA8EDrFDykbTGDIM+NePZDoQTepGyTVQFETg a0eJRJYre8soHU8F/FgCuZHvh70JGevesiZ8u6x2SlK8JQ5orXdmV3a7P4xSFGWCuin8anqed+d RYKneeBT9xj7TqbqiDTp9ea9oNDgWM6PinN583frOz6mcfZ0Ie3Fhc= X-Received: by 2002:a05:600c:6298:b0:495:64c7:804f with SMTP id 5b1f17b1804b1-49800ea1ea9mr27095295e9.23.1785407096531; Thu, 30 Jul 2026 03:24:56 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-87-11-254-126.retail.telecomitalia.it. [87.11.254.126]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-498011fd5fesm44720295e9.7.2026.07.30.03.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 03:24:56 -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 , 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 v10 01/11] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Thu, 30 Jul 2026 12:24:12 +0200 Message-ID: <20260730102444.1967900-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260730102444.1967900-1-ansuelsmth@gmail.com> References: <20260730102444.1967900-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-20260730_032458_842227_5E41EDAD X-CRM114-Status: GOOD ( 18.17 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=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. Signed-off-by: Christian Marangi Tested-by: Maxime Chevallier Reviewed-by: Maxime Chevallier --- 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 59dfe35afa54..3464e3ec5699 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, @@ -1867,6 +1872,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); @@ -2025,7 +2033,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"); @@ -2827,12 +2835,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; } @@ -3760,14 +3768,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"); @@ -3938,7 +3946,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