From patchwork Wed Feb 22 05:50:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 60344 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp403193wrd; Tue, 21 Feb 2023 21:53:25 -0800 (PST) X-Google-Smtp-Source: AK7set9NkynoSgImxlqsZZE//zooOm6SPY9GhZDhPpYIDmXwM8bepKwHnYUHfy3VYOtZKWIhMYJk X-Received: by 2002:aa7:d794:0:b0:4ad:7224:ce9f with SMTP id s20-20020aa7d794000000b004ad7224ce9fmr7825855edq.17.1677045205542; Tue, 21 Feb 2023 21:53:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677045205; cv=none; d=google.com; s=arc-20160816; b=knv2itf0rqaHAyzFIA8+BCMD2Dr40fBaq6SJHS44Ng2tFkb9uyfLZqmq1A/dzKdnnL xkd+sU38KUis14uxBRWCFQLLr+FC8OdbKXSvVkK449V1EjPWX5XDz9zdu4DnollFdwKN nmdC2m3OcOqBFgBbB4g7RWwju0SHpGEORTeV6omDb/1qSb0j/AJgOwPfT7XJDtCvS9HE i+6X3B7XjAd/5zLYx+4IqpGaF01dait6Dqv5T8macSCtVbq1D5jZ/MYlNW6vK4JlPjNj oj7vJ5D+laXaqMu2SP2UYEaxV/Zxf7NAjW0mZFyJKL1HMwCbrVFuxV9K0vdm1KcF85iD imHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=f4vPMviV3M3VwRNqsBdABgG0nNhiW4FSVpJMOMDYPL0=; b=avYRFKFLtHeFN6RC77j9AgsqtgUpWuJyMxnDB/M6kDR6sLlqPSVHwuu6MMfR0aprFu /dyO3iwQoz13hVM6eXgcwPVNwT7sa7YA8lU4gsSdY8wbFI0YUpq2a+bOdh9zAJJjflo4 Cv+KSe3MKYIr8ADItjiKaLomVVPbBvaw0di3nXB53inTmiFiA7EX5kkLV/+Uv3f/sEGJ /VbejxWiGSk0YBcm37FVmNJPvsn+P34NllwQI6kIeUQBp6ZHYi2jcy0GROj0cXKRKgPN mzHQxXdV+IQH/LDfX49kOlu1PeheWUxlF04OakQafvRh46QeCuN47rMr9W+6FIxFQ5BX Iirg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u21-20020aa7d555000000b004ab49a10653si127226edr.584.2023.02.21.21.53.02; Tue, 21 Feb 2023 21:53:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230297AbjBVFvA (ORCPT + 99 others); Wed, 22 Feb 2023 00:51:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229561AbjBVFu7 (ORCPT ); Wed, 22 Feb 2023 00:50:59 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF4EE311E1 for ; Tue, 21 Feb 2023 21:50:57 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pUi1g-000606-6Q; Wed, 22 Feb 2023 06:50:48 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pUi1d-006efV-80; Wed, 22 Feb 2023 06:50:46 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pUi1d-000Tba-IY; Wed, 22 Feb 2023 06:50:45 +0100 From: Oleksij Rempel To: Andrew Lunn , Heiner Kallweit , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Russell King Subject: [PATCH net v3 4/4] net: phy: c45: genphy_c45_ethtool_set_eee: validate EEE link modes Date: Wed, 22 Feb 2023 06:50:43 +0100 Message-Id: <20230222055043.113711-5-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230222055043.113711-1-o.rempel@pengutronix.de> References: <20230222055043.113711-1-o.rempel@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758509353469192612?= X-GMAIL-MSGID: =?utf-8?q?1758509353469192612?= Currently, it is possible to let some PHYs to advertise not supported EEE link modes. So, validate them before overwriting existing configuration. Signed-off-by: Oleksij Rempel Reviewed-by: Russell King (Oracle) --- drivers/net/phy/phy-c45.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 8717c122e2f3..3813b86689d0 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -1438,12 +1438,23 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev, int ret; if (data->eee_enabled) { - if (data->advertised) + if (data->advertised) { + __ETHTOOL_DECLARE_LINK_MODE_MASK(adv); + + ethtool_convert_legacy_u32_to_link_mode(adv, + data->advertised); + linkmode_andnot(adv, adv, phydev->supported_eee); + if (!linkmode_empty(adv)) { + phydev_warn(phydev, "At least some EEE link modes are not supported.\n"); + return -EINVAL; + } + ethtool_convert_legacy_u32_to_link_mode(phydev->advertising_eee, data->advertised); - else + } else { linkmode_copy(phydev->advertising_eee, phydev->supported_eee); + } phydev->eee_enabled = true; } else {