From patchwork Tue Feb 13 15:04:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200496 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp618853dyb; Tue, 13 Feb 2024 07:37:36 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW5XqbGoDRyrTYISngVFczQgagBWWvDewjWqE3lG0GZLEJe++Ty7rx5q2O0CDDjkgthVsTRhWHTe4NDvUNWRKjjd83BTg== X-Google-Smtp-Source: AGHT+IHj7tU5xcV4qZcTFucl2b3awJnrfg6IPy+hkt5Aqf6Y7tNAyK48394hmVLMVamsvwOHbEuo X-Received: by 2002:a62:e518:0:b0:6e0:3cfd:501e with SMTP id n24-20020a62e518000000b006e03cfd501emr8433197pff.3.1707838656295; Tue, 13 Feb 2024 07:37:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707838656; cv=pass; d=google.com; s=arc-20160816; b=wv4RLaRcvne0b6nKM5KGUAYK9CyaWY4JZoS04M8oi7N/2AZ89wDVEaIB+JWVCpZBFW umShB8ZanQ7N80Zq+nl+W3wGiqVdOUB3y+8fHg5Aw69gsTaA4tnVraiZdFZdKy2HO3Xy 4NzZgOgsCCIwqn2ofQQOJ0BJoMWOYIetpU7WVO59yhmydtEppSGNs6j/wpa4lawTZkHV awD3skmR0nyUsOip5v9NLNGSHHmcKO0w6YmIIaZmu79uGvkA9mHuI8yu8l/7yCnb1XQl XOtT9/0vxISvUFhguldQ0olSoaspRYqqPsN/sNAAawiNB99R6syyeNFy12T+J+osMmA2 5Fag== 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=aWTuDer7pateN9r2X0Jl1ZpbA7JJOYc0nb5gl+3hDaA=; fh=eLstwzJTEJrAHaIFNeTEGkB0MtuzynUi7qawRV52Tzc=; b=H+JLwX9qcI21lQvJmOkrLJCWsRjX4+XbHSZMLUnm7y2biwoMLKvsDqxmUUabXf/axG yeUZ1gw+G6KD6xkQxlXrj8AqrDWnrb+jrOnPkoNHXrwZgHvqpFaf2hqbC6F3rfQPXbHE gsInPI/+3SLLkRBk+trgA0FC72x+29m1Q78VGmmLITq/rFk123YP1lH9TXDvt+8H/0O7 vjnxa5nUfOZrHJb3QBZMTzlTgt7K8SLHzWDLbW39fveBEsccnaH2Cu6DnGdz/zb2CSua Fr0sGPmiRFqQpzBZpEU9MmrDbIyx365wu8dqSf8S2rliTeftYfEVTzFOMTS78XGRASfJ y5VQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Sao55gVg; 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-63774-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63774-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCXcIpxNybrkXp/jBkHOASfCjXBxybZ/OghSMV6AjVsAumm/f7trOKA+zG2q51MrXaRHdZlUvLOHhhMJgkchU1WjzADKaw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id z23-20020a63ac57000000b005dc85635271si1264230pgn.605.2024.02.13.07.37.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:37:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63774-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Sao55gVg; 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-63774-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63774-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id DC1EBB2B005 for ; Tue, 13 Feb 2024 15:10:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4B29E60DE6; Tue, 13 Feb 2024 15:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="Sao55gVg" 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 EB89E60864; Tue, 13 Feb 2024 15:04:49 +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=1707836692; cv=none; b=QXhQJ2+OETdFFnsjcRZu+Qcg7/FT4Z8lq/WOmtVo7HHYjcN/vHEWn12yOYuGXGmw1+Tf4f9e9kmTIzSNjN56T01tSncA6rzS64DtKQNbmm2HuTONu73QyaGd6LzoXUzTS5uf1uZHgyGLvNnJkX9jTaNaGbbLLIdnYv+qY4QNqQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836692; c=relaxed/simple; bh=eikMrHfEtel/upPwWFp+EA1Ekjg5tsXxytsOi21E0R8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UgPapb7Jbm9XlfYpZ8qS2OOh+iWMmDN+mFSCjxDx36r9FAQAWIGdhwe9JUBCWgMJvbRINnc+Iqnov0i++84RqzDp9T7qfwfTCgB8g0kKN0td2m7A9ygtzXsVtA3xWPuCZy1OUetXhma7M4yzUrLB/riIxeF7DKDYRRE/kK1YeJU= 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=Sao55gVg; 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 5DF711BF204; Tue, 13 Feb 2024 15:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836688; 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=aWTuDer7pateN9r2X0Jl1ZpbA7JJOYc0nb5gl+3hDaA=; b=Sao55gVgc6fpoE4a5Djs3dBVgpi5WG05G1oMrPiw3/r9LhnWmtD4wuNi/ZMCZoGffZJLKY 92seeH3n2bRzJXEr0tPkUytbS46cIfN3PM1C0yt8cycDee7ul2bQoWNkYDBiGWjlFgRlAm ibx7l+0ANMGBqiHsc5XvaE6ArerPJgYBlo0vtVLXqTWRFOEfU2tVXo/GdNbyPnqtGMrOAF lBtdU52y+FZPc2LrxMi+KF67PDWRaJAro5tqr2JFf3uvczRgRFCditvWjgnGU1S7+zvtbF 8cPBX54nrLswGzmFGyEfom9wjQBmznqJFy1Dk5xmTo5QuR1p/wjI5OQnGXWlDw== 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 v7 09/13] net: ethtool: plca: Target the command to the requested PHY Date: Tue, 13 Feb 2024 16:04:26 +0100 Message-ID: <20240213150431.1796171-10-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213150431.1796171-1-maxime.chevallier@bootlin.com> References: <20240213150431.1796171-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: 1790798627031478476 X-GMAIL-MSGID: 1790798627031478476 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 --- 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;