2020-12-14 19:39:46

by Mario Limonciello

Subject: [PATCH v5 1/4] e1000e: Only run S0ix flows if shutdown succeeded

If the shutdown failed, the part will be thawed and running
S0ix flows will put it into an undefined state.

Reported-by: Alexander Duyck <[email protected]>
Reviewed-by: Alexander Duyck <[email protected]>
Signed-off-by: Mario Limonciello <[email protected]>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 128ab6898070..6588f5d4a2be 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6970,13 +6970,14 @@ static __maybe_unused int e1000e_pm_suspend(struct device *dev)
e1000e_pm_freeze(dev);

rc = __e1000_shutdown(pdev, false);
- if (rc)
+ if (rc) {
e1000e_pm_thaw(dev);
-
- /* Introduce S0ix implementation */
- if (hw->mac.type >= e1000_pch_cnp &&
- !e1000e_check_me(hw->adapter->pdev->device))
- e1000e_s0ix_entry_flow(adapter);
+ } else {
+ /* Introduce S0ix implementation */
+ if (hw->mac.type >= e1000_pch_cnp &&
+ !e1000e_check_me(hw->adapter->pdev->device))
+ e1000e_s0ix_entry_flow(adapter);
+ }

return rc;
}
--
2.25.1

2020-12-15 15:01:40

by Shen, Yijun

Subject: RE: [PATCH v5 1/4] e1000e: Only run S0ix flows if shutdown succeeded

> -----Original Message-----
> From: Limonciello, Mario <[email protected]>
> Sent: Tuesday, December 15, 2020 3:30 AM
> To: Jeff Kirsher; Tony Nguyen; [email protected]
> Cc: [email protected]; Netdev; Alexander Duyck; Jakub Kicinski;
> Sasha Netfin; Aaron Brown; Stefan Assmann; David Miller;
> [email protected]; Shen, Yijun; Yuan, Perry;
> [email protected]; Hans de Goede; Limonciello, Mario
> Subject: [PATCH v5 1/4] e1000e: Only run S0ix flows if shutdown succeeded
>
> If the shutdown failed, the part will be thawed and running S0ix flows will
> put it into an undefined state.
>
> Reported-by: Alexander Duyck <[email protected]>
> Reviewed-by: Alexander Duyck <[email protected]>
> Signed-off-by: Mario Limonciello <[email protected]>

Verified this series patch on Dell Systems.

Tested-By: Yijun Shen <[email protected]>

> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c
> b/drivers/net/ethernet/intel/e1000e/netdev.c
> index 128ab6898070..6588f5d4a2be 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -6970,13 +6970,14 @@ static __maybe_unused int
> e1000e_pm_suspend(struct device *dev)
> e1000e_pm_freeze(dev);
>
> rc = __e1000_shutdown(pdev, false);
> - if (rc)
> + if (rc) {
> e1000e_pm_thaw(dev);
> -
> - /* Introduce S0ix implementation */
> - if (hw->mac.type >= e1000_pch_cnp &&
> - !e1000e_check_me(hw->adapter->pdev->device))
> - e1000e_s0ix_entry_flow(adapter);
> + } else {
> + /* Introduce S0ix implementation */
> + if (hw->mac.type >= e1000_pch_cnp &&
> + !e1000e_check_me(hw->adapter->pdev->device))
> + e1000e_s0ix_entry_flow(adapter);
> + }
>
> return rc;
> }
> --
> 2.25.1