FAILED: patch "[PATCH] net: phy: at803x: fix the wol setting functions" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x e58f30246c35c126c7571065b33bee4b3b1d2ef8
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023081220-shale-dropper-4012@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
e58f30246c35 ("net: phy: at803x: fix the wol setting functions") 988e8d90b3dc ("net: phy: at803x: Use devm_regulator_get_enable_optional()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e58f30246c35c126c7571065b33bee4b3b1d2ef8 Mon Sep 17 00:00:00 2001
From: Li Yang <[email protected]>
Date: Wed, 2 Aug 2023 14:13:46 -0500
Subject: [PATCH] net: phy: at803x: fix the wol setting functions
In commit 7beecaf7d507 ("net: phy: at803x: improve the WOL feature"), it seems not correct to use a wol_en bit in a 1588 Control Register which is only available on AR8031/AR8033(share the same phy_id) to determine if WoL is enabled. Change it back to use AT803X_INTR_ENABLE_WOL for determining the WoL status which is applicable on all chips supporting wol. Also update the at803x_set_wol() function to only update the 1588 register on chips having it. After this change, disabling wol at probe from commit d7cd5e06c9dd ("net: phy: at803x: disable WOL at probe") is no longer needed. Change it to just disable the WoL bit in 1588 register for AR8031/AR8033 to be aligned with AT803X_INTR_ENABLE_WOL in probe.
drivers/net/phy/at803x.c +25 -20
@@ -459,21 +459,27 @@ static int at803x_set_wol(struct phy_device *phydev,phy_write_mmd (phydev,MDIO_MMD_PCS , offsets[i], mac[(i *2 ) +1 ] | (mac[(i *2 )] <<8 )); -/* Enable WOL function */ - ret =phy_modify_mmd (phydev,MDIO_MMD_PCS ,AT803X_PHY_MMD3_WOL_CTRL , -0 ,AT803X_WOL_EN ); -if (ret) -return ret; +/* Enable WOL function for 1588 */ +if (phydev->drv->phy_id ==ATH8031_PHY_ID ) { + ret =phy_modify_mmd (phydev,MDIO_MMD_PCS , +AT803X_PHY_MMD3_WOL_CTRL , +0 ,AT803X_WOL_EN ); +if (ret) +return ret; + }/* Enable WOL interrupt */ ret =phy_modify (phydev,AT803X_INTR_ENABLE ,0 ,AT803X_INTR_ENABLE_WOL );if (ret)return ret; }else { -/* Disable WoL function */ - ret =phy_modify_mmd (phydev,MDIO_MMD_PCS ,AT803X_PHY_MMD3_WOL_CTRL , -AT803X_WOL_EN ,0 ); -if (ret) -return ret; +/* Disable WoL function for 1588 */ +if (phydev->drv->phy_id ==ATH8031_PHY_ID ) { + ret =phy_modify_mmd (phydev,MDIO_MMD_PCS , +AT803X_PHY_MMD3_WOL_CTRL , +AT803X_WOL_EN ,0 ); +if (ret) +return ret; + }/* Disable WOL interrupt */ ret =phy_modify (phydev,AT803X_INTR_ENABLE ,AT803X_INTR_ENABLE_WOL ,0 );if (ret)
@@ -508,11 +514,11 @@ static void at803x_get_wol(struct phy_device *phydev, wol->supported =WAKE_MAGIC ; wol->wolopts =0 ; - value =phy_read_mmd (phydev,MDIO_MMD_PCS ,AT803X_PHY_MMD3_WOL_CTRL ); + value =phy_read (phydev,AT803X_INTR_ENABLE );if (value <0 )return ; -if (value &AT803X_WOL_EN ) +if (value &AT803X_INTR_ENABLE_WOL ) wol->wolopts |=WAKE_MAGIC ; }
@@ -858,9 +864,6 @@ static int at803x_probe(struct phy_device *phydev)if (phydev->drv->phy_id ==ATH8031_PHY_ID ) {int ccr =phy_read (phydev,AT803X_REG_CHIP_CONFIG );int mode_cfg; -struct ethtool_wolinfo wol = { - .wolopts =0 , - };if (ccr <0 )return ccr;
@@ -877,12 +880,14 @@ static int at803x_probe(struct phy_device *phydev)break ; } -/* Disable WOL by default */ - ret =at803x_set_wol (phydev, &wol); -if (ret <0 ) { -phydev_err (phydev,"failed to disable WOL on probe: %d\n" , ret); +/* Disable WoL in 1588 register which is enabled +* by default +*/ + ret =phy_modify_mmd (phydev,MDIO_MMD_PCS , +AT803X_PHY_MMD3_WOL_CTRL , +AT803X_WOL_EN ,0 ); +if (ret)return ret; - } }return 0 ;