From patchwork Thu Dec 21 18:00:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 182385 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp598728dyi; Thu, 21 Dec 2023 10:16:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IFKzi6G6hYWe12jT8szBN2ELapMzbfNFJJUroogCeDgcA3qhwvNiip+i011DjAcd3nC1MPR X-Received: by 2002:a05:6a00:2cf:b0:6d4:2e66:6eb0 with SMTP id b15-20020a056a0002cf00b006d42e666eb0mr86558pft.13.1703182595344; Thu, 21 Dec 2023 10:16:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703182595; cv=none; d=google.com; s=arc-20160816; b=MwBD6eMI0oVAI3E+JWmIzfxHHzKB5i3CJE1YwftnFsm0KZmJFq9kRgtaVIHuC+WXO0 /fv3zUL61zqgrt9n3lDrUOCxhUBIyzOLckVEKKCftNzDtejvPFLyOAN/EA25n5NQK1uM 3JrtEVUqwCo0O/Ljn0gadAt0iu77nkiidIzef4ysmTE98WGjG5x6WK7lffKFb+7TzFe1 f/46a/dHCOG8e4tseT/xMWBuLZn43mjzvTZbuM4qxvXLtX7/pLfivwjLe2Va3HdPIdLE 6Xg6uKnz9TJMYxzn6gR+ZtqCVVoWJ4a1wk4lWh+IvesOC9EWr/fDQt9gIp7EAfw3H8SW MMcg== ARC-Message-Signature: i=1; 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=mW9L0yXxHluFS6u9qGTLhsIKJ7Hnc+ZoX5GiJeMlEyY=; fh=d3Krop4IPE3x6nBOvh3GY5QHg6bS91zVnQiH59I3hyM=; b=W2Jtx/pAvtP1d0MM7ManHfHjTVG4tK0uN51ZIgJst9ZN5bqYG459iA6niiVcfg1LFj uDB0ic+yqkH+tM439KLg71vCf0+htotSYUFJz36vrD/I9xmw8F95vDvO3ebT30c2eDVM 3n/XQIBr3TJnqmpaBs1jrBTm/s1Ng6189pEOkSSEqJtJuv0HXwRSNVuaDVze3iVyKYlN 5wfv8tVT+phnEEIwEQ+1FVO+FpMyWTWlUAowAV8A7sE0nijdxncF7RJCvTRW4vsW5Zyy MUo1m9jtFgDsfBqAr1Qc0eKzvRHO+FZogrrvwommogM2xGtLAlkkxQmi/j2NkULsY3Lh smnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=BGkMYwDq; spf=pass (google.com: domain of linux-kernel+bounces-8894-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8894-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 m9-20020a62f209000000b006d96a9f028esi1884465pfh.385.2023.12.21.10.16.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 10:16:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8894-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=BGkMYwDq; spf=pass (google.com: domain of linux-kernel+bounces-8894-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8894-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 06DB428AD10 for ; Thu, 21 Dec 2023 18:04:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A219377F38; Thu, 21 Dec 2023 18:01:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="BGkMYwDq" X-Original-To: linux-kernel@vger.kernel.org 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 373D576DA7; Thu, 21 Dec 2023 18:01:05 +0000 (UTC) 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 8ECC61C0011; Thu, 21 Dec 2023 18:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1703181663; 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=mW9L0yXxHluFS6u9qGTLhsIKJ7Hnc+ZoX5GiJeMlEyY=; b=BGkMYwDqNWtAuHi3HCNW0EE5qJOpZj6AptqeXQ3WAwMQIrnxFWZgLKkazuA8A2g5MNFIeD VVZ1h/xkRlNFnq4frEs8Y/qFepRQfYuJfXUFvTtOAxLVtos0x49lqPqeM7j2Ixri2DKi/P +PtuREGj2zuDKOT6DXEe5OBkpS9m4rgnTev0tSFbcCPxkH4Su8GrLVDwkq/4A01ehFEgr8 FQYzPyy01Aj2ALczJXll2Pm1f/8aJptoAIi5k0V9FZOFD1fcsfXXMQOPgVzJ4GMyeWp4/f Nrx4/HCnRe0jj17cQYBEQXHEr9Szov+a6XQ/nNiAlbiWF/EVV0VGcqYRAw03oA== 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 v5 09/13] net: ethtool: plca: Target the command to the requested PHY Date: Thu, 21 Dec 2023 19:00:42 +0100 Message-ID: <20231221180047.1924733-10-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221180047.1924733-1-maxime.chevallier@bootlin.com> References: <20231221180047.1924733-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: 1785916393149882352 X-GMAIL-MSGID: 1785916393149882352 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 Reviewed-by: Andrew Lunn --- V5: Added Andrew's R-b V4: No changes V3: No changes V2: New patch net/ethtool/plca.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/ethtool/plca.c b/net/ethtool/plca.c index b1e2e3b5027f..2b3e419f4dc2 100644 --- a/net/ethtool/plca.c +++ b/net/ethtool/plca.c @@ -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: @@ -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; } @@ -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;