Commit dda3529d authored Oct 02, 2024 by Kory Maincent Committed by Jakub Kicinski Oct 04, 2024

net: pse-pd: Fix enabled status mismatch

PSE controllers like the TPS23881 can forcefully turn off their
configuration state. In such cases, the is_enabled() and get_status()
callbacks will report the PSE as disabled, while admin_state_enabled
will show it as enabled. This mismatch can lead the user to attempt
to enable it, but no action is taken as admin_state_enabled remains set.

The solution is to disable the PSE before enabling it, ensuring the
actual status matches admin_state_enabled.

Fixes: d83e1376 ("net: pse-pd: Use regulator framework within PSE framework")
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20241002121706.246143-1-kory.maincent@bootlin.com

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 9f49d14e

drivers/net/pse-pd/pse_core.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -785,6 +785,17 @@ static int pse_ethtool_c33_set_config(struct pse_control *psec,
		*/
		switch (config->c33_admin_control) {
		case ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED:
		/* We could have mismatch between admin_state_enabled and
		* state reported by regulator_is_enabled. This can occur when
		* the PI is forcibly turn off by the controller. Call
		* regulator_disable on that case to fix the counters state.
		*/
		if (psec->pcdev->pi[psec->id].admin_state_enabled &&
		!regulator_is_enabled(psec->ps)) {
		err = regulator_disable(psec->ps);
		if (err)
		break;
		}
		if (!psec->pcdev->pi[psec->id].admin_state_enabled)
		err = regulator_enable(psec->ps);
		break;