From patchwork Thu Dec 21 18:00:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 182386 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp598769dyi; Thu, 21 Dec 2023 10:16:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IFBlG3iI1Me72zTik9KBkDp4ECgH4C9BBN+M19SjD3H/oKjRni9z335XO+NgnZwQ7+ioSEq X-Received: by 2002:a17:90a:4bc8:b0:28a:b3d2:a63d with SMTP id u8-20020a17090a4bc800b0028ab3d2a63dmr131379pjl.7.1703182598371; Thu, 21 Dec 2023 10:16:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703182598; cv=none; d=google.com; s=arc-20160816; b=gvZgQhA4SpnQrHvWH7NSvJQXUQxdL2dfqMUzL0de93rsz08RHfGekd9HTeDpwUZb60 TpqYJQUscSzM15BX2xfN5/HOvdDnff+zH3tzYs4Jo3so+a9hXJk8MGtwB/3iw0WAO2Xw q4tn1r/4BhwS//Izzk+gPGkjqUHUCYO7iwJN5BWoEngYxqJQta+EaxmrY2FLr+cCChKQ AqgRle36e30X4e1jrTLmaYhKy/zaUG1+pA2gnVfFatEa2shNjnMH1OfEyegThlyT3g4h g5wZFnhuIrffEz+OuJTekSCco+g7pumvJPUZhiObxBUxeQleatOZASV/hHZZXxH1CrC9 pdlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=RkeAnsXmMy6aYQwaTCxZem0lTvH7EaUMRYZjn8TT7Ok=; fh=d3Krop4IPE3x6nBOvh3GY5QHg6bS91zVnQiH59I3hyM=; b=dsX5Fj+W/kbhgpb2v8qAb3KfBiMAt7rirXcvT1mR+D1SQasuDY2xNig3LIZ2ZBZWgi Vlvig1bJzffToTutzJd7kK1cWsoQ/C5OpjXEniIyJXHykymfbe6aab8zO9A0k3phHz9b rCrmadlEIGSNyeRNPkG0yPfIOsCiKPxoEnWQ2pTQXt46AThSecRKGSU/1+r/hCzPmc+O Um5zs2fV1GQmpwCiQmf2W/JDQEUyrjb0Yk5+QWUXC+tJpfkAyi9aOYovy5z6ec0n/sn7 SVV/rUn0jSwB0jLU6gxucEp1aM3uCcmONbfG8MPlQAmjzWavmnCKrrEqu5NWSD18YpDX I/xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=he59HTwz; spf=pass (google.com: domain of linux-kernel+bounces-8895-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8895-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id r5-20020a17090aad0500b0028bbccf4e21si2043373pjq.160.2023.12.21.10.16.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 10:16:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8895-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=he59HTwz; spf=pass (google.com: domain of linux-kernel+bounces-8895-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8895-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 055BD28B0AF for ; Thu, 21 Dec 2023 18:04:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25A3478E92; Thu, 21 Dec 2023 18:01:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="he59HTwz" X-Original-To: linux-kernel@vger.kernel.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E92077628; Thu, 21 Dec 2023 18:01:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id C0F461C0013; Thu, 21 Dec 2023 18:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1703181664; 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=RkeAnsXmMy6aYQwaTCxZem0lTvH7EaUMRYZjn8TT7Ok=; b=he59HTwzZHxC073jD/+o2VHPxP7KoBUx2QIkTK9+hbAcFdwhtfZLSceVQOP0b4U7UaqBVp 3y3nf/+ZCk/9MNtZo0rkr2h+b+SyuxZAHkmhoagPLDXbb4nbz8YwTEg0aEmWhYymIcfsWY gZ6Bg8nmhB98RSH1nZoQ7swLOsNGRmGpfx3II86qdC/J6uzQsRqGeD31+WHBTjWWwsLpgC 4CJKFAZr42br3YaV/GwJpHcDxC1ujVUxFW9JywavsAWKw3dqTXT00ku3TrtYUn+rrpUCCv 274kBIu2CaMdcc5BhHxKf4pk2cC2khDrC1aZF0XoEIBOBAEYfEYTEKWqSn3jFg== 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?= , Simon Horman Subject: [PATCH net-next v5 10/13] net: ethtool: pse-pd: Target the command to the requested PHY Date: Thu, 21 Dec 2023 19:00:43 +0100 Message-ID: <20231221180047.1924733-11-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221180047.1924733-1-maxime.chevallier@bootlin.com> References: <20231221180047.1924733-1-maxime.chevallier@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-GND-Sasl: maxime.chevallier@bootlin.com X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785916396187104855 X-GMAIL-MSGID: 1785916396187104855 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 --- V5: Added-back an incorrectly removed check V4: No changes V3: No changes V2: New patch net/ethtool/pse-pd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index cc478af77111..4a1c8d37bd3d 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -31,12 +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; @@ -64,7 +62,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 +122,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 +129,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;