From patchwork Fri Jan 26 18:38:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 192751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2395:b0:106:343:edcb with SMTP id gw21csp75899dyb; Fri, 26 Jan 2024 10:44:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IFsxPZFZ9NOksUi3FpfCXMY8x/IcF4NxZwjDFKF4QMyLin8qsZsrhcjzDdkjxmmZSp7XGUh X-Received: by 2002:a05:6a20:c113:b0:19c:58fa:5a71 with SMTP id bh19-20020a056a20c11300b0019c58fa5a71mr140220pzb.54.1706294658113; Fri, 26 Jan 2024 10:44:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706294658; cv=pass; d=google.com; s=arc-20160816; b=tM+b4txmepWexS3e2NVeNAHD4x7mgYWYRRndRqXm/R0x4S4ZeQgQTsvyXIS7XOLwPo mqcetuxcvGsEt6GTThfy50Q8dq1KZpJm2pRFBHadwy8Yuy4TLSeZu7CU0DB2lPvntULM Co6B0HMNnQDX4Vs2/lv6A6D7/p5/kmVyql4aYrSdxDUp2/r+rFTjV9xzmOW3uRcEch+2 JZShXb8e/jwjQ8N9lzDV6JqUcYNH7AacCOxDrkcVgP3gVdsINySTVFiYimt+iAdoYqMD zQFzbHtcyxJt6iQS9u7FCYmQvLvOo/akwla6CStvJ5WKJQ4p3rsWmN8dZdGg1Wpm2mLJ eZyA== 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=x0q3k1Z78/CapjouX/PD0HtXmKh09Cw84tTUOf/IE+I=; fh=d3Krop4IPE3x6nBOvh3GY5QHg6bS91zVnQiH59I3hyM=; b=JSvlzuvJ3L1YjdMoVqiBD8fLXPPbhj3hpFNd/Bn/cof8RonH5xs5ApZXaF98l0R1SP qfi2wPd2/fpBKzR4OSxl6Wh5PEshGrtLRVoimUcGMmtSZ0UiGybAg/x4K4g0yNPws957 d8sIq83UAuK3uVJtRBiovIdygJNNLRAZ4VTkvOR99z8+sLy1aaTfZ+rw/XpHixEZwQcc RutigyOCY3s0hMwboh/i6FQYrbkQnwU5RlDgAhOT0P0Gdddd/OrUSUELrWfD/HA7oeBR Lsvy40kdEpaEH2XhM7oEW6utQiHmcAO4FHD5xFj61urbK7ebB74OqCG9rBzlB9hukean RHew== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=iOqDfUDi; 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-40510-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40510-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 lm18-20020a056a003c9200b006dde67a0246si1400260pfb.271.2024.01.26.10.44.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 10:44:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-40510-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=iOqDfUDi; 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-40510-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40510-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 005182847AC for ; Fri, 26 Jan 2024 18:42:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BF0675025B; 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="iOqDfUDi" 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 BF8AB224DD; Fri, 26 Jan 2024 18:39:07 +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=1706294350; cv=none; b=XTFfXA5rRpMnRqbA4GRWjIwbfD0EZlpY5BHQ0m144Dqq8qAmqtyu85RzoqcWa61eW2KaEs62sU6kxONAmyBFRmdqOnG9A9p2kA4HkJlHloFqQsuIJgRori+wK0IViY7Om3lrg3bz+6K1ePl0kR1qwjt6+PNO4Rczorx8xahFz8w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706294350; c=relaxed/simple; bh=4AMSxAQ7LwagjZ+DCgRvpx2/Yb8bl/G729kNvPySM6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E2La5dN5p8PA9hhlrAOkHrzR/3ILs8IBz4QaqlArETLtRQk6b4E6g0Kr9S1CiUIWnjhiy7NhCuLe+DBynGQyQrxUsmlHcX3Xz5PWCMS5UqYDSBMAA20br6QFBonjyr6MaEVDW4agIts/Ad+gQmzDLZgDoBZSALvtDl9X5rxijzc= 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=iOqDfUDi; 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 E4677FF80B; Fri, 26 Jan 2024 18:39:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1706294346; 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=x0q3k1Z78/CapjouX/PD0HtXmKh09Cw84tTUOf/IE+I=; b=iOqDfUDiubAxYT8ULxKdmPuP+UBB7bX5CZfs4NhvUkzAhaPwkUWKEab3E1InV6eYzm9M+Z E1O8vEK8HEa9L1BSYsDYlmG3I0w3+plDh8byLXgMgFEhvuhu+mI0I5mN5eACL6P/RADWoe ibm1DE3aPl5Wc/EydhjKLMRo/niSstVEvOu8HUd/mSAhwvkDqWQvWjD+kVRdY2LYYvlbi9 s4jFOFTNHVrDhtCKVCjB+tzKhS7603KpmOdh8r2KFazs8rPcjODPtjVgjzbKwOV4UJGfr+ h19rNWWrmVyyirLxF2gCw/GfJQ3Sdyl/FI+sVdx3DYPm5S/MhDVosuy5rYMRww== 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 09/13] net: ethtool: plca: Target the command to the requested PHY Date: Fri, 26 Jan 2024 19:38:46 +0100 Message-ID: <20240126183851.2081418-10-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: 1789179627580767852 X-GMAIL-MSGID: 1789179627580767852 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 --- 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;