From patchwork Mon Feb 20 13:56:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 59455 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1319683wrn; Mon, 20 Feb 2023 05:57:34 -0800 (PST) X-Google-Smtp-Source: AK7set+Yrtc6vWqyU8u5FIHpAykHrzZa19VuO+vE8DvVASLnpG7vY3NhoqhcuZ/u4fvKvz2HJv21 X-Received: by 2002:a62:19d3:0:b0:5aa:2d65:4733 with SMTP id 202-20020a6219d3000000b005aa2d654733mr1988082pfz.10.1676901453815; Mon, 20 Feb 2023 05:57:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676901453; cv=none; d=google.com; s=arc-20160816; b=e6EndgXab992HhQz5LZaGi0rLNthaj+ba9ACCXD2nGCOoBmg9mB3rSal8hjW4cvbLN tjLc8pWwPL+FuycYwbpuDmBYoKOBEwcQmX/ncwn9Pki8cvVTgxiUyzCzds5XgcHifTur Km5jcJ0lnU0EBchn16OWGP7baaqqxfBS/nnp+9qVfJGuOHa3t3x+zzkUSVeRkYOfo/gt VFbRPhA+N+b3G2BSw7gS4sWrzhKDY+juZLnmnjx4XznuEyxZMxIwIgAfXMrRRM1k15Lw emWzKcglb3C12Dr7c4/iuz6LfadKJiu5YL8jZSNRwA8Hsm1Df3Y5NzKG6vkSEv41EFQH ybtA== 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=sQgQUYFmKtq7cke5AC6TAgfNsc1xsu9QIaIQ/i/x/n8=; b=0Ppo/TRlMOaL8LPEdzy2ORgR3vyBkMhr2W1hqYByvudvL0cHpw66aLUQogDASNzsMe WAkb9bE5deZobvRWLrsfd90o1M1aIuOCoAM0nKKonNmPjVM53nA8mgZvdBOtDKczmpJC zHnMsEujcWq0FwrtH/LrCLeEyaLRCpmIDAPBNTi0mnAM3DyhSlRA9xtWBl59kK00yVnH aIgsvwb0KaYmJs5KXapSRSbphF8dLhh8LZbETEjCtEJdBduaBo9lQS3ulVM7aRV21AbN 2H/tAFQpFY5fyz/iLKVVtvv0cHT2mYSA6O7nFQcV8BjkDTTHigv/a7+04uXQYxrE4rSq Rkvw== 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 a8-20020aa78e88000000b005a8b534dbccsi14038082pfr.339.2023.02.20.05.57.21; Mon, 20 Feb 2023 05:57:33 -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 S232653AbjBTN5A (ORCPT + 99 others); Mon, 20 Feb 2023 08:57:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232615AbjBTN4v (ORCPT ); Mon, 20 Feb 2023 08:56: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 DA61B1EBFC for ; Mon, 20 Feb 2023 05:56:28 -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 1pU6eG-0006kz-QY; Mon, 20 Feb 2023 14:56:08 +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 1pU6eE-006HMS-Jz; Mon, 20 Feb 2023 14:56:07 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pU6eE-004lZt-4r; Mon, 20 Feb 2023 14:56:06 +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 v1 1/4] net: phy: c45: use "supported_eee" instead of supported for access validation Date: Mon, 20 Feb 2023 14:56:02 +0100 Message-Id: <20230220135605.1136137-2-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230220135605.1136137-1-o.rempel@pengutronix.de> References: <20230220135605.1136137-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?1758358618639082268?= X-GMAIL-MSGID: =?utf-8?q?1758358618639082268?= Make use we use proper variable to validate access to potentially not supported registers. Otherwise we will get false read/write errors. Fixes: 022c3f87f88e ("net: phy: add genphy_c45_ethtool_get/set_eee() support") Signed-off-by: Oleksij Rempel Reviewed-by: Russell King (Oracle) --- drivers/net/phy/phy-c45.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index f9b128cecc3f..f23cce2c5199 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -674,7 +674,7 @@ int genphy_c45_write_eee_adv(struct phy_device *phydev, unsigned long *adv) { int val, changed; - if (linkmode_intersects(phydev->supported, PHY_EEE_CAP1_FEATURES)) { + if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP1_FEATURES)) { val = linkmode_to_mii_eee_cap1_t(adv); /* In eee_broken_modes are stored MDIO_AN_EEE_ADV specific raw @@ -726,7 +726,7 @@ static int genphy_c45_read_eee_adv(struct phy_device *phydev, { int val; - if (linkmode_intersects(phydev->supported, PHY_EEE_CAP1_FEATURES)) { + if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP1_FEATURES)) { /* IEEE 802.3-2018 45.2.7.13 EEE advertisement 1 * (Register 7.60) */ @@ -762,7 +762,7 @@ static int genphy_c45_read_eee_lpa(struct phy_device *phydev, { int val; - if (linkmode_intersects(phydev->supported, PHY_EEE_CAP1_FEATURES)) { + if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP1_FEATURES)) { /* IEEE 802.3-2018 45.2.7.14 EEE link partner ability 1 * (Register 7.61) */