-----Original Message-----
From: Intel-wired-lan <redacted> On Behalf Of Aaron Ma via Intel-wired-lan
Sent: Tuesday, April 28, 2026 8:49 PM
To: Nguyen, Anthony L <anthony.l.nguyen@intel.com>; Kitszel, Przemyslaw <przemyslaw.kitszel@intel.com>; Andrew Lunn <andrew+netdev@lunn.ch>; David S. Miller <davem@davemloft.net>; Eric Dumazet <redacted>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; <redacted>; <redacted>
Cc: Akeem G Abodunrin <redacted>; Jesse Brandeburg <redacted>; <redacted>; Loktionov, Aleksandr <redacted>; <redacted>; Paul Menzel <redacted>
Subject: [Intel-wired-lan] [PATCH v4] ice: wait for reset completion in ice_resume()
ice_resume() schedules an asynchronous PF reset and returns immediately. The reset runs later in ice_service_task(). If userspace tries to bring up the net device before the reset finishes, ice_open() fails with -EBUSY:
ice_resume()
ice_schedule_reset() # sets ICE_PFR_REQ, returns
...
ice_open()
ice_is_reset_in_progress() # ICE_PFR_REQ still set, -EBUSY
...
ice_service_task()
ice_do_reset()
ice_rebuild() # clears ICE_PFR_REQ, too late
Reproduced on E800 series NICs during suspend/resume with irdma enabled, where the aux device probe widens the race window.
ice 0000:81:00.0: can't open net device while reset is in progress
Add a best-effort wait (10s timeout, matching ice_devlink_info_get()) for the reset to complete before returning from ice_resume(). In practice the reset completes in ~300ms.
Fixes: 769c500dcc1e ("ice: Add advanced power mgmt for WoL")
Cc: <redacted>
Reviewed-by: Kohei Enju <redacted>
Reviewed-by: Aleksandr Loktionov <redacted>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Aaron Ma <redacted>
---
v4: use secs_to_jiffies() instead of 10 * HZ (Przemek Kitszel)
v3: add error message to commit message for searchability, mention
timeout in dev_err (Paul Menzel)
v2: reword comment to clarify best-effort semantics (Kohei Enju)
v1: https://lore.kernel.org/intel-wired-lan/20260402024220.210466-1-aaron.ma@canonical.com/ (local)
drivers/net/ethernet/intel/ice/ice_main.c | 10 ++++++++++
1 file changed, 10 insertions(+)
Tested-by: Alexander Nowlin <redacted>