Commit 4e2bba30 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'fix-qca808x-wol-issue' 

Luo Jie says:

====================
Fix QCA808X WoL Issue

Restore WoL (Wake-on-LAN) enablement via MMD3 register 0x8012 BIT5 for
the QCA808X PHY. This change resolves the issue where WoL functionality
was not working due to its unintended removal in a previous commit.

Refactor at8031_set_wol() into a shared library to enable reuse of the
Wake-on-LAN (WoL) functionality by the AT8031, QCA807X and QCA808X PHY
drivers.
====================

Link: https://patch.msgid.link/20250704-qcom_phy_wol_support-v1-0-053342b1538d@quicinc.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b9fd9888 4ab9ada7

drivers/net/phy/qcom/at803x.c

+0 −27
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 


#define AT803X_LED_CONTROL			0x18



#define AT803X_PHY_MMD3_WOL_CTRL		0x8012

#define AT803X_WOL_EN				BIT(5)



#define AT803X_REG_CHIP_CONFIG			0x1f

#define AT803X_BT_BX_REG_SEL			0x8000
@@ -866,30 +863,6 @@ static int at8031_config_init(struct phy_device *phydev) 
	return at803x_config_init(phydev);

}



static int at8031_set_wol(struct phy_device *phydev,

			  struct ethtool_wolinfo *wol)

{

	int ret;



	/* First setup MAC address and enable WOL interrupt */

	ret = at803x_set_wol(phydev, wol);

	if (ret)

		return ret;



	if (wol->wolopts & WAKE_MAGIC)

		/* Enable WOL function for 1588 */

		ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,

				     AT803X_PHY_MMD3_WOL_CTRL,

				     0, AT803X_WOL_EN);

	else

		/* Disable WoL function for 1588 */

		ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,

				     AT803X_PHY_MMD3_WOL_CTRL,

				     AT803X_WOL_EN, 0);



	return ret;

}



static int at8031_config_intr(struct phy_device *phydev)

{

	struct at803x_priv *priv = phydev->priv;

drivers/net/phy/qcom/qca808x.c

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ static struct phy_driver qca808x_driver[] = { 
	.handle_interrupt	= at803x_handle_interrupt,

	.get_tunable		= at803x_get_tunable,

	.set_tunable		= at803x_set_tunable,

	.set_wol		= at803x_set_wol,

	.set_wol		= at8031_set_wol,

	.get_wol		= at803x_get_wol,

	.get_features		= qca808x_get_features,

	.config_aneg		= qca808x_config_aneg,

drivers/net/phy/qcom/qcom-phy-lib.c

+25 −0
Original line number Diff line number Diff line
@@ -115,6 +115,31 @@ int at803x_set_wol(struct phy_device *phydev, 
}

EXPORT_SYMBOL_GPL(at803x_set_wol);



int at8031_set_wol(struct phy_device *phydev,

		   struct ethtool_wolinfo *wol)

{

	int ret;



	/* First setup MAC address and enable WOL interrupt */

	ret = at803x_set_wol(phydev, wol);

	if (ret)

		return ret;



	if (wol->wolopts & WAKE_MAGIC)

		/* Enable WOL function for 1588 */

		ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,

				     AT803X_PHY_MMD3_WOL_CTRL,

				     0, AT803X_WOL_EN);

	else

		/* Disable WoL function for 1588 */

		ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,

				     AT803X_PHY_MMD3_WOL_CTRL,

				     AT803X_WOL_EN, 0);



	return ret;

}

EXPORT_SYMBOL_GPL(at8031_set_wol);



void at803x_get_wol(struct phy_device *phydev,

		    struct ethtool_wolinfo *wol)

{

drivers/net/phy/qcom/qcom.h

+5 −0
Original line number Diff line number Diff line
@@ -172,6 +172,9 @@ 
#define AT803X_LOC_MAC_ADDR_16_31_OFFSET	0x804B

#define AT803X_LOC_MAC_ADDR_32_47_OFFSET	0x804A



#define AT803X_PHY_MMD3_WOL_CTRL		0x8012

#define AT803X_WOL_EN				BIT(5)



#define AT803X_DEBUG_ADDR			0x1D

#define AT803X_DEBUG_DATA			0x1E
@@ -215,6 +218,8 @@ int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg, 
int at803x_debug_reg_write(struct phy_device *phydev, u16 reg, u16 data);

int at803x_set_wol(struct phy_device *phydev,

		   struct ethtool_wolinfo *wol);

int at8031_set_wol(struct phy_device *phydev,

		   struct ethtool_wolinfo *wol);

void at803x_get_wol(struct phy_device *phydev,

		    struct ethtool_wolinfo *wol);

int at803x_ack_interrupt(struct phy_device *phydev);