net: stmmac: option to enable PHY WOL with PMT enabled

The current stmmac driver WOL implementation will enable MAC WOL
if MAC HW PMT feature is on. Else, the driver will check for
PHY WOL support. There is another case where MAC HW PMT is
enabled but the platform still goes for the PHY WOL option.
E.g, Intel platform are designed for PHY WOL but not MAC WOL
although HW MAC PMT features are enabled.

Introduce use_phy_wol platform data to select PHY WOL
instead of depending on HW PMT features. Set use_phy_wol
will disable the plat->pmt which currently used to
determine the system to wake up by MAC WOL or PHY WOL.

Signed-off-by: Ling Pei Lee <pei.lee.ling@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 219535ab2c0cadc60f50b3659fcb238f4777ba68..8d9d6ecf8c63beaa714c0e34078b265ee38d8354 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -6529,7 +6529,8 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
                 * register (if supported).
                 */
                priv->plat->enh_desc = priv->dma_cap.enh_desc;
-               priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up;
+               priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up &&
+                               !priv->plat->use_phy_wol;
                priv->hw->pmt = priv->plat->pmt;
                if (priv->dma_cap.hash_tb_sz) {
                        priv->hw->multicast_filter_bins =

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 3867980d1447fc9220487cbc7eaf216df4998b3d..d5ae621d66badda8f4f0028e73697523c165d605 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -265,5 +265,6 @@ struct plat_stmmacenet_data {
        int msi_sfty_ue_vec;
        int msi_rx_base_vec;
        int msi_tx_base_vec;
+       bool use_phy_wol;
 };
 #endif