From patchwork Fri Jan 26 18:38:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 192745 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2395:b0:106:343:edcb with SMTP id gw21csp74840dyb; Fri, 26 Jan 2024 10:42:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IHtewS7lllUJwNjA+yFZU6PhM5jKdPv9NS2BS1ZdHiBzCGeo3konnsdE0jsphWQemuGd7oi X-Received: by 2002:a17:907:c207:b0:a31:2f87:d367 with SMTP id ti7-20020a170907c20700b00a312f87d367mr2371062ejc.29.1706294534972; Fri, 26 Jan 2024 10:42:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706294534; cv=pass; d=google.com; s=arc-20160816; b=Yri5UaSxenQVAo3omR+QA8J+10Qo9o1tUEHNvDGLPq8H8NzeQkMhzI8W5Z60UIWaVA tHxAvQNpPOGX8E651LsVYdHUx9aKApB9RXJzvJ/rUetxwzYkvlreDuyWkejvRYWfBPHh kCuZXQNCi+4s+3GE9O6DB5YuEj7A+R84oWPAM/LPI3cupBdtXOb11Sn+tDh37mr6Fh5N IfIMVm75eaMETfh8piR12RU+LbBE0aowQkV9QmGwh+uGmhD97uHr9FZCsgsJuugtWDO3 LGOFBHPtB7k0JzU8Atxmvyx2tlIxPBdGGcoZL1INaQcR/wu2WM0VqiXsnqnwFuVPC2vH G4CA== ARC-Message-Signature: i=2; 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=zQFois8a6nNHGaAECB3lt0tqV5GTbg5/X08/8OHmyTU=; fh=d3Krop4IPE3x6nBOvh3GY5QHg6bS91zVnQiH59I3hyM=; b=XCuF5Kc1g8SO7/8RBEoWfTMk016fOLdGAv/jEAEmCXcSt9cY8Eq35wVn1N5DY8RgTs kZrQoH9CgDkFYXj7m8IUYvDmQ95zD6Gn2rnIYYrQdQIB7HPX5qn2plkd63pATIfevuM7 uvqC0Bi9rDmPA+lYnqEInjRcIhgT90T4WCAJmbGnammnhM1Tyiqy8HdhXcdnA81iiN2q PEA4atF0uWcsWmUeTzmx/fROpMF1hvepIpbJCis8XzBco1jz0ijAhRekOsRPBTQ51azr t8AeZXsFtqWiY9RwlG24D1SuJqAZdwsNSPyJpdyp+imYv7F6vIdkotR+ioBP2BJUGR09 5slw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=DNxbWQFZ; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-40511-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40511-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id o5-20020a170906288500b00a318f0a6a33si816547ejd.372.2024.01.26.10.42.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 10:42:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-40511-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=DNxbWQFZ; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-40511-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40511-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 97DA31F21477 for ; Fri, 26 Jan 2024 18:42:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 719B2482D5; Fri, 26 Jan 2024 18:39:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="DNxbWQFZ" Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (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 E15F122635; Fri, 26 Jan 2024 18:39:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706294351; cv=none; b=MKzlEr7n292z282ParE57hdJlQR55IyzNCy/ur9OUn4DNOfXvVI1p6iGUHO3qrKVjjVZa0JG+bneS+6TEoLQ7wVyWEQBsulGU22LQQqL9WpaSLf9rvTFs6W/o5hZ60iAGOq7qQRwwrvd14eBQxvSk5nirD/VsMeLV1Aj6aBnEqM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706294351; c=relaxed/simple; bh=v9mv7hymRlGA9oO3OellTRmFHX9PX8wfksRaTLvPZJY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KxSG0HaIDKiDCf9jijYxlr9rDbpX/vhiQ7W+uLKXTqxPuRpsyJFjlw4EHAgI5DnKT1GchEFT6of0C4ykA/d+swYNO1+7M1J9xbP1Hi5pQmn1OxWsuNvRXnak+qNuajSKdhXGpBSv/C+ytEuztjPROHxuf4U8X+zrQNDKEmnNVKs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=DNxbWQFZ; arc=none smtp.client-ip=217.70.183.199 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 2AE5AFF807; Fri, 26 Jan 2024 18:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1706294347; 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=zQFois8a6nNHGaAECB3lt0tqV5GTbg5/X08/8OHmyTU=; b=DNxbWQFZ9C9aoSjIxKTE8E4tNSAjxvJr8zWXF2AtPzr8zSjCDDkioOgMccsxWYFvg8anw9 7wsN1fqAc5X4+LZ5Y2H2WMJVov+TABGeqVxDuWmTdjbuVgouRQLzvfquxUKLiqRa7hJs0P Fb+8UVsPw4rI07fTo2ZRpOReBa6O3jY4XEBKA9pIH2mFjrcFp5izFZwoFDk8UD/5J1yWF7 0GF3N/KseUnR8NzrdrKQ2ktnmadMUoD7ZX4WPa6yUvOKWHoDEEDdeUqxc9cQrGpMVMRJJ5 /T6qMbQFpgW7BuxwS1LwlC2TFF0oJwjhhlJ7eUGGAqrJfOKiSaXuA3T+GXzS4A== 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 v6 10/13] net: ethtool: pse-pd: Target the command to the requested PHY Date: Fri, 26 Jan 2024 19:38:47 +0100 Message-ID: <20240126183851.2081418-11-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240126183851.2081418-1-maxime.chevallier@bootlin.com> References: <20240126183851.2081418-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: 1789179498375769968 X-GMAIL-MSGID: 1789179498375769968 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 --- V6: Use dedicated policy V5: Added-back an incorrectly removed check V4: No changes V3: No changes V2: New patch net/ethtool/pse-pd.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index cc478af77111..be50d79122c4 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -28,15 +28,13 @@ struct pse_reply_data { /* PSE_GET */ const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1] = { - [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), + [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_phy), }; -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); @@ -109,7 +107,7 @@ static int pse_fill_reply(struct sk_buff *skb, /* PSE_SET */ const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = { - [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), + [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_phy), [ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] = NLA_POLICY_RANGE(NLA_U32, ETHTOOL_PODL_PSE_ADMIN_STATE_DISABLED, ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED), @@ -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;