From patchwork Tue Feb 20 18:42:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 203759 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp597168dyc; Tue, 20 Feb 2024 10:46:08 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWZlhHGKdoc2jje5fq5u4+AXoyqRFm5Sseaa1yybyg6AKr72EQUfgdbSkVDtnYxaD9aw17Ensx3Ks0+kes9jpCMsin02g== X-Google-Smtp-Source: AGHT+IFlsHfp/JmPVsGMF6MZhmw/lD08DnuY/S3BPzrmL3dbbkXOC1sl6AGhoTQ1pi1KNI1sJkqw X-Received: by 2002:a05:6a00:2195:b0:6e4:869e:137a with SMTP id h21-20020a056a00219500b006e4869e137amr1450052pfi.16.1708454768565; Tue, 20 Feb 2024 10:46:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708454768; cv=pass; d=google.com; s=arc-20160816; b=ksD87Njqd6UotBQf4bQ9Iqeblf/bVVxqLAGnbsZfGvWLPaufeYD39nH3pP92BiHW2e NyYaAPugv2scbw6a2X1XUnWkr1aHsUMBMj+BRRnNTi1UKrMcXLg7ig2zE7n2Nc3UqzOr IZGr7i0t3x6TU7F+qKrHqVx+TTxXQ3Z5UEm+NTMTQTGbvKZGgi6Gt/0m5fjzgfWxuk1Q DZpwjFxGNtknlQnAoeYfDUNYjlwV4xVo1sjR4ZXiI1zgZ5hSvJiN0gY2QhGKo2St/5Xo rR9pBL94o/vK/8DRkSVXfhqRQAK8Ga+6KwJFGDSVqiTRcg8IkAIaW1ihtvCO1TsqnajR EDbQ== 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=K5JqTIQe/lrqDFidn9mrsMdhgS9z+FevPkgXZLLK3P4=; fh=1vUu/d1GTjraph6G+ET+Z0z13QVrf6oL/IrrK9zaTF8=; b=RmNodSKdK5d1iQRDga58jBT08uNBGMWG+NMy23IkgZGZifkHgU3OAIpkzwOc4v6f5D suE0zvbkq7DrXrX98qUYnlJSSoTWpPMHzNGd8Ww1d8KgzH+IBD8kwgPznQJSNy97LkBB 77o7ZKiiY6nE4PusqPoifYiGCpF5sYoFhWVxxiDb5f2/c6EL5h3Ucr7qQzcx+wRIbk+R wLrDW5Kow1oUgmBzM+0Boq+3aNnSQxPi98aqGxhNb2hejy4qztcFkET5cYD0oPV0axHS VMps1lzPnzuVom6ovLwfrrHBzFcLtiHET9k8NyIeWVg72/9NFMoHV4P1klDYh6dNNysl AcRA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=FBVFNEzU; 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-73536-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73536-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. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id fh27-20020a056a00391b00b006e02c3f028csi6573697pfb.239.2024.02.20.10.46.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 10:46:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73536-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=FBVFNEzU; 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-73536-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73536-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 649CE28247B for ; Tue, 20 Feb 2024 18:46:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DE939151CDF; Tue, 20 Feb 2024 18:42:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="FBVFNEzU" Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) (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 E389114F9D8; Tue, 20 Feb 2024 18:42:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708454561; cv=none; b=qJxQjxtnk4EgKseQ0mqi8Q9/hSQhOhO0MX62mhVQlW40OUoWp4nZKRv6USV1V5xE7DTpHcu3LNqsIUUeXYpNb8zHaVhYkBl0bn5W1XLD8vVXKjCRNY8KQO42o0hHDS720QmsCCzFvaptCpKwkyWr4CP5deNjLm4ZSRMfQHUEVCY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708454561; c=relaxed/simple; bh=61pBKsF6brlow+/h9afLVMYtaMu6qThcrd9O/gNBO+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cx2o//lqE3b1k6lWryriglnmOCL7rTbvzWiFm37/V/8dIdpFm+M/XJzloqrOin2poZw19zWUWoiZVH3XpjANZ4TGWfCxL6sYcCNg5jICHl5ioMcn5PsVWHZCTAyfrc065j0u8ePqHlpDDni9gwQ7UNA+wHOvcl3KcAmnLxHA9eM= 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=FBVFNEzU; arc=none smtp.client-ip=217.70.183.195 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 148996000A; Tue, 20 Feb 2024 18:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708454557; 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=K5JqTIQe/lrqDFidn9mrsMdhgS9z+FevPkgXZLLK3P4=; b=FBVFNEzUfGG9BXbDeHP9+chBqdykEXNWbsDv7oxP7MpSpEtVnozgMDiyouTukPWZyqJE6U CizzG+PMFfzpJRzQrD+wreHymMni5lZGJpBKHSYdIbUpcScPUcWP791rYQKnY3TtNSQIa/ 1BcwAdPxAO4JtgiKX0tQGVeDNH0UfPHa6gfwpCN6vJxmeUrtYmucA2OHPP/c7TNPIz/Iv2 xsczPYTCPWR0ntJNZ6+4vjV1u5h5DSp/e4RboHHDwo/sJWXL1Q1CPgtBT8cQ4GfpvZaLBN Szpn/V4uVb2yqwNsBeULK43e1vwXNzX/+Llb49TViKyE61XNUz1PNNbx89wtAw== 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 v8 11/13] net: ethtool: cable-test: Target the command to the requested PHY Date: Tue, 20 Feb 2024 19:42:14 +0100 Message-ID: <20240220184217.3689988-12-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220184217.3689988-1-maxime.chevallier@bootlin.com> References: <20240220184217.3689988-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: 1791444667364625899 X-GMAIL-MSGID: 1791444667364625899 Cable testing 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 --- 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/cabletest.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net/ethtool/cabletest.c b/net/ethtool/cabletest.c index 06a151165c31..536800bbc379 100644 --- a/net/ethtool/cabletest.c +++ b/net/ethtool/cabletest.c @@ -13,7 +13,7 @@ const struct nla_policy ethnl_cable_test_act_policy[] = { [ETHTOOL_A_CABLE_TEST_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), }; static int ethnl_cable_test_started(struct phy_device *phydev, u8 cmd) @@ -69,7 +69,7 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info) return ret; dev = req_info.dev; - if (!dev->phydev) { + if (!req_info.phydev) { ret = -EOPNOTSUPP; goto out_dev_put; } @@ -85,12 +85,12 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info) if (ret < 0) goto out_rtnl; - ret = ops->start_cable_test(dev->phydev, info->extack); + ret = ops->start_cable_test(req_info.phydev, info->extack); ethnl_ops_complete(dev); if (!ret) - ethnl_cable_test_started(dev->phydev, + ethnl_cable_test_started(req_info.phydev, ETHTOOL_MSG_CABLE_TEST_NTF); out_rtnl: @@ -220,7 +220,7 @@ static const struct nla_policy cable_test_tdr_act_cfg_policy[] = { const struct nla_policy ethnl_cable_test_tdr_act_policy[] = { [ETHTOOL_A_CABLE_TEST_TDR_HEADER] = - NLA_POLICY_NESTED(ethnl_header_policy), + NLA_POLICY_NESTED(ethnl_header_policy_phy), [ETHTOOL_A_CABLE_TEST_TDR_CFG] = { .type = NLA_NESTED }, }; @@ -321,7 +321,7 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info) return ret; dev = req_info.dev; - if (!dev->phydev) { + if (!req_info.phydev) { ret = -EOPNOTSUPP; goto out_dev_put; } @@ -342,12 +342,12 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info) if (ret < 0) goto out_rtnl; - ret = ops->start_cable_test_tdr(dev->phydev, info->extack, &cfg); + ret = ops->start_cable_test_tdr(req_info.phydev, info->extack, &cfg); ethnl_ops_complete(dev); if (!ret) - ethnl_cable_test_started(dev->phydev, + ethnl_cable_test_started(req_info.phydev, ETHTOOL_MSG_CABLE_TEST_TDR_NTF); out_rtnl: