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=1794653089; b=q5fVRoOM5zYWLVK9IhmGDHinsApaY4FRTrPPERLkf694BazmurcBfNaYEkFm1BVV/SAk Tx9+a/mwhD/LEYkdcvKdi4B+YZm7t8ErFphJ5k6m464qv35pypleenbSjddSNImQ9caGw UQqi/ivmeYPjyARa8kPcnSlN045j9Ohr+z8qHw1tzc9sRGZa5Ary6WOaPEDV9UfAjarXh 5KmQfv/wK7X6N37WSnr4cKZmueOmNb2iBD7L5PnVVzP4ppdxcDBkOWGOsYGRd4prj9KVs eDLzlgxxYNDr0i/0E6MaT0EsASTxhf6fHx4fSRgx5UuUz33EpgHzIfq6OdZltMFjUAQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794653089; 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=hLi51p4iauXBUhQPNTBnAIiXCKT/18A4o5qsFZszAHk=; b=BpyIUa5uavpDmQCXaWVRAJ6MgGmqt/W/6hdAshQBBpQqulal4DlgukFn2twvOPXR+Sua ShtHMC+09tRw9N0nhdUaRPET9lyBZD+d2+1JG6QJsojR4xnrdft32zeL4UYS1e5iQQYud /XKATNhKoHmaeGoyOreSv4BpDAaEXKmjX0Nf0BZjJJazXAnLM1ATdK1LHC8BQc7rHi6Ux wmm1QJ7OcDINz3ZqM3z3Rh84gsyR0Ip5ISf18R+Of1QMt98fb3Gp4oY7e/MUAOMARnX10 5DOp7soHRCm5GUP89wdEysg9jaHT+Dc/QlRfNrutxMjGEW02v3MCB8YnF2ZYmBmmN0w== 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=B4grN1dd; 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 CED6A60A5BD2 for ; Sat, 14 Nov 2026 10:44:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org CED6A60A5BD2 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=B4grN1dd Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4a207b02a2cso9942815e9.1 for ; Sat, 14 Nov 2026 02:44:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794653087; x=1795257887; 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=hLi51p4iauXBUhQPNTBnAIiXCKT/18A4o5qsFZszAHk=; b=B4grN1ddAxi7Ixp4eWbZq+F6Q01xJI+b/QqS1WMe54DzHVFq2qwOjEOOzzbpyZWPbg 93q08kDZO1/zrYpCtnPeykw/27SQHpWcHGbN4etXdjPUG/IAFF3xYPvi+RdecRsX6QYe MHB0luDU5jjMIjnPZJLhvnW5JKkN2GUYD5c++a4tbnjz05M/UDynAheFbbDm4dbgFHFr GbbDaps9530Fgb4dFtvatg3dkBR4vvTKzmJ2lwvpXcGMjTbaLtUI/AsCtHjKDGwbyXFj 63RnW0RtXNqo+HEOHTh1JaefThtPSQ+qdUqcA4wQfT/VDpDasHNu5zFNw7Kg3yTUJAaZ zq0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794653087; x=1795257887; 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=hLi51p4iauXBUhQPNTBnAIiXCKT/18A4o5qsFZszAHk=; b=V2OmsEN+42t6FrQVHpjtvJiyZHduWMjbCcGDWVtPL4EkycuTjBBIBdwtYMByJeJ+i4 s261EnxfUMr1lkVISRWJE5PE7Mdj8lbTo5OPj+VOH+/qJLS0rqM6fvJ5lJDY4U63e4x+ awnzlfPTEq/gCTFESFdsH7OVc2lAA94y/w40y4Y4Qn/qXTC0cSru4JVePXUO1i17Xeel Do6914aGKmX9jjzP+yB0odFIBl0A6zlaC0Os6vNb/LOa8J0o1msvd+wdJPmmEPUYn+sD UT4Oe+s0td41M4x1bGnwavst58AalBEUmBtDATb8zRUREdIt04NnQLl0PbB55y/MgWKm 6Y9Q== X-Forwarded-Encrypted: i=1; AL+hErGmGz98qL0p24hp3jzxiWhwBl49ltINZwmuhL6tgKXfHLFkzCmnJ3SUp27SJ3HvQ5ZcJMG+I3hbLcWKuUI=@vger.kernel.org X-Gm-Message-State: APuU4Z/OaeRZD180wwnFU7dHTitwPE9xvFa2na8uFgvahJoJnuS+wjdh GlPpXMwpDZBOdLbonOEyOaUFiaacvrQCDa7KL6ldiT9eqGShGUkJENJE X-Gm-Gg: AYBFou0UVnREvxSEhMKFNEbEkZa4ipfvNR0TpCNTlByT8hjidWwhiKn1tx6is9FjHtb 8vYghhZqW6sdCJSFVgj6gjFCRI6hyWB9NaAZSp00IfyT0I/18aVPbdysJgxG+gkVjOiumqK9G3H ELczdnVnV31CE7sF4+kGxfd03tSu9vIKKlS21zhS77wpINnVnVZ/1DO32iJGhhvbMUOMEdinw+W xHWwEcEEPm2VnBpyJeb3q4ZRBmp6BOyKHQ8EZWQ+A4OfwaeUw1ooEiMVDtl1GgYQNP0fikm9Ya1 KIkDNOe8zzJYlBsJUhZ6wT8smLC/Ux4XA/Z07en48D3QQibiGP5P7/1EPD4bEO+XTUsbvK/gUYk mXvIK2oDamJWDXl/+OJ6PurDQhIA/hw822pkl2jDU+niTxcstIo0HvOvh16qsqsiTueeY9dqMC8 HWxBUGWT2ot4yjP3TGpvTbNu05oiAZM+YrZGpxxSWH3gVpUdVqT/1nqQ8Io/rf2yGZxva806YOP fpNSxrc+THcfUF3oggWFL6agc1sgtXnMp1IZZNPLMleMqBB93TL62k1JC+0HCdxFlDMWsoUVCiy lRqCYDlQZVcmUKKkMRTWDI2xu1NlioruzpBbV7deeMebLsZudCZsfxj5FWkDC4xrmNqNqtrxf9F RhW6vjoOVcfJXIsyhyqlXYX9ykAvIc79zvw== X-Received: by 2002:a05:600c:a44:b0:4a2:a6e:80f5 with SMTP id 5b1f17b1804b1-4bb55a45045mr110359075e9.11.1794653087248; Sat, 14 Nov 2026 02:44:47 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2026 02:44:46 -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 07/15] net: phylink: add capabilities helper and track modified advertising Date: Sat, 14 Nov 2026 11:43:46 +0100 Message-ID: <20261114104426.235620-8-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-kernel@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 In preparation for PCS release/late attach, it's needed to introduce an helper to calculate the capabilities after a PCS is removed/added and it's needed to track the advertising in link_config changed by the user compared to the originally one calculated in phylink_create(). To archieve this, introduce a dedicated advertising in phylink struct and update it when the new phylink_calculate_capabilities() is called. phylink_calculate_capabilities() will then compare the advertising saved in phylink instance with the one in link_config (that can be modified by the user to disable modes), compose the modes that are user-disabled, calculate the new supported modes and the new capabilities, update the full advertising in phylink and restore the user-disabled modes. phylink_create() is also updated to init the phylink advertising and link_config advertising. linkmode_xor() is added in addition to other logic operation to parse the user-disabled advertised modes. Signed-off-by: Christian Marangi --- drivers/net/phy/phylink.c | 28 +++++++++++++++++++++++++--- include/linux/linkmode.h | 6 ++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index a7ec4feb950a..957241652525 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -61,6 +61,7 @@ struct phylink { u8 link_port; /* The current non-phy ethtool port */ __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); __ETHTOOL_DECLARE_LINK_MODE_MASK(supported_lpi); + __ETHTOOL_DECLARE_LINK_MODE_MASK(advertising); /* The link configuration settings */ struct phylink_link_state link_config; @@ -717,6 +718,27 @@ static int phylink_validate(struct phylink *pl, unsigned long *supported, return ret; } +static void phylink_calculate_capabilities(struct phylink *pl) +{ + __ETHTOOL_DECLARE_LINK_MODE_MASK(disabled_advertising); + + /* Get user-disabled advertising modes */ + linkmode_xor(disabled_advertising, pl->advertising, + pl->link_config.advertising); + + /* Calculate the full supported advertisement */ + linkmode_fill(pl->supported); + linkmode_copy(pl->link_config.advertising, pl->supported); + phylink_validate(pl, pl->supported, &pl->link_config); + + /* Save the newly calculated full advertisement */ + linkmode_copy(pl->advertising, pl->link_config.advertising); + + /* Keep user-disabled modes out of the active advertisement. */ + linkmode_andnot(pl->link_config.advertising, + pl->link_config.advertising, disabled_advertising); +} + static void phylink_fill_fixedlink_supported(unsigned long *supported) { linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported); @@ -2252,6 +2274,8 @@ struct phylink *phylink_create(struct phylink_config *config, pl->link_config.pause = MLO_PAUSE_AN; pl->link_config.speed = SPEED_UNKNOWN; pl->link_config.duplex = DUPLEX_UNKNOWN; + linkmode_fill(pl->advertising); + linkmode_fill(pl->link_config.advertising); pl->pcs_state = PCS_STATE_DOWN; pl->mac_ops = mac_ops; __set_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state); @@ -2275,9 +2299,7 @@ struct phylink *phylink_create(struct phylink_config *config, pl->supported_interfaces, pcs->supported_interfaces); - linkmode_fill(pl->supported); - linkmode_copy(pl->link_config.advertising, pl->supported); - phylink_validate(pl, pl->supported, &pl->link_config); + phylink_calculate_capabilities(pl); ret = phylink_parse_mode(pl, fwnode); if (ret < 0) diff --git a/include/linux/linkmode.h b/include/linux/linkmode.h index 3b9de09871f6..a8290d021994 100644 --- a/include/linux/linkmode.h +++ b/include/linux/linkmode.h @@ -32,6 +32,12 @@ static inline void linkmode_or(unsigned long *dst, const unsigned long *a, bitmap_or(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS); } +static inline void linkmode_xor(unsigned long *dst, const unsigned long *a, + const unsigned long *b) +{ + bitmap_xor(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS); +} + static inline bool linkmode_empty(const unsigned long *src) { return bitmap_empty(src, __ETHTOOL_LINK_MODE_MASK_NBITS); -- 2.55.0