* [PATCH net V1 0/2] net: lan743x: Fixes for multiple WOL related issues
@ 2024-03-19 5:51 Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 1/2] net: lan743x: disable WOL upon resume to restore full data path operation Raju Lakkaraju
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Raju Lakkaraju @ 2024-03-19 5:51 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, pabeni, edumazet, linux-kernel, bryan.whitehead,
UNGLinuxDriver
This patch series implement the following fixes:
1. Disable WOL upon resume in order to restore full data path operation
2. Support WOL in MAC even when PHY does not
Change List:
------------
V0 -> V1:
- Include the missing maintainer's email ids in 'CC list
- Remove the patch "Address problems with wake option flags configuration
sequences" from this patch series. Will fix this in next patch series.
- Variable "data" change from "int" to "unsigned int"
- Change the "phy does not support WOL" print from netif_info() to
netif_dbg()
Raju Lakkaraju (2):
net: lan743x: disable WOL upon resume to restore full data path
operation
net: lan743x: support WOL in MAC even when PHY does not
.../net/ethernet/microchip/lan743x_ethtool.c | 14 +++++++++--
drivers/net/ethernet/microchip/lan743x_main.c | 24 ++++++++++++++++++-
drivers/net/ethernet/microchip/lan743x_main.h | 24 +++++++++++++++++++
3 files changed, 59 insertions(+), 3 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net V1 1/2] net: lan743x: disable WOL upon resume to restore full data path operation
2024-03-19 5:51 [PATCH net V1 0/2] net: lan743x: Fixes for multiple WOL related issues Raju Lakkaraju
@ 2024-03-19 5:51 ` Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 2/2] net: lan743x: support WOL in MAC even when PHY does not Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 3/3] net: lan743x: Address problems with wake option flags configuration sequences Raju Lakkaraju
2 siblings, 0 replies; 6+ messages in thread
From: Raju Lakkaraju @ 2024-03-19 5:51 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, pabeni, edumazet, linux-kernel, bryan.whitehead,
UNGLinuxDriver
In order for datapath to be restored to normal functionality after resume
we disable all wakeup events. Additionally we clear all W1C status bits by
writing 1's to them.
Fixes: 4d94282afd95 ("lan743x: Add power management support")
Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
---
Change List:
------------
V0 -> V1:
- Variable "data" change from "int" to "unsigned int"
drivers/net/ethernet/microchip/lan743x_main.c | 24 ++++++++++++++++++-
drivers/net/ethernet/microchip/lan743x_main.h | 24 +++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index bd8aa83b47e5..385e9dcd8cd9 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -3550,7 +3550,7 @@ static void lan743x_pm_set_wol(struct lan743x_adapter *adapter)
/* clear wake settings */
pmtctl = lan743x_csr_read(adapter, PMT_CTL);
- pmtctl |= PMT_CTL_WUPS_MASK_;
+ pmtctl |= PMT_CTL_WUPS_MASK_ | PMT_CTL_RES_CLR_WKP_MASK_;
pmtctl &= ~(PMT_CTL_GPIO_WAKEUP_EN_ | PMT_CTL_EEE_WAKEUP_EN_ |
PMT_CTL_WOL_EN_ | PMT_CTL_MAC_D3_RX_CLK_OVR_ |
PMT_CTL_RX_FCT_RFE_D3_CLK_OVR_ | PMT_CTL_ETH_PHY_WAKE_EN_);
@@ -3685,6 +3685,7 @@ static int lan743x_pm_resume(struct device *dev)
struct pci_dev *pdev = to_pci_dev(dev);
struct net_device *netdev = pci_get_drvdata(pdev);
struct lan743x_adapter *adapter = netdev_priv(netdev);
+ u32 data;
int ret;
pci_set_power_state(pdev, PCI_D0);
@@ -3715,6 +3716,27 @@ static int lan743x_pm_resume(struct device *dev)
netif_info(adapter, drv, adapter->netdev,
"Wakeup source : 0x%08X\n", ret);
+ /* Clear the wol configuration and status bits when system
+ * events occurs.
+ * The status bits are "Write One to Clear (W1C)"
+ */
+ data = MAC_WUCSR_EEE_TX_WAKE_ | MAC_WUCSR_EEE_RX_WAKE_ |
+ MAC_WUCSR_RFE_WAKE_FR_ | MAC_WUCSR_PFDA_FR_ | MAC_WUCSR_WUFR_ |
+ MAC_WUCSR_MPR_ | MAC_WUCSR_BCAST_FR_;
+ lan743x_csr_write(adapter, MAC_WUCSR, data);
+
+ data = MAC_WUCSR2_NS_RCD_ | MAC_WUCSR2_ARP_RCD_ |
+ MAC_WUCSR2_IPV6_TCPSYN_RCD_ | MAC_WUCSR2_IPV4_TCPSYN_RCD_;
+ lan743x_csr_write(adapter, MAC_WUCSR2, data);
+
+ data = MAC_WK_SRC_ETH_PHY_WK_ | MAC_WK_SRC_IPV6_TCPSYN_RCD_WK_ |
+ MAC_WK_SRC_IPV4_TCPSYN_RCD_WK_ | MAC_WK_SRC_EEE_TX_WK_ |
+ MAC_WK_SRC_EEE_RX_WK_ | MAC_WK_SRC_RFE_FR_WK_ |
+ MAC_WK_SRC_PFDA_FR_WK_ | MAC_WK_SRC_MP_FR_WK_ |
+ MAC_WK_SRC_BCAST_FR_WK_ | MAC_WK_SRC_WU_FR_WK_ |
+ MAC_WK_SRC_WK_FR_SAVED_;
+ lan743x_csr_write(adapter, MAC_WK_SRC, data);
+
return 0;
}
diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/ethernet/microchip/lan743x_main.h
index be79cb0ae5af..77fc3abc1428 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.h
+++ b/drivers/net/ethernet/microchip/lan743x_main.h
@@ -60,6 +60,7 @@
#define PMT_CTL_RX_FCT_RFE_D3_CLK_OVR_ BIT(18)
#define PMT_CTL_GPIO_WAKEUP_EN_ BIT(15)
#define PMT_CTL_EEE_WAKEUP_EN_ BIT(13)
+#define PMT_CTL_RES_CLR_WKP_MASK_ GENMASK(9, 8)
#define PMT_CTL_READY_ BIT(7)
#define PMT_CTL_ETH_PHY_RST_ BIT(4)
#define PMT_CTL_WOL_EN_ BIT(3)
@@ -226,12 +227,31 @@
#define MAC_WUCSR (0x140)
#define MAC_MP_SO_EN_ BIT(21)
#define MAC_WUCSR_RFE_WAKE_EN_ BIT(14)
+#define MAC_WUCSR_EEE_TX_WAKE_ BIT(13)
+#define MAC_WUCSR_EEE_RX_WAKE_ BIT(11)
+#define MAC_WUCSR_RFE_WAKE_FR_ BIT(9)
+#define MAC_WUCSR_PFDA_FR_ BIT(7)
+#define MAC_WUCSR_WUFR_ BIT(6)
+#define MAC_WUCSR_MPR_ BIT(5)
+#define MAC_WUCSR_BCAST_FR_ BIT(4)
#define MAC_WUCSR_PFDA_EN_ BIT(3)
#define MAC_WUCSR_WAKE_EN_ BIT(2)
#define MAC_WUCSR_MPEN_ BIT(1)
#define MAC_WUCSR_BCST_EN_ BIT(0)
#define MAC_WK_SRC (0x144)
+#define MAC_WK_SRC_ETH_PHY_WK_ BIT(17)
+#define MAC_WK_SRC_IPV6_TCPSYN_RCD_WK_ BIT(16)
+#define MAC_WK_SRC_IPV4_TCPSYN_RCD_WK_ BIT(15)
+#define MAC_WK_SRC_EEE_TX_WK_ BIT(14)
+#define MAC_WK_SRC_EEE_RX_WK_ BIT(13)
+#define MAC_WK_SRC_RFE_FR_WK_ BIT(12)
+#define MAC_WK_SRC_PFDA_FR_WK_ BIT(11)
+#define MAC_WK_SRC_MP_FR_WK_ BIT(10)
+#define MAC_WK_SRC_BCAST_FR_WK_ BIT(9)
+#define MAC_WK_SRC_WU_FR_WK_ BIT(8)
+#define MAC_WK_SRC_WK_FR_SAVED_ BIT(7)
+
#define MAC_MP_SO_HI (0x148)
#define MAC_MP_SO_LO (0x14C)
@@ -294,6 +314,10 @@
#define RFE_INDX(index) (0x580 + (index << 2))
#define MAC_WUCSR2 (0x600)
+#define MAC_WUCSR2_NS_RCD_ BIT(7)
+#define MAC_WUCSR2_ARP_RCD_ BIT(6)
+#define MAC_WUCSR2_IPV6_TCPSYN_RCD_ BIT(5)
+#define MAC_WUCSR2_IPV4_TCPSYN_RCD_ BIT(4)
#define SGMII_ACC (0x720)
#define SGMII_ACC_SGMII_BZY_ BIT(31)
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net V1 2/2] net: lan743x: support WOL in MAC even when PHY does not
2024-03-19 5:51 [PATCH net V1 0/2] net: lan743x: Fixes for multiple WOL related issues Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 1/2] net: lan743x: disable WOL upon resume to restore full data path operation Raju Lakkaraju
@ 2024-03-19 5:51 ` Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 3/3] net: lan743x: Address problems with wake option flags configuration sequences Raju Lakkaraju
2 siblings, 0 replies; 6+ messages in thread
From: Raju Lakkaraju @ 2024-03-19 5:51 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, pabeni, edumazet, linux-kernel, bryan.whitehead,
UNGLinuxDriver
Allow WOL support if MAC supports it, even if the PHY does not support it
Fixes: e9e13b6adc338 ("lan743x: fix for potential NULL pointer dereference with bare card")
Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
---
Change List:
------------
- Change the "phy does not support WOL" print from netif_info() to
netif_dbg()
drivers/net/ethernet/microchip/lan743x_ethtool.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c b/drivers/net/ethernet/microchip/lan743x_ethtool.c
index 8a6ae171e375..7509a19269c3 100644
--- a/drivers/net/ethernet/microchip/lan743x_ethtool.c
+++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c
@@ -1163,6 +1163,17 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev,
struct ethtool_wolinfo *wol)
{
struct lan743x_adapter *adapter = netdev_priv(netdev);
+ int ret;
+
+ if (netdev->phydev) {
+ ret = phy_ethtool_set_wol(netdev->phydev, wol);
+ if (ret != -EOPNOTSUPP && ret != 0)
+ return ret;
+
+ if (ret == -EOPNOTSUPP)
+ netif_dbg(adapter, drv, adapter->netdev,
+ "phy does not support WOL\n");
+ }
adapter->wolopts = 0;
if (wol->wolopts & WAKE_UCAST)
@@ -1187,8 +1198,7 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev,
device_set_wakeup_enable(&adapter->pdev->dev, (bool)wol->wolopts);
- return netdev->phydev ? phy_ethtool_set_wol(netdev->phydev, wol)
- : -ENETDOWN;
+ return 0;
}
#endif /* CONFIG_PM */
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net V1 3/3] net: lan743x: Address problems with wake option flags configuration sequences
2024-03-19 5:51 [PATCH net V1 0/2] net: lan743x: Fixes for multiple WOL related issues Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 1/2] net: lan743x: disable WOL upon resume to restore full data path operation Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 2/2] net: lan743x: support WOL in MAC even when PHY does not Raju Lakkaraju
@ 2024-03-19 5:51 ` Raju Lakkaraju
2024-03-19 6:00 ` Raju.Lakkaraju
2 siblings, 1 reply; 6+ messages in thread
From: Raju Lakkaraju @ 2024-03-19 5:51 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, pabeni, edumazet, linux-kernel, bryan.whitehead,
UNGLinuxDriver
WOL secure-on and magic packet configuration table:
--------------------------------------------------------------------------------
| Ethtool Ops | Send magic packet | Send magic packet | Send magic packet |
| | | with password | with wrong password|
--------------------------------------------------------------------------------
|WAKE_MAGIC (g) | wake | wake | wake |
--------------------------------------------------------------------------------
|WAKE_SECURE_MAGIC| no wake | wake | no wake |
| (s) | | | |
--------------------------------------------------------------------------------
| WAKE_MAGIC & | | | |
|WAKE_SECURE_MAGIC| wake | wake | wake |
| (gs) | | | |
--------------------------------------------------------------------------------
Fixes: 6b3768ac8e2b3 ("net: lan743x: Add support to Secure-ON WOL")
Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
---
Change List:
------------
V0 -> V1:
- Fix the wake option flags configuration sequences
drivers/net/ethernet/microchip/lan743x_ethtool.c | 3 +--
drivers/net/ethernet/microchip/lan743x_main.c | 8 +++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c b/drivers/net/ethernet/microchip/lan743x_ethtool.c
index 4899582b3d1d..442c52aa0b0e 100644
--- a/drivers/net/ethernet/microchip/lan743x_ethtool.c
+++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c
@@ -1188,8 +1188,7 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev,
adapter->wolopts |= WAKE_PHY;
if (wol->wolopts & WAKE_ARP)
adapter->wolopts |= WAKE_ARP;
- if (wol->wolopts & WAKE_MAGICSECURE &&
- wol->wolopts & WAKE_MAGIC) {
+ if (wol->wolopts & WAKE_MAGICSECURE) {
memcpy(adapter->sopass, wol->sopass, sizeof(wol->sopass));
adapter->wolopts |= WAKE_MAGICSECURE;
} else {
diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index 5641b466d70d..43e8e35fe9d0 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -3639,9 +3639,15 @@ static void lan743x_pm_set_wol(struct lan743x_adapter *adapter)
lan743x_csr_write(adapter, MAC_MP_SO_LO, sopass);
sopass = *(u16 *)&adapter->sopass[4];
lan743x_csr_write(adapter, MAC_MP_SO_HI, sopass);
- wucsr |= MAC_MP_SO_EN_;
+ wucsr |= MAC_MP_SO_EN_ | MAC_WUCSR_MPEN_;
+ macrx |= MAC_RX_RXEN_;
+ pmtctl |= PMT_CTL_WOL_EN_ | PMT_CTL_MAC_D3_RX_CLK_OVR_;
}
+ if (adapter->wolopts & WAKE_MAGICSECURE &&
+ adapter->wolopts & WAKE_MAGIC)
+ wucsr &= ~MAC_MP_SO_EN_;
+
lan743x_csr_write(adapter, MAC_WUCSR, wucsr);
lan743x_csr_write(adapter, PMT_CTL, pmtctl);
lan743x_csr_write(adapter, MAC_RX, macrx);
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH net V1 3/3] net: lan743x: Address problems with wake option flags configuration sequences
2024-03-19 5:51 ` [PATCH net V1 3/3] net: lan743x: Address problems with wake option flags configuration sequences Raju Lakkaraju
@ 2024-03-19 6:00 ` Raju.Lakkaraju
2024-03-19 17:26 ` Jakub Kicinski
0 siblings, 1 reply; 6+ messages in thread
From: Raju.Lakkaraju @ 2024-03-19 6:00 UTC (permalink / raw)
To: Raju.Lakkaraju, netdev
Cc: davem, kuba, pabeni, edumazet, linux-kernel, Bryan.Whitehead,
UNGLinuxDriver
Hello,
Sorry for inconvenience. Please ignore this mail only.
By mistake it was not out.
Thanks,
Raju
> -----Original Message-----
> From: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
> Sent: Tuesday, March 19, 2024 11:21 AM
> To: netdev@vger.kernel.org
> Cc: davem@davemloft.net; kuba@kernel.org; pabeni@redhat.com;
> edumazet@google.com; linux-kernel@vger.kernel.org; Bryan Whitehead -
> C21958 <Bryan.Whitehead@microchip.com>; UNGLinuxDriver
> <UNGLinuxDriver@microchip.com>
> Subject: [PATCH net V1 3/3] net: lan743x: Address problems with wake option
> flags configuration sequences
>
> WOL secure-on and magic packet configuration table:
> --------------------------------------------------------------------------------
> | Ethtool Ops | Send magic packet | Send magic packet | Send magic packet
> |
> | | | with password | with wrong password|
> --------------------------------------------------------------------------------
> |WAKE_MAGIC (g) | wake | wake | wake |
> --------------------------------------------------------------------------------
> |WAKE_SECURE_MAGIC| no wake | wake | no wake |
> | (s) | | | |
> --------------------------------------------------------------------------------
> | WAKE_MAGIC & | | | |
> |WAKE_SECURE_MAGIC| wake | wake | wake |
> | (gs) | | | |
> --------------------------------------------------------------------------------
>
> Fixes: 6b3768ac8e2b3 ("net: lan743x: Add support to Secure-ON WOL")
> Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
> ---
> Change List:
> ------------
> V0 -> V1:
> - Fix the wake option flags configuration sequences
>
> drivers/net/ethernet/microchip/lan743x_ethtool.c | 3 +--
> drivers/net/ethernet/microchip/lan743x_main.c | 8 +++++++-
> 2 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c
> b/drivers/net/ethernet/microchip/lan743x_ethtool.c
> index 4899582b3d1d..442c52aa0b0e 100644
> --- a/drivers/net/ethernet/microchip/lan743x_ethtool.c
> +++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c
> @@ -1188,8 +1188,7 @@ static int lan743x_ethtool_set_wol(struct
> net_device *netdev,
> adapter->wolopts |= WAKE_PHY;
> if (wol->wolopts & WAKE_ARP)
> adapter->wolopts |= WAKE_ARP;
> - if (wol->wolopts & WAKE_MAGICSECURE &&
> - wol->wolopts & WAKE_MAGIC) {
> + if (wol->wolopts & WAKE_MAGICSECURE) {
> memcpy(adapter->sopass, wol->sopass, sizeof(wol->sopass));
> adapter->wolopts |= WAKE_MAGICSECURE;
> } else {
> diff --git a/drivers/net/ethernet/microchip/lan743x_main.c
> b/drivers/net/ethernet/microchip/lan743x_main.c
> index 5641b466d70d..43e8e35fe9d0 100644
> --- a/drivers/net/ethernet/microchip/lan743x_main.c
> +++ b/drivers/net/ethernet/microchip/lan743x_main.c
> @@ -3639,9 +3639,15 @@ static void lan743x_pm_set_wol(struct
> lan743x_adapter *adapter)
> lan743x_csr_write(adapter, MAC_MP_SO_LO, sopass);
> sopass = *(u16 *)&adapter->sopass[4];
> lan743x_csr_write(adapter, MAC_MP_SO_HI, sopass);
> - wucsr |= MAC_MP_SO_EN_;
> + wucsr |= MAC_MP_SO_EN_ | MAC_WUCSR_MPEN_;
> + macrx |= MAC_RX_RXEN_;
> + pmtctl |= PMT_CTL_WOL_EN_ |
> PMT_CTL_MAC_D3_RX_CLK_OVR_;
> }
>
> + if (adapter->wolopts & WAKE_MAGICSECURE &&
> + adapter->wolopts & WAKE_MAGIC)
> + wucsr &= ~MAC_MP_SO_EN_;
> +
> lan743x_csr_write(adapter, MAC_WUCSR, wucsr);
> lan743x_csr_write(adapter, PMT_CTL, pmtctl);
> lan743x_csr_write(adapter, MAC_RX, macrx);
> --
> 2.34.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net V1 3/3] net: lan743x: Address problems with wake option flags configuration sequences
2024-03-19 6:00 ` Raju.Lakkaraju
@ 2024-03-19 17:26 ` Jakub Kicinski
0 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2024-03-19 17:26 UTC (permalink / raw)
To: Raju.Lakkaraju
Cc: netdev, davem, pabeni, edumazet, linux-kernel, Bryan.Whitehead,
UNGLinuxDriver
On Tue, 19 Mar 2024 06:00:15 +0000 Raju.Lakkaraju@microchip.com wrote:
> Sorry for inconvenience. Please ignore this mail only.
> By mistake it was not out.
Unfortunately patchwork decided to include it in the series,
please repost.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-03-19 17:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-19 5:51 [PATCH net V1 0/2] net: lan743x: Fixes for multiple WOL related issues Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 1/2] net: lan743x: disable WOL upon resume to restore full data path operation Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 2/2] net: lan743x: support WOL in MAC even when PHY does not Raju Lakkaraju
2024-03-19 5:51 ` [PATCH net V1 3/3] net: lan743x: Address problems with wake option flags configuration sequences Raju Lakkaraju
2024-03-19 6:00 ` Raju.Lakkaraju
2024-03-19 17:26 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).