From patchwork Tue Feb 21 05:03:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 59763 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1683899wrn; Mon, 20 Feb 2023 21:22:34 -0800 (PST) X-Google-Smtp-Source: AK7set9QV0tAhLZ/KX9drktxM2vMiZmiqgV6rOgeinQGkGLq4TDQZ6RYN2OeDHAtylEtRjVV+IF6 X-Received: by 2002:a17:906:3d7:b0:8b1:7e21:f0e9 with SMTP id c23-20020a17090603d700b008b17e21f0e9mr13728944eja.18.1676956954196; Mon, 20 Feb 2023 21:22:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676956954; cv=none; d=google.com; s=arc-20160816; b=zdUF6+f1JC6FkZUAMfQih3O5nR6zg29vveGi9WOvmynYphlQvut2k2GzwE9Toc3qO7 II8G3hUqbsWvq2EASPuWdRmLNlYjwcFM/YbpVEqz5nmEHW4EzZnngm3g17cdjvW+pgEu yXQW51Rdn2yXq619vM+QHshJ3H3m5G5VK9HEID786dKD6zAvjpKdJ3gSfCu54f9U490X Zr7/CW3WP7G6ATIzJ8O86ZbYKnvKBGikRTcomSmyYul1efhsK2IapwPwS12yAyePn6HZ tdcamXg6KwilWMrmgS+K3AuhyAEgp3rThM7jK8MDIWSxP/CjlrVJV4wTjLMQuYgjfMPg QnaQ== 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=7gHBatQDaIwQQ1OGBKoGu3st5NcNkQxy5TsChDN8y90=; b=Jha7ohtx4l4bi20Uu77yJuOiwEWhGh4JXa1ki2kM0hU4HFixFmqXFiTAzinIGF2XgW 2KclAqLpjkPt2BD9wiUzRH98f8RATGtiQjMFEktpMfZ8NvqE9uECDLpxSoBtaKjg9gB2 x5Iye2d1IhTnovOKxCxa/qx+6OIm8VpMPV/k7NeFYThWq/0CQKe2pNBtZAJlrtwROhfW rHwCbzRwNg9E135qhGz/mvh971UCpzxogwnXTRlZVJ165n7ck7bdXEu9nGRsHEhbPCLa d8e9SxS6Pwgi7HJAMlVAnWbHFupFV4CN5C1B0EhmF0GvPKwJcBDpsIUcw1EeJ0CzHUpp cPmA== 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 y10-20020a170906518a00b008d518d4bf7dsi4791936ejk.562.2023.02.20.21.22.10; Mon, 20 Feb 2023 21:22:34 -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 S233179AbjBUFED (ORCPT + 99 others); Tue, 21 Feb 2023 00:04:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230114AbjBUFDv (ORCPT ); Tue, 21 Feb 2023 00:03:51 -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 A8C801F5D5 for ; Mon, 20 Feb 2023 21:03:47 -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 1pUKoU-0002zz-4E; Tue, 21 Feb 2023 06:03:38 +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 1pUKoR-006PyZ-K8; Tue, 21 Feb 2023 06:03:36 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pUKoR-002QOJ-QP; Tue, 21 Feb 2023 06:03:35 +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-next v2 4/4] net: phy: c45: genphy_c45_ethtool_set_eee: validate EEE link modes Date: Tue, 21 Feb 2023 06:03:34 +0100 Message-Id: <20230221050334.578012-5-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230221050334.578012-1-o.rempel@pengutronix.de> References: <20230221050334.578012-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?1758416815538826980?= X-GMAIL-MSGID: =?utf-8?q?1758416815538826980?= 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 --- 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 71671a07175f..f595acd0a895 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -1439,12 +1439,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 {