Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp6833050rdb; Fri, 15 Dec 2023 09:24:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+4AkZ0R+ELIk/u08EryCiYeRTanvYcqGQTyqhTgXo0sd0NGfbqqLuXNKCAeZkPN74rA0T X-Received: by 2002:a17:906:454a:b0:a19:a19b:7894 with SMTP id s10-20020a170906454a00b00a19a19b7894mr5513932ejq.87.1702661072203; Fri, 15 Dec 2023 09:24:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702661072; cv=none; d=google.com; s=arc-20160816; b=omq3xCn4kgBlswmQ/+L+K0fzTlFt67iD5JZia9QUlJWU9PGWoLCnXDoocH5bs+1SP9 0tvohoq4AsHWesfb7sei6J0zZ8S0LHcVRc1Qpxryh9xPwT2337Fszijw8pfJJ2EJ2E6O 8Sovnce5QbTmghWDSjC0OSObczpKGxeAcFntJKOXe7tz2SqKw1P3/ZI0XDZ/ZOqjk2bg P0sLzspDxMfAzEESMRXMmh6uniQ1PPz8JFhsO7EUKiVArinieYNxXl35gjal52yKswG7 eASBxmJSnCRsT2COEdMOpgO+1m8LYll7MLYpW3pLtstsMLTB8zLyyaKgDQQ9YS19+qYG nggQ== 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=4gmaLaOCrQ9K49CYdnYsU/QMfrtPAaYJooY5eXRUFpg=; fh=01/i7K9ues3Vkkz8uyECvnCPITXmGs/30yOh5FbyFgY=; b=dIn1VAOux97WxQsXdDXvEdKX3vV/W7dv27DegZkKhr36rVbZ9+dxI4IBzcj11ajFxQ L8ZaXnDB2KrYhsLN/80SYfcrL1iG32WKAuqY13uyJ7cZqDqK4M1QuhGr4EwH07ldnEfQ uN5Z09cy7Ft55CYHUqfXb8nbf2CluA2+hi/98mn83cLPiFBjoFWPv3s+MkmpVcaxodR3 4YQ4d3pPuQIUvatpOTPnVjrxtXvAz0ApMf/+ZU0fXQa98Vy5EY7BmlW4IhNxDKqDANh3 YE3jbFbGeL6839XwmwRb9loGHVHE/u6JcTNZuX93hm0ZgwL7MggkQbJeejuXW0dErN3e 60Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Hj8cTg8F; spf=pass (google.com: domain of linux-kernel+bounces-1402-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1402-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id m13-20020a170906234d00b00a1e4f417e9esi7416347eja.735.2023.12.15.09.24.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 09:24:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-1402-linux.lists.archive=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=Hj8cTg8F; spf=pass (google.com: domain of linux-kernel+bounces-1402-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1402-linux.lists.archive=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 EE8781F245FD for ; Fri, 15 Dec 2023 17:24:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 096467EFD3; Fri, 15 Dec 2023 17:12:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="Hj8cTg8F" X-Original-To: linux-kernel@vger.kernel.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) (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 442AD5F854; Fri, 15 Dec 2023 17:12:56 +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 78F1BC0003; Fri, 15 Dec 2023 17:12:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1702660374; 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=4gmaLaOCrQ9K49CYdnYsU/QMfrtPAaYJooY5eXRUFpg=; b=Hj8cTg8FLIF3xrJaSs5mYKSSXfTCzB+Wr4q7ktrmg3VCgqYssmb7JROEm+KWU3eftMfNEF WwLPN0RQ6Lhf+3DvnH+s6Kildm3DQNfw6ymOWGDv/Ce+1lXcyV6raE7w8iswZcm73thRrN JJsKOo6DWf/ZE2zVsc/vazlGVsNixtI2vyNHUEUIlOX+Ep5I2CvDe3LL0vTmxERb46ViqP iesK+6qXguUFUHOAqN5CSl3rXc9Zbuv2dzLRurRvWlMWKDhAJpZnRDj1Gq5ZlCIaUBBrKO vse6BZAUV3wuULC8wA6dfdNNOQibiQOemmYVAWpTabvyT0oFntyqccBE4lFfYQ== 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=20Maincent?= , Jesse Brandeburg , Jonathan Corbet , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Piergiorgio Beruto , Oleksij Rempel , =?UTF-8?q?Nicol=C3=B2=20Veronese?= Subject: [PATCH net-next v4 10/13] net: ethtool: pse-pd: Target the command to the requested PHY Date: Fri, 15 Dec 2023 18:12:32 +0100 Message-ID: <20231215171237.1152563-11-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231215171237.1152563-1-maxime.chevallier@bootlin.com> References: <20231215171237.1152563-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 Content-Transfer-Encoding: 8bit X-GND-Sasl: maxime.chevallier@bootlin.com 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 --- V4: No changes 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; -- 2.43.0