From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47A2EC4706C for ; Thu, 21 Dec 2023 19:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ND35Kl4owXdFNyOtifDopJrsTMMg9AwKMKtctaSjWdc=; b=LAQ/GCnitRqaQx AYKeC6tSfPAGT3NvN1eq+ubXDhzZGLQH997Z6jULcCMTx+2ldeOeLnrhAb0f19U4S3v/z0bZh/nyA IMoZuKOY1/98vL3FPEcz3s/UvRUambbCfxeRn9QZRVImpAbMMvoO/HisO8bDUw8clB09DbPzUJo8E Z/yBGHAof9fOLudQwe+T3yWlzJOtbXBJTDzFbOLdvyYQngQaUSPRgefldUmPsRMB1Q4L5XXK8mFA4 7CsvTmyVPL1G+VtVNS/mBbd5Cv9i/3fm6yBhuMQwsKp8F1jVqz9RsWt+M9hQkZAxGTV7by+wG3Iha ZER3SYcgRDxcZQ4bvYXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rGOXZ-003tiy-0L; Thu, 21 Dec 2023 19:17:05 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rGNND-003k8X-25 for linux-arm-kernel@bombadil.infradead.org; Thu, 21 Dec 2023 18:02:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=RkeAnsXmMy6aYQwaTCxZem0lTvH7EaUMRYZjn8TT7Ok=; b=mpR9Td61Hv7eL5mkXUb61r6Azx k+T/t4ud8bRGd7ggIyqAsNpdPwcCE8Vgb/23SgkJmgSZK8e85IqzOJhx5J1CYC0fdcBLv4FdWuzIj sJwT+UWw8Y5zOGx2sf9Bn3z4UoHrKyvtOuHJJ71gmOKjPOQyxqFPvTXY88yZZFpUOgln4OGDR1Ed0 v3uO0Eeq8Ml5iRLmlc6vQzjs5WDlv0/hcFkYcHIFmSITU4r5F7nN1WMUM9f4bU12DrWDgOCYqszoV b5LFf/AYhVC4vFH7UsbnxJEExFOi1UWAYFwYpqSKpQJKrD5r8a5DCuLA6FMwME3mfe2xPlmmfguSU gHvtD76A==; Received: from relay5-d.mail.gandi.net ([2001:4b98:dc4:8::225]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rGNMn-00Es1G-0t for linux-arm-kernel@lists.infradead.org; Thu, 21 Dec 2023 18:01:56 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id C0F461C0013; Thu, 21 Dec 2023 18:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1703181664; 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=RkeAnsXmMy6aYQwaTCxZem0lTvH7EaUMRYZjn8TT7Ok=; b=he59HTwzZHxC073jD/+o2VHPxP7KoBUx2QIkTK9+hbAcFdwhtfZLSceVQOP0b4U7UaqBVp 3y3nf/+ZCk/9MNtZo0rkr2h+b+SyuxZAHkmhoagPLDXbb4nbz8YwTEg0aEmWhYymIcfsWY gZ6Bg8nmhB98RSH1nZoQ7swLOsNGRmGpfx3II86qdC/J6uzQsRqGeD31+WHBTjWWwsLpgC 4CJKFAZr42br3YaV/GwJpHcDxC1ujVUxFW9JywavsAWKw3dqTXT00ku3TrtYUn+rrpUCCv 274kBIu2CaMdcc5BhHxKf4pk2cC2khDrC1aZF0XoEIBOBAEYfEYTEKWqSn3jFg== 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=20Maincent?= , Jesse Brandeburg , Jonathan Corbet , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Piergiorgio Beruto , Oleksij Rempel , =?UTF-8?q?Nicol=C3=B2=20Veronese?= , Simon Horman Subject: [PATCH net-next v5 10/13] net: ethtool: pse-pd: Target the command to the requested PHY Date: Thu, 21 Dec 2023 19:00:43 +0100 Message-ID: <20231221180047.1924733-11-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> MIME-Version: 1.0 X-GND-Sasl: maxime.chevallier@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231221_180153_574885_E081ADCD X-CRM114-Status: GOOD ( 12.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- V5: Added-back an incorrectly removed check V4: No changes V3: No changes V2: New patch net/ethtool/pse-pd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index cc478af77111..4a1c8d37bd3d 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -31,12 +31,10 @@ const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1] = { [ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), }; -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); @@ -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; -- 2.43.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel