From nobody Wed Dec 17 19:10:04 2025 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (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 9A097152E0E; Tue, 9 Jul 2024 06:31:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720506662; cv=none; b=B2L53NXfxFnRAK7X0IwwoKuMBU9eNagyQZHVWC1j/Xhujoj6clkZyVNn97c1mLy923hq9Q9zAevbDcDeMAADU4SMMc67GzH2g/TnLHe/4HcJnHOCbSKHqK9Ca2LbhGmpjgmWv4lSzoZLE6ngmbQLXRwCcXZp/cI/Vef85jIfdTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720506662; c=relaxed/simple; bh=/1uqVMxB1RIEuYuzoyDpQOEOqN2W99CwHenim9Kbsac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BwSIsSKmKeAX4jixITW1OBHokzfPiPmn/baIlGcFBLZxp2BJI2JSjj5NLTvzXdePXKp8e7AxEq50gqg2pDDQrOpFiiz8Rf8WJG1FlmdJ+LjQ/AvEmSaP1DmNL8vgm11qwdlPvGC4xu5aJllXfahbfGhqAhMvcnlaBrH0oBMU5PA= 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=OSH75dIx; arc=none smtp.client-ip=217.70.183.201 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="OSH75dIx" Received: by mail.gandi.net (Postfix) with ESMTPSA id E82CC1BF212; Tue, 9 Jul 2024 06:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1720506659; 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=Q7kTtC1MEnsmA5BGSxZi+iVYui9yT1TaBVRfot1kFxI=; b=OSH75dIxYfDq1OxKlnUsAwYyhGSlE5NymPE71iqGJiS9Oo7dJn62xwARRzpi4c2pKpoG2b s1/FRT9At5Rfg9eGCKAiSx6i389u5FTbpWTh4CPu8SnJZsJuHVLBVOjAqK89QkEIxwvi6k Lq0FigCuqywx9p8CQc1rmsKo7WaxHJOJp8wflpShslKOIcwv5jt6fWfSDy6QSzjkc9QWTG yiwqXC/83MUVDFWLjKdS+6SDCJryxhpCVf2R/CN431i7uGbqf1lm3Bwtd0YGyfWdy5gVwI +k6NxiyEVgI5hyYjKG6psjA64H3Y8gZqcwT0aoEHHzfxO2wriUtcCKh9fSjzmA== 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 , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Piergiorgio Beruto , Oleksij Rempel , =?UTF-8?q?Nicol=C3=B2=20Veronese?= , Simon Horman , mwojtas@chromium.org, Nathan Chancellor , Antoine Tenart , Marc Kleine-Budde , Dan Carpenter , Romain Gantois Subject: [PATCH net-next v17 10/14] net: ethtool: pse-pd: Target the command to the requested PHY Date: Tue, 9 Jul 2024 08:30:33 +0200 Message-ID: <20240709063039.2909536-11-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240709063039.2909536-1-maxime.chevallier@bootlin.com> References: <20240709063039.2909536-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 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: maxime.chevallier@bootlin.com Content-Type: text/plain; charset="utf-8" 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. As we don't get the PHY directly from the netdev's attached phydev, also adjust the error messages. Signed-off-by: Maxime Chevallier Reviewed-by: Christophe Leroy Tested-by: Christophe Leroy --- net/ethtool/pse-pd.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index ba46c9c8b12d..0f37ff5de7f0 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -28,17 +28,15 @@ struct pse_reply_data { /* PSE_GET */ =20 const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1] =3D= { - [ETHTOOL_A_PSE_HEADER] =3D NLA_POLICY_NESTED(ethnl_header_policy), + [ETHTOOL_A_PSE_HEADER] =3D NLA_POLICY_NESTED(ethnl_header_policy_phy), }; =20 -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 =3D dev->phydev; - if (!phydev) { - NL_SET_ERR_MSG(extack, "No PHY is attached"); + NL_SET_ERR_MSG(extack, "No PHY found"); return -EOPNOTSUPP; } =20 @@ -58,13 +56,20 @@ static int pse_prepare_data(const struct ethnl_req_info= *req_base, { struct pse_reply_data *data =3D PSE_REPDATA(reply_base); struct net_device *dev =3D reply_base->dev; + struct nlattr **tb =3D info->attrs; + struct phy_device *phydev; int ret; =20 ret =3D ethnl_ops_begin(dev); if (ret < 0) return ret; =20 - ret =3D pse_get_pse_attributes(dev, info->extack, data); + phydev =3D ethnl_req_get_phydev(req_base, tb[ETHTOOL_A_PSE_HEADER], + info->extack); + if (IS_ERR(phydev)) + return -ENODEV; + + ret =3D pse_get_pse_attributes(phydev, info->extack, data); =20 ethnl_ops_complete(dev); =20 @@ -206,7 +211,7 @@ static void pse_cleanup_data(struct ethnl_reply_data *r= eply_base) /* PSE_SET */ =20 const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] =3D { - [ETHTOOL_A_PSE_HEADER] =3D NLA_POLICY_NESTED(ethnl_header_policy), + [ETHTOOL_A_PSE_HEADER] =3D NLA_POLICY_NESTED(ethnl_header_policy_phy), [ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] =3D NLA_POLICY_RANGE(NLA_U32, ETHTOOL_PODL_PSE_ADMIN_STATE_DISABLED, ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED), @@ -219,12 +224,12 @@ const struct nla_policy ethnl_pse_set_policy[ETHTOOL_= A_PSE_MAX + 1] =3D { static int ethnl_set_pse_validate(struct ethnl_req_info *req_info, struct genl_info *= info) { - struct net_device *dev =3D req_info->dev; struct nlattr **tb =3D info->attrs; struct phy_device *phydev; =20 - phydev =3D dev->phydev; - if (!phydev) { + phydev =3D ethnl_req_get_phydev(req_info, tb[ETHTOOL_A_PSE_HEADER], + info->extack); + if (IS_ERR_OR_NULL(phydev)) { NL_SET_ERR_MSG(info->extack, "No PHY is attached"); return -EOPNOTSUPP; } @@ -255,12 +260,14 @@ ethnl_set_pse_validate(struct ethnl_req_info *req_inf= o, struct genl_info *info) static int ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) { - struct net_device *dev =3D req_info->dev; struct nlattr **tb =3D info->attrs; struct phy_device *phydev; int ret =3D 0; =20 - phydev =3D dev->phydev; + phydev =3D ethnl_req_get_phydev(req_info, tb[ETHTOOL_A_PSE_HEADER], + info->extack); + if (IS_ERR_OR_NULL(phydev)) + return -ENODEV; =20 if (tb[ETHTOOL_A_C33_PSE_AVAIL_PW_LIMIT]) { unsigned int pw_limit; --=20 2.45.1