From nobody Thu Oct 2 21:05:21 2025 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 668362D9EDE; Tue, 17 Jun 2025 12:12:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750162345; cv=none; b=f/HY8FIJGBnbRyGp43/HaNDtzSUD0tCEzKDa63be5WVDVYafQ2fsJLLvIv7lLs1Rl6swDh1Z7P4p+kMhGsHm/I/mNRUweDr8hm6fmbm2vbAGx2Njn03prgRiMows023V7TccRSnV337hdVvRKzsDeAyc3zpJMhjorjS773PSFzI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750162345; c=relaxed/simple; bh=8XQgxZRRgAv1vySiwtNF9MgeGrZE+0khng9IbTQu13Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ap2oWfrFel76cVQpGPE65Kx+X8q1vjIk2etRpzvF0YX7O8Si13uRbqSnkQjYazlh8AvJDo8vrWiNu74mbDz6XrhxrG3qLNyFZflkq/XmCfawSDsC6vYLDXQDzIVVY/CzLPF/xzcA2o8JjbG5MSbEFJFlcWL9qOGlq7YqU4wxX04= 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=oYyRuE8t; arc=none smtp.client-ip=217.70.183.197 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="oYyRuE8t" Received: by mail.gandi.net (Postfix) with ESMTPSA id A244C41D02; Tue, 17 Jun 2025 12:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1750162341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wZVINZuq2qQlwu61QZm+dyZ8k7wTCX1L1HRQj6KctJc=; b=oYyRuE8ty24AyMF3KmgIGXP8vnmYEj8QVvWw9ptMNOhl1oxiV0ZZWIVgw+T0CmX/zfyBoU ezoIgoIyEUJfsXRuzO13Hh/ooAyJXPHHazXqGJ21XfBEB45icrP8bhuqz07z089igIah6H Q2VPc6Gj3s9dZ09DpjONY2d3hffrHJBBfKnYm27c/h6k0OAZ/kx3MM3D1GwKGUtjRp5A/Y QBRH71p3qqEKvGa4YmaisuXFwamsi1uhMp17k27vjrQlA0/LxiuhDq9l2RD+ASrwKj18Qk T/B8ED3aBMF87KnVY3SjNQrkqtzzr7Jl3x1xvkQcmxsPcDIJwYueDsk11F2pVA== From: Kory Maincent Date: Tue, 17 Jun 2025 14:12:05 +0200 Subject: [PATCH net-next v14 06/13] net: pse-pd: Add helper to report hardware enable status of the PI Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250617-feature_poe_port_prio-v14-6-78a1a645e2ee@bootlin.com> References: <20250617-feature_poe_port_prio-v14-0-78a1a645e2ee@bootlin.com> In-Reply-To: <20250617-feature_poe_port_prio-v14-0-78a1a645e2ee@bootlin.com> To: Andrew Lunn , Oleksij Rempel , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jonathan Corbet , Donald Hunter , Rob Herring , Andrew Lunn , Simon Horman , Heiner Kallweit , Russell King , Krzysztof Kozlowski , Conor Dooley Cc: Liam Girdwood , Mark Brown , Thomas Petazzoni , netdev@vger.kernel.org, linux-doc@vger.kernel.org, Kyle Swenson , Dent Project , kernel@pengutronix.de, Maxime Chevallier , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, "Kory Maincent (Dent Project)" X-Mailer: b4 0.15-dev-8cb71 X-GND-State: clean X-GND-Score: -100 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgdduhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpefmohhrhicuofgrihhntggvnhhtuceokhhorhihrdhmrghinhgtvghnthessghoohhtlhhinhdrtghomheqnecuggftrfgrthhtvghrnhepvefgvdfgkeetgfefgfegkedugffghfdtffeftdeuteehjedtvdelvddvleehtdevnecukfhppeeltddrkeelrdduieefrdduvdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepledtrdekledrudeifedruddvjedphhgvlhhopegluddvjedrtddruddrudgnpdhmrghilhhfrhhomhepkhhorhihrdhmrghinhgtvghnthessghoohhtlhhinhdrtghomhdpnhgspghrtghpthhtohepvdejpdhrtghpthhtohepuggrvhgvmhesuggrvhgvmhhlohhfthdrnhgvthdprhgtphhtthhopehkohhrhidrmhgrihhntggvnhhtsegsohhothhlihhnrdgtohhmpdhrtghpthhtohepmhgrgihimhgvrdgthhgvvhgrlhhlihgvrhessghoohhtlhhinhdrtghomhdprhgtphhtthhopehprggsvghnihesrhgvughhrghtrdgtohhmpdhrtghpthhtoheptghonhhorhdoughtsehkvghrnhgvlhdrohhrghdpr hgtphhtthhopehkuhgsrgeskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhinhhugidqughotgesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehkhihlvgdrshifvghnshhonhesvghsthdrthgvtghh X-GND-Sasl: kory.maincent@bootlin.com From: Kory Maincent (Dent Project) Refactor code by introducing a helper function to retrieve the hardware enabled state of the PI, avoiding redundant implementations in the future. Signed-off-by: Kory Maincent (Dent Project) Reviewed-by: Oleksij Rempel --- Change in v7: - New patch. --- drivers/net/pse-pd/pse_core.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/drivers/net/pse-pd/pse_core.c b/drivers/net/pse-pd/pse_core.c index 7d424c22225e..495d72f98029 100644 --- a/drivers/net/pse-pd/pse_core.c +++ b/drivers/net/pse-pd/pse_core.c @@ -272,10 +272,34 @@ static struct net_device *pse_control_get_netdev(stru= ct pse_control *psec) return psec->attached_phydev->attached_dev; } =20 +/** + * pse_pi_is_hw_enabled - Is PI enabled at the hardware level + * @pcdev: a pointer to the PSE controller device + * @id: Index of the PI + * + * Return: 1 if the PI is enabled at the hardware level, 0 if not, and + * a failure value on error + */ +static int pse_pi_is_hw_enabled(struct pse_controller_dev *pcdev, int id) +{ + struct pse_admin_state admin_state =3D {0}; + int ret; + + ret =3D pcdev->ops->pi_get_admin_state(pcdev, id, &admin_state); + if (ret < 0) + return ret; + + /* PI is well enabled at the hardware level */ + if (admin_state.podl_admin_state =3D=3D ETHTOOL_PODL_PSE_ADMIN_STATE_ENAB= LED || + admin_state.c33_admin_state =3D=3D ETHTOOL_C33_PSE_ADMIN_STATE_ENABLE= D) + return 1; + + return 0; +} + static int pse_pi_is_enabled(struct regulator_dev *rdev) { struct pse_controller_dev *pcdev =3D rdev_get_drvdata(rdev); - struct pse_admin_state admin_state =3D {0}; const struct pse_controller_ops *ops; int id, ret; =20 @@ -285,15 +309,7 @@ static int pse_pi_is_enabled(struct regulator_dev *rde= v) =20 id =3D rdev_get_id(rdev); mutex_lock(&pcdev->lock); - ret =3D ops->pi_get_admin_state(pcdev, id, &admin_state); - if (ret) - goto out; - - if (admin_state.podl_admin_state =3D=3D ETHTOOL_PODL_PSE_ADMIN_STATE_ENAB= LED || - admin_state.c33_admin_state =3D=3D ETHTOOL_C33_PSE_ADMIN_STATE_ENABLE= D) - ret =3D 1; - -out: + ret =3D pse_pi_is_hw_enabled(pcdev, id); mutex_unlock(&pcdev->lock); =20 return ret; --=20 2.43.0