From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 8DD9D37E5FA for ; Tue, 1 Sep 2026 08:30:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788251420; cv=none; b=Dm9mJVHSZhfyQ/oYXNOdLye+SMSKTUa12AYaY6amROA4DXenyKVri8VQbj9dJNK7ngOJ05lNVustFgPsaFSo44lOqijmcgzSnvnT/JnvusjKkfYNBYJVDLJ3Rc8IHO/9Kolixx0qlMTvdq6PaHZmoDNDQZxCyeKamPplRQNfXD0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788251420; c=relaxed/simple; bh=WmcKxR366QifZfmN82COzbRyA6rgiThjX8rzkh1EBYU=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z8Mh2PqZZmXOQ6hmUhiAMvPklFi21rbsbq2n9daD3RqVbLOw5w6PzCY5GzwWAaShFub8TSzBxF2FobPtwMJ5sBHxEVHFfY5YSbJGjMTlE1P1p3boYVFLZXNjqbV74iw6e+8IFeZa1V2boz2MAsqxOwH8Y2Y6MfQfNJaq4iNLw88= 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=QLkwE+bl; arc=none smtp.client-ip=209.85.128.53 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="QLkwE+bl" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-49b8be0409fso4539495e9.2 for ; Tue, 01 Sep 2026 01:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788251417; x=1788856217; 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=YyxU6GfAU2OYJBof45H0mHXE5/R7CERzacXu0RY4THE=; b=QLkwE+blrc11Q26Sa8ryOvlCucEUZjmO9QMXIB3DdagXIMTO6IZoRX8m8GWRN3WhGZ 0LCJlDzbysO1k4EPjqq5aE+nleDjkTA4XTFQmEBa3Aj9uTCAP9RFRPpyu/o/gNGJ4s3s 6to2xVM5A/Pyo43WDJJgsClVak+Ynb+oqgOG4rDAW+BMytzsZJzDLmFKI8oHnyyNku2N we9wrCRJ8GOODqShw16BtLE8jKazjz6HMJSl4zYSdLWu3XY8O8BdgHvochbTDPWUkRGA nivBX5vDi4xCC62J0r5f78N9EVpJsqZ0OosqJ6IFC/08D845YRIRJ38sUo5lX+LpNICa jfHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788251417; x=1788856217; 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=YyxU6GfAU2OYJBof45H0mHXE5/R7CERzacXu0RY4THE=; b=lJ1DkAdmhLLLkiULs57odJIgys8qx5TH9mSTLOWRKC39eRwNOnKuabqDKxde7TBNbN zLP59mtJweG16ehJqgmNYDO0hZvm9HwAYi2cXlzSNtse3Th198Tkys2F+84sVNxdM1EN YMThQFoqabd9A4r2uk7rGWiya7O5mhxreOattAM/r9FnCRUm+jqf0FWR3fZeNdSm/nyn vLaf4MaNlAsFKSJf8DPfyoxH5PCNAPWk+yur7OpVUuHFSFiB+AgYvpGmO4erqLc953fj rXTktKOIbKiYwSyfA5KUxYWwCHsaVsZVonghJX76tuPoFmTy0gdGKQ9nNDFTCM49psUc wGzg== X-Forwarded-Encrypted: i=1; AHgh+Rog3mEEeukiiVL91dKTw+MMvaj1WF7JOW7e0cB901F9RHTD4dFyl7jVPme3xqjWMAQ2ZYv418ukbO0Tns8=@vger.kernel.org X-Gm-Message-State: AFuF++kdNM70Oy3QP7g55UVAVC/5cU5iB8H8qyi2pvYiWOF61FK3u75n GYIWhkW+ddSA/15xYQT6QJO+TNQXmhg3C5CfEjxgVfAGGxrBS8tmxObZ X-Gm-Gg: AR+sD12U3yjAqV3JmZnZLFtAB3LeFOEnWeetkgchnH5juNK2gTjHbLSfnQkAc6j077K TUpbySjFaj+A7hSkDDN0aO4ob7SAppYFVZq1e3oZ2T1GT70Z8Cpe7PXUCyQyZvdTHcb5WpZdomY O4QG3dTnWi0zUldo8As7ZEkDdbvA3nVV8n1Ct0v6mhSKWPTyqiRBuGJ64T00GPoCvzMjS5AF8zf KwVATfXWtfniKp/ufIBaQmKLiV0o0Nab99zlGtIhFMOn28V3E66RJQ9UbrxBOeEzFLTbg+VzzrD LgYgQ2Vf0skrg4OfYyRATFcIu6s0suYHCCrhje+Dyn7fdVGqUA4LjcFhRbaMOf2BasmdWABN4AB xUbFFjGSwGinAQU3VABq9kfPqDwYhTiM8NOvWkSGks+8O6ICEdV2qCWspDHtdJXjxpBVIwAy7JQ d58lfUFfmUTg4GxdSQNrfTN7A9Yhg9wFIb/XDRSQ+iCmVEG4j8tZ7F12m7yny3mP/RT9uegXEAB 35YMTC1GxvHo1mLXdFjqF0RwkOU5tf4VvOCRgWmZ2FJ4xXNUmtR X-Received: by 2002:a05:600c:4592:b0:495:5890:8f6c with SMTP id 5b1f17b1804b1-49b91c290c1mr378787125e9.7.1788251416552; Tue, 01 Sep 2026 01:30:16 -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 5b1f17b1804b1-49cdce08862sm51459635e9.1.2026.09.01.01.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2026 01:30:16 -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 v15 01/12] net: phylink: keep and use MAC supported_interfaces in phylink struct Date: Tue, 1 Sep 2026 10:29:16 +0200 Message-ID: <20260901083001.8044-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260901083001.8044-1-ansuelsmth@gmail.com> References: <20260901083001.8044-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@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. 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 3ec3bb439109..7f7a7328124f 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, @@ -1904,6 +1909,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); @@ -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"); @@ -2825,12 +2833,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; } @@ -3758,14 +3766,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"); @@ -3936,7 +3944,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