diff mbox series

[net] net: phy: air_en8811h: reset netdev rules when LED is set manually

Message ID 9be9a00adfac8118b6d685e71696f83187308c66.1715125851.git.daniel@makrotopia.org (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series [net] net: phy: air_en8811h: reset netdev rules when LED is set manually | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net
netdev/apply fail Patch does not apply to net-0

Commit Message

Daniel Golle May 8, 2024, 12:51 a.m. UTC
Setting LED_OFF via the brightness_set should deactivate hw control,
so make sure netdev trigger rules also get cleared in that case.
This matches the behaviour when using the 'netdev' trigger without
any hardware offloading and fixes unwanted memory of the default
netdev trigger rules when another trigger (or no trigger) had been
selected meanwhile.

Fixes: 71e79430117d ("net: phy: air_en8811h: Add the Airoha EN8811H PHY driver")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
This is basically a stop-gap measure until unified LED handling has
been implemented accross all MediaTek and Airoha PHYs.
See also
https://patchwork.kernel.org/project/netdevbpf/patch/20240425023325.15586-3-SkyLake.Huang@mediatek.com/

 drivers/net/phy/air_en8811h.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Paolo Abeni May 9, 2024, 9:18 a.m. UTC | #1
Hi,

On Wed, 2024-05-08 at 01:51 +0100, Daniel Golle wrote:
> Setting LED_OFF via the brightness_set should deactivate hw control,
> so make sure netdev trigger rules also get cleared in that case.
> This matches the behaviour when using the 'netdev' trigger without
> any hardware offloading and fixes unwanted memory of the default
> netdev trigger rules when another trigger (or no trigger) had been
> selected meanwhile.
> 
> Fixes: 71e79430117d ("net: phy: air_en8811h: Add the Airoha EN8811H PHY driver")
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>

The patch is marked for 'net' but it's actually targeting net-next,
since the air_en8811h is only there. Does not apply to 'net' so our CI
did not trigger. Could you please repost with a the correct target
tree?

Thanks,

Paolo
diff mbox series

Patch

diff --git a/drivers/net/phy/air_en8811h.c b/drivers/net/phy/air_en8811h.c
index 4c9a1c9c805e..3cdc8c6b30b6 100644
--- a/drivers/net/phy/air_en8811h.c
+++ b/drivers/net/phy/air_en8811h.c
@@ -544,6 +544,10 @@  static int air_hw_led_on_set(struct phy_device *phydev, u8 index, bool on)
 
 	changed |= (priv->led[index].rules != 0);
 
+	/* clear netdev trigger rules in case LED_OFF has been set */
+	if (!on)
+		priv->led[index].rules = 0;
+
 	if (changed)
 		return phy_modify_mmd(phydev, MDIO_MMD_VEND2,
 				      AIR_PHY_LED_ON(index),