From patchwork Fri Dec 1 16:37:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 172561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1254183vqy; Fri, 1 Dec 2023 08:38:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IHo1Zs91B2A7fzYBQvOKBE6BNShO+UY6H/iKNknVAEE8DyY+YA69AWlQBf6oI9lV6t2k9bt X-Received: by 2002:a17:902:e5cc:b0:1d0:4759:bb60 with SMTP id u12-20020a170902e5cc00b001d04759bb60mr6185643plf.26.1701448687184; Fri, 01 Dec 2023 08:38:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701448687; cv=none; d=google.com; s=arc-20160816; b=zaL0jDlUzdeUHURFrrEGcGHm8pVtfe3qLwCt7hSz39Muhr//zLh3ruBtkSzNQBoAcx 2/73Gg+TehaCIa1KBiy5GP9wyt4iwsTv9I7Twt+LfYz5GVHNl5LBSM++DA3VSZKdX+EB zHeRdXKB4YnUAiNPkCjVrDH4uWXfc/UGR6IKIVMDwgMQUmbYJO9BgWH59cjg/VUPIfaJ PM2TIC1LAUOAUzsidnwIyAcEobQpi4qMYmK+NauO/s0O6briqNvO0iymrmLcshZoFNEt JFHOY4OjFBkypaRfTuMANOO0nY3wOOkC2sQR5DLpG1EaXhe2wlg8XNfqxWUzMXEgUmpQ O74Q== 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 :dkim-signature; bh=b2iCt+luKYahOq6OV4Eg/c860F9iD1WGePLyjS+PCBc=; fh=01/i7K9ues3Vkkz8uyECvnCPITXmGs/30yOh5FbyFgY=; b=Apu0VXWSVM+R6OWc9pv+8ft5ALToG7Zu00sCqRKb09Vnc2FzuX301ahCUoEO0c4zOJ irLdMS75g9T20138bhdRR/th/swEhYeNYmqa62Jp2zcmOb7iLSRDhR0/3cZES3n+5Q7A lUtroCFpztqb12YlOrUDozkfkzrLVKWlcoYxqT3i8guwKiYx2yS2h+O0xSYMklfeCkfp r7VbnY+o2Jeh1btnxe/Q7YcT5C0G7ULHNe0oH6c4glTCao6h6l7JK23VHf3n7TQxPZBW 9K90Aulw/PcBGQRXOnXFND+2PphUrAF375DYHCchN3m2h/24glZLZqFfaYPgQIInVX8y Llxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=mCogDkwR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id o4-20020a170902bcc400b001c0c79b3869si2387098pls.578.2023.12.01.08.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 08:38:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=mCogDkwR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2C1348129ADD; Fri, 1 Dec 2023 08:38:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378790AbjLAQht (ORCPT + 99 others); Fri, 1 Dec 2023 11:37:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378536AbjLAQh3 (ORCPT ); Fri, 1 Dec 2023 11:37:29 -0500 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::226]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3251F1729; Fri, 1 Dec 2023 08:37:23 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPSA id A9F93C0009; Fri, 1 Dec 2023 16:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1701448641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b2iCt+luKYahOq6OV4Eg/c860F9iD1WGePLyjS+PCBc=; b=mCogDkwRw9OjEg7OeiqqEdRtmZhsqFny2PFW4D6ReZSd2JxleqkLbcSdjWbLgTQzw77duq jimPjPo5TAdThkJU1M1rZ2WgiqGkm7/WhNroXN+HSOnApVUP7AuVIOZgvvlCmZkdy3PzlD jrXHrfwquKCNy62ZrMi1TA/W4P9jFHxA5pIDWupJnQnKKuhVT2DyF/FPGi8RugzERWaAYu CDO3WW8fJJPFOMCXQIJbM5+POjyi5GP8G6RN5vdrc7JFPiLQXkVJxLnhXxw+7u+uGzXqdT pf7feHg5B5pxplETU1DozHmqJoTLCnkLlib5V4adErR4MPdmwl81BLirc2l/lQ== From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Russell King , linux-arm-kernel@lists.infradead.org, Christophe Leroy , Herve Codina , Florian Fainelli , Heiner Kallweit , Vladimir Oltean , =?utf-8?q?K=C3=B6ry_Maincent?= , Jesse Brandeburg , Jonathan Corbet , =?utf-8?q?Marek_Beh=C3=BAn?= , Piergiorgio Beruto , Oleksij Rempel , =?utf-8?q?Nicol=C3=B2_Veronese?= Subject: [RFC PATCH net-next v3 10/13] net: ethtool: pse-pd: Target the command to the requested PHY Date: Fri, 1 Dec 2023 17:37:00 +0100 Message-ID: <20231201163704.1306431-11-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231201163704.1306431-1-maxime.chevallier@bootlin.com> References: <20231201163704.1306431-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: maxime.chevallier@bootlin.com X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 01 Dec 2023 08:38:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784098258836106858 X-GMAIL-MSGID: 1784098258836106858 PSE and PD configuration is a PHY-specific command. Instead of targeting the command towards dev->phydev, use the request to pick the targeted PHY device. Signed-off-by: Maxime Chevallier --- V3: No changes V2: New patch net/ethtool/pse-pd.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index cc478af77111..0d9cd9c87104 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -31,17 +31,10 @@ const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1] = { [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), }; -static int pse_get_pse_attributes(struct net_device *dev, +static int pse_get_pse_attributes(struct phy_device *phydev, struct netlink_ext_ack *extack, struct pse_reply_data *data) { - struct phy_device *phydev = dev->phydev; - - if (!phydev) { - NL_SET_ERR_MSG(extack, "No PHY is attached"); - return -EOPNOTSUPP; - } - if (!phydev->psec) { NL_SET_ERR_MSG(extack, "No PSE is attached"); return -EOPNOTSUPP; @@ -64,7 +57,7 @@ static int pse_prepare_data(const struct ethnl_req_info *req_base, if (ret < 0) return ret; - ret = pse_get_pse_attributes(dev, info->extack, data); + ret = pse_get_pse_attributes(req_base->phydev, info->extack, data); ethnl_ops_complete(dev); @@ -124,7 +117,6 @@ ethnl_set_pse_validate(struct ethnl_req_info *req_info, struct genl_info *info) static int ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) { - struct net_device *dev = req_info->dev; struct pse_control_config config = {}; struct nlattr **tb = info->attrs; struct phy_device *phydev; @@ -132,7 +124,7 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) /* this values are already validated by the ethnl_pse_set_policy */ config.admin_cotrol = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]); - phydev = dev->phydev; + phydev = req_info->phydev; if (!phydev) { NL_SET_ERR_MSG(info->extack, "No PHY is attached"); return -EOPNOTSUPP;