From patchwork Mon Mar 4 15:10:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 209577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1485478dyc; Mon, 4 Mar 2024 07:14:44 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVXYF8T5SmqkF1Dy+8CHbnwCJcnxm2tB/OH9DDMqKng85EPUj+jcx/blWxf5+15gjCxk2snGG4avPouJFbrZSZmITSG5w== X-Google-Smtp-Source: AGHT+IFgYdT2mrXRwq8rwQUIdpjnNzw0HLsHxbGU8+0NwPzrzRHAhRd+vrzchi1xRFVw6FUBCztc X-Received: by 2002:a17:903:228f:b0:1dc:b308:db44 with SMTP id b15-20020a170903228f00b001dcb308db44mr13094528plh.45.1709565284516; Mon, 04 Mar 2024 07:14:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709565284; cv=pass; d=google.com; s=arc-20160816; b=ZxZ2ekLAEzqyILcmeCzKbmdpzyIb2zz27tcOg04bL0gRMBp/4qgRKedHbb4y2dBFgI s+JI3/a7pDaQL0tyj31zJulhBS+3u+NAI9utLOxY6Sa3tDvwB/l1Nv7y4dp+rFoNqYm8 bh6dvFWwo4nq6eTW+ZA+jUlSB1BtgIw7r5HUAXBeG4bJ4WAvbSF6tF65621vHpZVOJYS ZuR28B7rbVfeNV0QkLPPe+1h+lI15L6jO0ifE8j/RnWO3uq1pAYD3z73dXt8UGtWVGcH dRy/QbQkMyUBffi/OESzdOThaim7Qv/9YnUmbBWJrfX0cvMeLtaEaTf2gY3CrjIHd/p5 ITKw== 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=g1K1UorxSnRzVQ0zQyfhKJCPNGcdHhxMml8f4DmBUpI=; fh=1vUu/d1GTjraph6G+ET+Z0z13QVrf6oL/IrrK9zaTF8=; b=pB40AMwVPPP7iUoVsrUp4Q0nq6AIy5Jh0d6mCu06hVAI92Endwz482tpgMf+mUkVhX tqosrfQQOjLAvwMrnX7HjDGc2rC6qBGyeMehsWAY5u6uN7ZClqVHHiEmHeCLCIHeakwh JrheE983eqrjpTCYhLZOd72xQ3CswMyvbGUQrCBiPWC0nRqXE7oDCdr8FqSvpUlXrI5P x5w3y0X1EB2uEOm/wvmbPwnK9U670Bb0Dd+4czRwt2hqE8ZPKt0VSMNqKK28NT0k24CS E8uzaJ8RNiCgo2LfBTy0OuKhASokCm1aLrWVKZnxfiVkidQM3SJzws4C8yoPLyzp8tZ1 jFvA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=NQ3AwlXE; 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-90788-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90788-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 n6-20020a170902e54600b001dbf95ab349si8426471plf.472.2024.03.04.07.14.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:14:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90788-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=NQ3AwlXE; 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-90788-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90788-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 5239F28B5A5 for ; Mon, 4 Mar 2024 15:14:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A26C157333; Mon, 4 Mar 2024 15:10:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="NQ3AwlXE" Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (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 4DCF8535D4; Mon, 4 Mar 2024 15:10:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709565030; cv=none; b=IYPjXC72moq+pKGKP2XcI7X76xn9VCYenDpXTbK/EZLGuGlRKrQIpe6a5qn8XKqDhz/QpiTW4X+QakSn7UKqqg+qZJS36pSnanOoBZobGzlO4WVWct8i6gFUEciZJB0HeyiJWYDnLmjBZpVR7vafHBrRE823mCySzMj+OGeenzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709565030; c=relaxed/simple; bh=qdiQac5f+KPy/02jGaX+253lB8GsN50JaYKYc0Bhn/s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=te3LYAtM+kI5kWtjxb6+9lkMCJWXw3jH82+hnp5a1gNRidz+bMNK2yp+VnUXuwW3SwkA4UyzRSvo7F1Ivshi2eTUkXSf3VG2oN1rivrkuasCeACLXbiaQVD8gmOjDhiiYOaxryFLjBtU9lS6CGRJOY3eSV0B2py1qJsbEKNJlx4= 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=NQ3AwlXE; arc=none smtp.client-ip=217.70.183.201 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 622E51BF208; Mon, 4 Mar 2024 15:10:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1709565026; 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=g1K1UorxSnRzVQ0zQyfhKJCPNGcdHhxMml8f4DmBUpI=; b=NQ3AwlXECeeUsev93Xq5mgCPaREBMEVK7s9+ZyG54dn7r5QcNUijIlYRyF7L5j3/1tiumP PnVVQYB0ZsGaXiMzuLn9FIOWnkwNi1TbQtnAOz0cFuRjB2soa6LP3NBJWVrWvWj86ljJc2 W/tCN81rIaGKIuzzE/kjvEjQDn+8+XQziub9j62IpTnaQwvhQ/0X7TMWwox6GZTQjCqD6S Bqw3tubsExzI4MxCZVrdodEZnViLuvdw449DqSv0HVKQjPsIqittwcc0xET/YrZUvIp2qK /5Ygsj14gTQHoPRBqhy9LPfgzNOJ8iLauHdAJ3oGwJaPVIuJAlFb4mE5HfX9uA== 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 , mwojtas@chromium.org Subject: [PATCH net-next v10 09/13] net: ethtool: plca: Target the command to the requested PHY Date: Mon, 4 Mar 2024 16:10:05 +0100 Message-ID: <20240304151011.1610175-10-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240304151011.1610175-1-maxime.chevallier@bootlin.com> References: <20240304151011.1610175-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: 1792609128091393838 X-GMAIL-MSGID: 1792609128091393838 PLCA is a PHY-specific command. Instead of targeting the command towards dev->phydev, use the request to pick the targeted PHY. Signed-off-by: Maxime Chevallier --- V10: No changes V9: No changes V8: No changes V7: No changes V6: Use dedicated policy V5: Added Andrew's R-b V4: No changes V3: No changes V2: New patch net/ethtool/plca.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/net/ethtool/plca.c b/net/ethtool/plca.c index b1e2e3b5027f..43b31a4a164e 100644 --- a/net/ethtool/plca.c +++ b/net/ethtool/plca.c @@ -25,7 +25,7 @@ struct plca_reply_data { const struct nla_policy ethnl_plca_get_cfg_policy[] = { [ETHTOOL_A_PLCA_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), }; static void plca_update_sint(int *dst, struct nlattr **tb, u32 attrid, @@ -61,7 +61,7 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base, int ret; // check that the PHY device is available and connected - if (!dev->phydev) { + if (!req_base->phydev) { ret = -EOPNOTSUPP; goto out; } @@ -80,7 +80,7 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base, memset(&data->plca_cfg, 0xff, sizeof_field(struct plca_reply_data, plca_cfg)); - ret = ops->get_plca_cfg(dev->phydev, &data->plca_cfg); + ret = ops->get_plca_cfg(req_base->phydev, &data->plca_cfg); ethnl_ops_complete(dev); out: @@ -129,7 +129,7 @@ static int plca_get_cfg_fill_reply(struct sk_buff *skb, const struct nla_policy ethnl_plca_set_cfg_policy[] = { [ETHTOOL_A_PLCA_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), [ETHTOOL_A_PLCA_ENABLED] = NLA_POLICY_MAX(NLA_U8, 1), [ETHTOOL_A_PLCA_NODE_ID] = NLA_POLICY_MAX(NLA_U32, 255), [ETHTOOL_A_PLCA_NODE_CNT] = NLA_POLICY_RANGE(NLA_U32, 1, 255), @@ -141,7 +141,6 @@ const struct nla_policy ethnl_plca_set_cfg_policy[] = { static int ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info) { - struct net_device *dev = req_info->dev; const struct ethtool_phy_ops *ops; struct nlattr **tb = info->attrs; struct phy_plca_cfg plca_cfg; @@ -149,7 +148,7 @@ ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info) int ret; // check that the PHY device is available and connected - if (!dev->phydev) + if (!req_info->phydev) return -EOPNOTSUPP; ops = ethtool_phy_ops; @@ -168,7 +167,7 @@ ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info) if (!mod) return 0; - ret = ops->set_plca_cfg(dev->phydev, &plca_cfg, info->extack); + ret = ops->set_plca_cfg(req_info->phydev, &plca_cfg, info->extack); return ret < 0 ? ret : 1; } @@ -191,7 +190,7 @@ const struct ethnl_request_ops ethnl_plca_cfg_request_ops = { const struct nla_policy ethnl_plca_get_status_policy[] = { [ETHTOOL_A_PLCA_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), }; static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base, @@ -204,7 +203,7 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base, int ret; // check that the PHY device is available and connected - if (!dev->phydev) { + if (!req_base->phydev) { ret = -EOPNOTSUPP; goto out; } @@ -223,7 +222,7 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base, memset(&data->plca_st, 0xff, sizeof_field(struct plca_reply_data, plca_st)); - ret = ops->get_plca_status(dev->phydev, &data->plca_st); + ret = ops->get_plca_status(req_base->phydev, &data->plca_st); ethnl_ops_complete(dev); out: return ret;