Received-SPF: pass (google.com: domain of linux-kernel+bounces-202253-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <560d5efc-11fd-4ce6-a1e9-c4657e61d9b9@intel.com>
Date: Wed, 5 Jun 2024 13:18:13 +0200
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH net V3 1/3] net: lan743x: disable WOL upon resume to
 restore full data path operation
To: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>, <netdev@vger.kernel.org>
CC: <davem@davemloft.net>, <kuba@kernel.org>, <linux-kernel@vger.kernel.org>,
	<bryan.whitehead@microchip.com>, <andrew@lunn.ch>, <linux@armlinux.org.uk>,
	<sbauer@blackbox.su>, <hmehrtens@maxlinear.com>, <lxu@maxlinear.com>,
	<hkallweit1@gmail.com>, <edumazet@google.com>, <pabeni@redhat.com>,
	<UNGLinuxDriver@microchip.com>
References: <20240605101611.18791-1-Raju.Lakkaraju@microchip.com>
 <20240605101611.18791-2-Raju.Lakkaraju@microchip.com>
Content-Language: en-US
From: Wojciech Drewek <wojciech.drewek@intel.com>
In-Reply-To: <20240605101611.18791-2-Raju.Lakkaraju@microchip.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RTVzcXZFTm83M1ZWRG0xc2Y3MGJ3L3QxWTJtQ01FSDlQQXBxbS9rVWwrdWxk?=
 =?utf-8?B?WFR4K1JHNWNScUpvTS84VDBlSmprTjMyK01ISEFkWlVNVlVkczhPSGZTdXlC?=
 =?utf-8?B?aDhvK3NqU0FvT0tXR2pSeEZPaUlKTHNsM1BacElJREI0dW4waEs4ZmdlUUNP?=
 =?utf-8?B?RXBJS0FSUEdEV25PTzZCUkRUUVlwMkRlTkMyWGdEQ1N5QmhLbk1tZXFIeDRE?=
 =?utf-8?B?dlkzb2RnT1plaFpONlhNSGQ3QUMwbDV3KzZGdyswSU12Q0ViOEJoWVBNaWNL?=
 =?utf-8?B?VnF1TDNCS2o3bW14Sm1VUUpKcHlWMHlwZG5GSXY1OG1Sak9Scnp5QnBKcDEv?=
 =?utf-8?B?YVlnVFBncFZickpBQ2VVem9yUU85VEViSjRJc2ZRN3BRTlBFQjNsNDlQYTRt?=
 =?utf-8?B?ei9ndTNXUmd6akU5L0FLTjkybUhFc3FoRzlRMmRDSTJ5WngyYk8reDI3YVp0?=
 =?utf-8?B?THU2V2tFaU85L0Yxa3h0Zm54dUNua1pZSmR0SXhtKy85NG05SEtnOVV3cHdX?=
 =?utf-8?B?N0Y3UFd3WnlSenR0NExWOWNZaFlTUXQwRGJqaXFuc0prSjF6VHhHcDR2c0N6?=
 =?utf-8?B?alFTZkxXUTVQRkg5eWtCUW9naktIK2VGMU1xaFRVd24vTUFqeDhhRFg5Njgw?=
 =?utf-8?B?ODZjcDhRaHE1elVxaml3T0RLOTNSZkY0NCszaXNPODd0cGp6d21Ub3V3UCtn?=
 =?utf-8?B?b3l5YTlYMTFtOTN1ODF6QVVYVkJOb0lyWWVQNjBwL3g2N3lmWUhHaVhoMzYz?=
 =?utf-8?B?Y2oxTHcvSm9TSEpQQW9MbFZibjNVbUpkaG5pUnhjSEMzS1AxODE3V25wYU43?=
 =?utf-8?B?Vks4eDQrNWhId2NxbStKMktRamUrTkx6Z2tOTzFqaTZyVW5ONnVFY2VIdmN2?=
 =?utf-8?B?Ujcwc1dsM044Uld4RGFJaGQ2ZThjYlR2TGpueUtXYnRqdWp3Qnc3MkM3T0NM?=
 =?utf-8?B?VFcyMXp0TzNUUzRWeWVQVmNLdzh4aG9IMEorMDFZUVhLUUF6OEEwSmZoUWxH?=
 =?utf-8?B?M2hva09ZaDQwQ3ZnSUhEWUJ0MGdHRXhsMmJoSnR0RUxCZzlkUWxIS0d5STNX?=
 =?utf-8?B?bmhDK0JMM0x4dTh4SjFlUk9XazZqNFozMENQSVhZa1JTSGwrc3pTeDVBNmxt?=
 =?utf-8?B?VWdrRE1QTmFrN3prSUtGWkF0WVBWZlRYQU5PeXpvUnpTTHR0eDQwa2JzdEZK?=
 =?utf-8?B?bHhaNHcycnZuYU1kMFN1bDVIWmh4cmtyRlc2c0dXS0xRNW5lVmQzSVBqOE9n?=
 =?utf-8?B?TFdZMXFPeFFWTVhWcjdoZ2pTYW8rYzdadVRYbnA4Y0RST3E0Nk9jU3V4UlJN?=
 =?utf-8?B?QlNzM3d3MzB6VUFEVWV3RHpqWlRKbTdjUmtFcEFxU011Zk5ETTZGT25CejNM?=
 =?utf-8?B?OFJBSGZFTVpBZEUxU2JickswK1VTemd3eHJ4V0lqR3RPYjNpMzdxWlk0cWtX?=
 =?utf-8?B?OW1raGtDdDNyaThBbVNXcGpnMGJDYy9xQ2hocFVHSzZtUmlDRWxrc0FJVkd2?=
 =?utf-8?B?WTZIbDJkQVpaQmlFODF3eEhSNWUrcVBCOVVxcWRpOWxMcUR2VXNpZDJhaTJT?=
 =?utf-8?B?L1BLQVp0MlhWRGxQVDNNYmV4M2FtSkllV0VyU2JsQXMvYXByamY2aDhsUnVt?=
 =?utf-8?B?Wmwwb1NKYkdGZmZvdVRCcFZqbHNnd251RmtUY2lJd1F5UWxOeWU4ZFUrOTR1?=
 =?utf-8?B?NVlNZnl5TG1hMGtLemNpTVY0NkUrYmhSN3BFTzEwR2dZWnR0T2JrTnduV0t6?=
 =?utf-8?B?K2tSbmM3YzA3QUE3Vk91VEdnc01veGVERllSS1JDUDIvaDNJZGlINHBLSjZ6?=
 =?utf-8?B?Nll4bjR1am4zNXVpNUsvam1Kdkt2L1BmSXV6YnB1Wk5tTE5JTFF3K3B0Qkxj?=
 =?utf-8?B?eWgyTmxTWDRpdVVLSFRSNW80aWdrK2EvOUFvTGdsQm1DZmtiVXlDU2pucncv?=
 =?utf-8?B?cmxRRi9hdHNTWFVvUE51cVB1RnA0UGZmajhDbk0xbHM4UlBrTW1KQnBxc3pJ?=
 =?utf-8?B?WnQrNlRJV3ZCU3FSaU0rWG5Od3prNi9JVjBNWkt5Tko5bWlRaWpQZ0dlSDNn?=
 =?utf-8?B?dWJCTkxsazNSekhaVndoSUNsZzdSTGFIc21Vd0FRVWxTalFWa1dkUE1Gc2lu?=
 =?utf-8?B?Mlc5TzRDOFMxUHNjS1JESDdWUUNVRFA2WFNIRXo0bUhPTnNhOHFxckJ5aHB5?=
 =?utf-8?B?Z3c9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e0edc78c-bf46-4ea2-6bec-08dc85513504
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5776.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:18:21.0485
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2sO3mzZVedeQIQpElE68eWUCZLvhQcplq2rEBo0A3QYrwiLpmOyYq6KJem+LYnXTkuKVBXd3hsbAFKNAGevJly+u16A8oEs3y6rVnLD525c=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB7523
X-OriginatorOrg: intel.com


On 05.06.2024 12:16, Raju Lakkaraju wrote:
> When Wake-on-LAN (WoL) is active and the system is in suspend mode, triggering
> a system event can wake the system from sleep, which may block the data path.
> To restore normal data path functionality after waking, disable all wake-up
> events. Furthermore, clear all Write 1 to Clear (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>
> ---

Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>

> Change List:
> ------------
> V2 -> V3:
>   - No change
> V1 -> V2:
>   - Repost - No change
> V0 -> V1:
>   - Variable "data" change from "int" to "unsigned int"
> 
>  drivers/net/ethernet/microchip/lan743x_main.c | 30 ++++++++++++++++---
>  drivers/net/ethernet/microchip/lan743x_main.h | 24 +++++++++++++++
>  2 files changed, 50 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
> index 6be8a43c908a..6a40b961fafb 100644
> --- a/drivers/net/ethernet/microchip/lan743x_main.c
> +++ b/drivers/net/ethernet/microchip/lan743x_main.c
> @@ -3575,7 +3575,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_);
> @@ -3710,6 +3710,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);
> @@ -3728,6 +3729,30 @@ static int lan743x_pm_resume(struct device *dev)
>  		return ret;
>  	}
>  
> +	ret = lan743x_csr_read(adapter, MAC_WK_SRC);
> +	netif_info(adapter, drv, adapter->netdev,
> +		   "Wakeup source : 0x%08X\n", ret);
> +
> +	/* Clear the wol configuration and status bits. Note that
> +	 * 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);
> +
>  	/* open netdev when netdev is at running state while resume.
>  	 * For instance, it is true when system wakesup after pm-suspend
>  	 * However, it is false when system wakes up after suspend GUI menu
> @@ -3736,9 +3761,6 @@ static int lan743x_pm_resume(struct device *dev)
>  		lan743x_netdev_open(netdev);
>  
>  	netif_device_attach(netdev);
> -	ret = lan743x_csr_read(adapter, MAC_WK_SRC);
> -	netif_info(adapter, drv, adapter->netdev,
> -		   "Wakeup source : 0x%08X\n", ret);
>  
>  	return 0;
>  }
> diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/ethernet/microchip/lan743x_main.h
> index 645bc048e52e..fac0f33d10b2 100644
> --- a/drivers/net/ethernet/microchip/lan743x_main.h
> +++ b/drivers/net/ethernet/microchip/lan743x_main.h
> @@ -61,6 +61,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)
> @@ -227,12 +228,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)
>  
> @@ -295,6 +315,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)