From patchwork Wed Feb 28 11:47:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 207794 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3291938dyb; Wed, 28 Feb 2024 03:51:41 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVqZb51bn95lJ/mcqmzE3NdZgijW2VcIU6nuy6/k/J4daGvvV/zklKkn66ahJI28janC8fCaDEmmDeqD/guVrbZWufh5w== X-Google-Smtp-Source: AGHT+IG/DSxi/IvbEhOSQw/8enopug/yeUQh9zz9ljTkUTEUveNqFjG6MqgAGMZXMnSnV6aLWkI+ X-Received: by 2002:a05:620a:36c4:b0:787:b136:7510 with SMTP id cz4-20020a05620a36c400b00787b1367510mr4499666qkb.20.1709121101332; Wed, 28 Feb 2024 03:51:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709121101; cv=pass; d=google.com; s=arc-20160816; b=JzL9n7LD6V1dL70Au/GD7S63s39kXNg4bCUDUwjVzQSrpAxFnBYM69rJxbLKOSYsum h2UhqYUHT9NSgxqLqqH8/lN0wwO3qkpmCkwGNI7NrSW60G/gIOrzp5cenaTPwaF1HzHs BPVkLyPggdgaS07re9KLowdkOU84uHb08+m2zMxfrp4gwIvzQUo9gmUHN/3b2kvOUpa4 GrSruXHxwMGRdRSLeKc6v04JLp7unvGC6hC0NlNME8DrCLZpzWxt9LMdE9GSMTzhtHXU 1ZtalCZhcNg0leKj+4i/DlqbRufooljXdalknpJgxHBDLG6XnfRcS4UddYtpnrbfRnwF bUGw== 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=R4TiJHGD8Cc5U8EsNi4qSVk90ZkiBa9dYr3Fk3kCGqU=; fh=1vUu/d1GTjraph6G+ET+Z0z13QVrf6oL/IrrK9zaTF8=; b=FpJqAYP2Rc7daBFf+pQSKn31GJBVzx4z1oEH3ifo9Vxqvep30jZZYuhYM4hexJyJ1I GtvHxrhpfYrB+/6gpz3bcOAX2JKwUDzxVUrtpVrGjFFpmclgKvv/I7+nG7WsiszwYDjm SrR4dxTRcNHfZVPjwufI4q5yoWfAD2wxZNVsTrzNxwrNvEAtPZFNyuqhVDzE6LQ4l2gY 7yHyGkXC55mExMIMXG5wxlXZynn3ecVklL2x+VMQFbO+aTHUUAyjRdGYxtDV/RLOyxmM htH6mN2sW3WvGDwQB2QN31huO7+nupORePlMwvv2qOvv0I/gkxqe+e4SuaMZaP2nAYM+ 4ueg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=gO2yuqaY; 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-84951-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84951-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id m30-20020a05620a215e00b00787dd060bffsi4785058qkm.519.2024.02.28.03.51.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 03:51:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84951-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=gO2yuqaY; 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-84951-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84951-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 106561C22499 for ; Wed, 28 Feb 2024 11:51:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AF34C14A4DD; Wed, 28 Feb 2024 11:47:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="gO2yuqaY" Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) (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 0641170CB2; Wed, 28 Feb 2024 11:47:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709120870; cv=none; b=ZeSxXoN4nYZIUINNETMjUKlh23bJJ7fWzCWFlAWDoIXsuaK8wWyx2KRLrU18HuI82sX6+XBhyDbxJRheC3oKSG5P3pjb5jjSNFt/qw7viTa/0ja6hBG961YktaFi0FQGDcXM0LiDKS6WgEZdo6rhH9BDppwssDrETiz0fsuedWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709120870; c=relaxed/simple; bh=gr1VvnGraRLfLg8fqza/Klcqx5TMSWZXKoiokuc1O7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BNcXx4cXzFXktpWs0K7JIYXmUho5XuehXFKFPOuYa0iqaqrsy8km79VvSrgCSoD3gLz2DDVqUYbbZrME5RwBuX6RxzY41UOR8WBmseTLPaLv9Mrlxf7BvT+hes9egOnUk+hWk6WrlVcckdZLLAHuUvbVpG6zpnIfVG3uSLHFHf0= 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=gO2yuqaY; arc=none smtp.client-ip=217.70.183.197 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 6046D1C0010; Wed, 28 Feb 2024 11:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1709120866; 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=R4TiJHGD8Cc5U8EsNi4qSVk90ZkiBa9dYr3Fk3kCGqU=; b=gO2yuqaYHhsKECJ5EmGebx3UugOq/Diue9bM47QDs7D5bLsPPrNngAImeyF910LfHgRSsn fm6cKlLIRvlSm8IlDQR0qAod7eZA7+ZV/UL6pJRdOWbXe1bw+WA6g3zx+loFrl4BTcic1N w/Tk0MVhhhAMgyDE3aU6OMz6LMe/mH2UsthRYzZgkYo25kVk3q0veYuIgNK58/mYlufJ7K e3oLKHARRMhLxiowEg28cy9PpOMPaChRlRBYdG2rhlAGpXAh2m2sWq2qTklpxPwUoyCONs TFt0rEySYL9IVIVt7pZbRWT9l2ZgSfwBdd0hNu0ygSBx8OIH5hDMEmWP8ouALQ== 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 v9 09/13] net: ethtool: plca: Target the command to the requested PHY Date: Wed, 28 Feb 2024 12:47:23 +0100 Message-ID: <20240228114728.51861-10-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240228114728.51861-1-maxime.chevallier@bootlin.com> References: <20240228114728.51861-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: 1792143368414102841 X-GMAIL-MSGID: 1792143368414102841 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 --- 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;