From patchwork Tue Feb 20 18:42:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 203758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp597054dyc; Tue, 20 Feb 2024 10:45:53 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVHul6YaDlowkJucEZSFpi2faePGkWzm8hw1c8NJ8N8X8ylfme/WsPwiPr4hC+oflKAmOZQgLKOrcXrQIIY5PNUOcc3/A== X-Google-Smtp-Source: AGHT+IHMepXU8Har9GRpoJRKUtQW0yhfcTzaowKbhltmqn5w/ZINaJGXNJVZkTJI6Vt95BXMH8mB X-Received: by 2002:a05:6402:31f5:b0:564:ed2d:c991 with SMTP id dy21-20020a05640231f500b00564ed2dc991mr198454edb.29.1708454753594; Tue, 20 Feb 2024 10:45:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708454753; cv=pass; d=google.com; s=arc-20160816; b=GmEHelcvXrLdqhVcFbb9DiXqZqJvDDylckXHXeo0dl1JSN8+sX69RkhHQ+3iBdU+cA 3QQI+erPFvMxBxUYBWL8C4NP+s3Bb0eAFM9/9KlxbDOtLyZy7lxSDwMjyud9XQBVYAH6 tA6qE1TJ1w5N2H+drEX5ifmj5FzVDXitD2zvORXflBK+WaUJ7qZWCT9DewMR4sNBLGcZ 7pk4yobH/yCBHS8h/xR5usc7FV2Sx3zyL80moJ/XzUP84cRs+MejCDFPJSzN6Q1/xn3a m6AxOU2cYejYg92P9uRIRNwMEairogPW2mqh9c0g/aOueeYLc47WdAFaF+Nha2K/8WK2 AIOw== 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=X0PXq8unJc8F/vGHpW2pWHciy6s4pwfuZp74yf4ooHg=; fh=1vUu/d1GTjraph6G+ET+Z0z13QVrf6oL/IrrK9zaTF8=; b=u9IN5Rfgvif5oJHuQoJKnoKzETsmFvCETQeIgiNwOC+P3gHZ7lIhxf4deflYt6kf/x ZFBopbZBzdGutVDxSlrLOUdeCPcUrjtyFrt9Yzo4qJJ2bKzMUpfQPIMqAZMC3YxYNZWo shIDJGb7Y0XDbcQa8CYAOxG0JFgi+ch2ESRYiyB5J46zxwpKeckkWs4wLCkt5GuRRARL lLCDd0nJR+NdkfHdI47CrlmLJKKh+TF3JmdXUYbtMTurTgNTnoow7RXfSCi0vj8J2eI/ S187n+AxHO8NW5A8uv1wCrrIVO07j/XbV2Gkm6nrbQmTrkXGczYM6QT555KBKEuSJLM7 uLgA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=pcHbp29B; 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-73535-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73535-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id g15-20020a0564021ecf00b00564409f2e72si2953012edg.673.2024.02.20.10.45.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 10:45:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73535-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=pcHbp29B; 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-73535-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73535-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 373661F2399F for ; Tue, 20 Feb 2024 18:45:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A8192151CF1; Tue, 20 Feb 2024 18:42:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="pcHbp29B" Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) (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 ADE5E14E2E5; Tue, 20 Feb 2024 18:42:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708454559; cv=none; b=Crsn20WcIgEbdHebQOsZupSO623ftLgLYxVeqSQYAno1TWG0Yj1fYrKga7iJ4KBSzeLDUcq0dhwjsMXlHzurytmceBxwRoE7CHiHwRi6YUt329SDKpcaoq7Issa1e39KLK6nppaUT9CZfcrLFganD5QYRLMm6u/6HtkQc9p0HiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708454559; c=relaxed/simple; bh=iXLOBlBdOuhX+Mg6lkUBzr+ib9TmIw6L1K4H/vXnNIg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m9NxfdwWkNDUHTQWEEcvBMRKdJxzkTJ5HbmjvIQ6sMejbE9LQZfSJoydi3JrYiHN9ZVmISwEMFYAcu3g5k3CbgF4phP0RnM1ItIlVlKmy5gl/BY7hmxXZmVmfeBuoznqBhxb227RhQgvDvpFPdexpNo0AmNEs77i8mkZmG+deM0= 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=pcHbp29B; arc=none smtp.client-ip=217.70.183.195 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 AADFB60009; Tue, 20 Feb 2024 18:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708454555; 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=X0PXq8unJc8F/vGHpW2pWHciy6s4pwfuZp74yf4ooHg=; b=pcHbp29BDMHmJLCf08aenyo9oHW6KBym9ZG67qWulnVsBxM6vTxyRb7EIeZSRrRMa8Stul +jRwvlJ7jItYCVWTZKN2e4xGcdftGc8CITWrVojbNYUXirza0fW8ZGuNIKb1D5oZtBJMmJ 2n5LgKj/wqBHNX/q/vtgWRYWdOlVSgpqhbrKRjCn2/kLyQEOThYhVaPxuPx7pV5kDJ9fB3 q5hC1ia4LpSJPrpVlFckhCdZ5gQyec2Iv3XYYhDb+KvzSICMriCftDasQvGubhz5ucoCgi b+X6U5FVBvRPe3+qcV1ieVBGswYv7hGEzwA7MCsaj5wEfZYfoODG3prYnhQM9Q== 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 v8 10/13] net: ethtool: pse-pd: Target the command to the requested PHY Date: Tue, 20 Feb 2024 19:42:13 +0100 Message-ID: <20240220184217.3689988-11-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220184217.3689988-1-maxime.chevallier@bootlin.com> References: <20240220184217.3689988-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: 1791444651744382301 X-GMAIL-MSGID: 1791444651744382301 PSE and PD configuration is a PHY-specific command. Instead of targeting the command towards dev->phydev, use the request to pick the targeted PHY device. Signed-off-by: Maxime Chevallier --- V8: No changes V7: No changes V6: Use dedicated policy V5: Added-back an incorrectly removed check V4: No changes V3: No changes V2: New patch net/ethtool/pse-pd.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index cc478af77111..be50d79122c4 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -28,15 +28,13 @@ struct pse_reply_data { /* PSE_GET */ const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1] = { - [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), + [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_phy), }; -static int pse_get_pse_attributes(struct net_device *dev, +static int pse_get_pse_attributes(struct phy_device *phydev, struct netlink_ext_ack *extack, struct pse_reply_data *data) { - struct phy_device *phydev = dev->phydev; - if (!phydev) { NL_SET_ERR_MSG(extack, "No PHY is attached"); return -EOPNOTSUPP; @@ -64,7 +62,7 @@ static int pse_prepare_data(const struct ethnl_req_info *req_base, if (ret < 0) return ret; - ret = pse_get_pse_attributes(dev, info->extack, data); + ret = pse_get_pse_attributes(req_base->phydev, info->extack, data); ethnl_ops_complete(dev); @@ -109,7 +107,7 @@ static int pse_fill_reply(struct sk_buff *skb, /* PSE_SET */ const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = { - [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), + [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy_phy), [ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] = NLA_POLICY_RANGE(NLA_U32, ETHTOOL_PODL_PSE_ADMIN_STATE_DISABLED, ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED), @@ -124,7 +122,6 @@ ethnl_set_pse_validate(struct ethnl_req_info *req_info, struct genl_info *info) static int ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) { - struct net_device *dev = req_info->dev; struct pse_control_config config = {}; struct nlattr **tb = info->attrs; struct phy_device *phydev; @@ -132,7 +129,7 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) /* this values are already validated by the ethnl_pse_set_policy */ config.admin_cotrol = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]); - phydev = dev->phydev; + phydev = req_info->phydev; if (!phydev) { NL_SET_ERR_MSG(info->extack, "No PHY is attached"); return -EOPNOTSUPP;