From patchwork Sun Jan 12 13:29:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 13936362 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 DF9991AA7A6 for ; Sun, 12 Jan 2025 13:29:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736688596; cv=none; b=TY0kR4217indeqJLmBj4Q8ygcRJzQLDu86WmVkFDhxJaBC1c9sVXidEnk3JuxkKB0abWAbhcF9srjDKHoympyMyjT3hjRLjdTcbkhAYBTLmm9zubtTEEVKphKKxeHF2dZYGOGKKlhulOBMuBMEKdAXRnkvhgBowJl1YHEYovV+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736688596; c=relaxed/simple; bh=m7oOeWasZB8sMLKusNO7PwDSsO1bSaH7+fDr6mUk+cY=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=PTxbPk0Eaq4MlW4pztm2D+REe7Wpvew2Px2HudrScXel0kHFlOc2TWLm+Z/ZhJqSLd/r3Owpcw6E4M7xL0XbWkyFqGp2tTyJDX47vsy3uLVM/D1CHLMYI8Z33YFz5k5V8DDJYEvuxQrYHnI5S1g13EIPZmSgof6OTONXb57tc+E= 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=SwTu9ViF; arc=none smtp.client-ip=209.85.128.48 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="SwTu9ViF" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43623f0c574so24636875e9.2 for ; Sun, 12 Jan 2025 05:29:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736688593; x=1737293393; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=kf/KMEQ/ElF9v7CuLo5DZanRgmwiWtYx7D6TfnW7Q+8=; b=SwTu9ViFeYzETVQlz0crSY5tM+jacSWOjEXsGoCOtj7ADLYUhPDOpwEnpdJltJdGCV qUPFCyFfipP4XTT7PTMdEEJUTEVUe7bnSXxKxdnYTbJVn5HZVz4x6pLdQKivRpFjMfxV mAHEKcx2Ulx/BlPmvdHtXLpX7gDIM/GJucwy56x/yZ9nAifgyFfmRglTHO9BF5nQ5lFs PM4XDudNWEo6fjLG8H331WgWE9M4qy4IRlgaiffQ0XrtwTWYlpfPIJfyOyA/eSCqgbq6 V6xox2oHJvZCGcvp+MY187crVglgnz/RLKd29eoHmAg0UDaNidCejkSYVj10BomIB64g a0cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736688593; x=1737293393; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kf/KMEQ/ElF9v7CuLo5DZanRgmwiWtYx7D6TfnW7Q+8=; b=vmGuqcZw00g5xr07su0DKVUgfnxIeIjimXfUqEL+Q6xoXFF7xlbUiifPAxTIUDq/W5 xGX7QfpHyfG4EJV25Y7ANyXc8oS/pkQWDwNp0ja7Qww1SPDkum58OPznBsCwtQGYHL6s ui4ftUzkJJ2gU7QdxbyyEC1A5bzggn8nHSyd44mnEOQ1VSqS+xWHXOF8gxTxZezQ58tl dVt9Ydoa31j2pVfHkjT5SJVyMWSeiPDzDkFZafZM3ZYKmcGxKEHfHzA30pOuNaod69Ln liCD6cKB8cXpHuuh7yOzn9gyvXThr3wUp637z2q8KziQGvnHDO20UmB8iilZDwuLOzRB q1hg== X-Gm-Message-State: AOJu0YyvzWyvqeA2PhCb324vP+Fmj4NOc9/dlT4c6v+ZA7UHjtPOjTVt dMtHRRIJGTJcbfP8eq8AuIYlwdVt3ZwMLAvTjka4sb97bwrGNttj X-Gm-Gg: ASbGncv4UAB6g2RILERN3EGVHWaAEjNl45s0XI9hP1Q6nAbHvFTa8pAAzdR2RDeA9G0 jtYSi+sSm1rj9tmdiigHofXcRVrZhESaNf3fZ6XyScNycUgo0EsHck5JDd9OBhoJKO/l05OJvi0 fz3o5WRhZzN49z5wXSzmdg4dOx/XxsgeEmsShNPGC9fKcAk0jg4ks8/sgJXtvyvVXAV/riZWAEK PQNHGUsWZkCZj0EJT6Pn1TUxg7WSzWADgTiAma36T485YO3T85QuhIiypS1/NBtAPEkauXi1hEw fz6I7A5Yg1op3begR7cpgTwSJqOb0xdvo2rOutLmoigK9EPLzrVN/4w5HSR5C1BnZdBjXOuGx6T I+72LfAwihaTDuSblAOaqyXS0GqD12sGylZ7tmQ16okEFz9W6 X-Google-Smtp-Source: AGHT+IHg/+duhA8CK+LwwjrP2WcDMm1ZhT73MPbJJH1l2whs23xq2/njZo9LRmZVW0ewnSn9BVExVg== X-Received: by 2002:a05:600c:5117:b0:431:60ec:7a96 with SMTP id 5b1f17b1804b1-436e26ddc53mr135453105e9.25.1736688592916; Sun, 12 Jan 2025 05:29:52 -0800 (PST) Received: from ?IPV6:2a02:3100:b0d5:ab00:44ab:526d:76d3:604a? (dynamic-2a02-3100-b0d5-ab00-44ab-526d-76d3-604a.310.pool.telefonica.de. [2a02:3100:b0d5:ab00:44ab:526d:76d3:604a]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-38a8e38c6dbsm9847591f8f.55.2025.01.12.05.29.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 12 Jan 2025 05:29:51 -0800 (PST) Message-ID: Date: Sun, 12 Jan 2025 14:29:51 +0100 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH net-next v3 04/10] net: phy: c45: improve handling of disabled EEE modes in ethtool functions From: Heiner Kallweit To: Paolo Abeni , Jakub Kicinski , David Miller , Eric Dumazet , Simon Horman , Andrew Lunn , Russell King - ARM Linux Cc: "netdev@vger.kernel.org" References: <5e36223a-ee52-4dff-93d5-84dbf49187b5@gmail.com> Content-Language: en-US Autocrypt: addr=hkallweit1@gmail.com; keydata= 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 In-Reply-To: <5e36223a-ee52-4dff-93d5-84dbf49187b5@gmail.com> X-Patchwork-Delegate: kuba@kernel.org Currently disabled EEE modes are shown as supported in ethtool. Change this by filtering them out when populating data->supported in genphy_c45_ethtool_get_eee. Disabled EEE modes are filtered out by genphy_c45_write_eee_adv. This is planned to be removed, therefore ensure in genphy_c45_ethtool_set_eee that disabled EEE modes are silently removed from the user spaces provided EEE advertisement. Add a hint to the user so that it is done not that silently any longer. Signed-off-by: Heiner Kallweit --- v2: - silently filter out disabled EEE modes - add extack user hint if requested EEE advertisement includes disabled modes v3: - remove trailing newline from NL_SET_ERR_MSG message --- drivers/net/phy/phy-c45.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 468d24611..2335f4ad1 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -1525,8 +1525,8 @@ int genphy_c45_ethtool_get_eee(struct phy_device *phydev, return ret; data->eee_active = phydev->eee_active; - linkmode_copy(data->supported, phydev->supported_eee); - + linkmode_andnot(data->supported, phydev->supported_eee, + phydev->eee_disabled_modes); return 0; } EXPORT_SYMBOL(genphy_c45_ethtool_get_eee); @@ -1559,7 +1559,12 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev, phydev_warn(phydev, "At least some EEE link modes are not supported.\n"); return -EINVAL; } - linkmode_copy(phydev->advertising_eee, adv); + + linkmode_andnot(phydev->advertising_eee, adv, + phydev->eee_disabled_modes); + if (!linkmode_equal(phydev->advertising_eee, adv)) + NL_SET_ERR_MSG(data->extack, + "Requested EEE advertisement includes disabled modes"); } else if (linkmode_empty(phydev->advertising_eee)) { phy_advertise_eee_all(phydev); }