From patchwork Fri Dec 15 17:12:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 179454 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9442759dys; Fri, 15 Dec 2023 09:24:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IERSmNUfsV28tjtazwTPLHJ1lzYqdgva4aSOi4TIJKfuC5Qsnl15Nrib3/9fyp3fKDsTc6H X-Received: by 2002:a05:622a:54c:b0:423:731e:e404 with SMTP id m12-20020a05622a054c00b00423731ee404mr12253507qtx.39.1702661081853; Fri, 15 Dec 2023 09:24:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702661081; cv=none; d=google.com; s=arc-20160816; b=h14gLc7s4db5di4VCxojSUwoyvFHxP6lRe2jm3TlzMqqlL1i/uv/JESrRJtZZFzxwa wE8QV+qmULXGKVmFhjSqT+j5ptsGeNrYVqeUc+rl3tvl6ZRpi5zmLddJVrdaXCgXOjmC eG7A19En67K1ZRJTSA7xbz92LLfJcLTY2YG3TGMa+m/DMdG3R+xsKCwGcCLyhQ4jfKzd +ujwehpvMzeA5NZerhAIwp7NfXp5JNEkuhHXt77bY+spYZ9kg8w5/CG5mJpFGOK4yWNq dUk96NEA8uWNxD/snMb/0CGz1IsXKzGjY67NlbGI1j1q/fxjXvrLvrqNTchH1J/G62y3 cZZA== 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=dG0Y2ARGhPiouNSvubPZad0vEdvBPsBhCymsETCU5LY=; fh=01/i7K9ues3Vkkz8uyECvnCPITXmGs/30yOh5FbyFgY=; b=0t9vB3dQTdbEIKRsyB46vFH54VVqoM6Y2JNNcYsbs8Tuj272yh7x7LMfJam5eqb/o1 bYaXQSEWED1H3Fe661XDW9ddSfxC4hejOOBN7XS2JPwcmFPXaoGdq5UAtoTU7OG6yGTO jIDa7KgE5TPFXTBZRqXEFVW66scq/oKmd2nDYjk6rI37c+KkCeO38ifjGrl+IuMMeLVr hBTRUEFCLUgtzNAR+aNcm45rXW7SmdI8gba4ZnQ3R4JGVoq9FGlX4Wj01wHCQLyq6B+a snUYvJfwcVV3NxF2z0fEqFVDJ/tpwfKlMm3gMAh6KflkjC/5Vs0kCtAJI0TY902kBCMl 42hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=HrP6+3Op; spf=pass (google.com: domain of linux-kernel+bounces-1401-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1401-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. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id bx15-20020a05622a090f00b004239888a5f0si8961539qtb.795.2023.12.15.09.24.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 09:24:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-1401-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=HrP6+3Op; spf=pass (google.com: domain of linux-kernel+bounces-1401-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1401-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 EA49A1C218CE for ; Fri, 15 Dec 2023 17:24:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C90FB79470; Fri, 15 Dec 2023 17:12:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="HrP6+3Op" X-Original-To: linux-kernel@vger.kernel.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) (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 E6A4247F6F; Fri, 15 Dec 2023 17:12:54 +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 2255BC0002; Fri, 15 Dec 2023 17:12:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1702660373; 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=dG0Y2ARGhPiouNSvubPZad0vEdvBPsBhCymsETCU5LY=; b=HrP6+3OpWU4Si9ady5HqhJM0uQSeX3+VQWQZOIjWFb8WdO5f3t3GSd3/BjAWQsUMMo/9ww XBFIpeJqgutfZTWQj4kvZJE1LoUxRWBIQl7puH4HRjgdNns6msTRA9hoBijs/uPztlshoz 8sCI46RfI8Nrn4zXBEbqfwLzdeYag5HkYObhcLfI7BprVR/wlA2HCMkBo4WUfzysruQgyu wyqdIdO2G3/sf3uQM8UrlVAIaMrBXUXm1tfR/LxbmJir0DXbyc3iYxgkvU1mMvRQrzmzZE JVEZH70P0S5ZwIZvA3bKDabCJPIbEkTEIrPeZtXJbWGKlQ45F7or8J9+j6Yylg== 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?= Subject: [PATCH net-next v4 09/13] net: ethtool: plca: Target the command to the requested PHY Date: Fri, 15 Dec 2023 18:12:31 +0100 Message-ID: <20231215171237.1152563-10-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231215171237.1152563-1-maxime.chevallier@bootlin.com> References: <20231215171237.1152563-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: 1785369546801829285 X-GMAIL-MSGID: 1785369546801829285 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 --- 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;