From: Dave Ertman <david.m.ertman@intel.com>

Date: Fri, 26 Feb 2021 13:19:28 -0800

Subject: ice: remove DCBNL_DEVRESET bit from PF state

Patch-mainline: v5.12-rc7

Git-commit: 741b7b743bbcb5a3848e4e55982064214f900d2f

References: jsc#SLE-7926

The original purpose of the ICE_DCBNL_DEVRESET was to protect

the driver during DCBNL device resets.  But, the flow for

DCBNL device resets now consists of only calls up the stack

such as dev_close() and dev_open() that will result in NDO calls

to the driver.  These will be handled with state changes from the

stack.  Also, there is a problem of the dev_close and dev_open

being blocked by checks for reset in progress also using the

ICE_DCBNL_DEVRESET bit.

Since the ICE_DCBNL_DEVRESET bit is not necessary for protecting

the driver from DCBNL device resets and it is actually blocking

changes coming from the DCBNL interface, remove the bit from the

PF state and don't block driver function based on DCBNL reset in

progress.

Fixes: b94b013eb626 ("ice: Implement DCBNL support")

Signed-off-by: Dave Ertman <david.m.ertman@intel.com>

Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>

Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/intel/ice/ice.h        |    1 -

 drivers/net/ethernet/intel/ice/ice_dcb_nl.c |    2 --

 drivers/net/ethernet/intel/ice/ice_lib.c    |    1 -

 3 files changed, 4 deletions(-)

--- a/drivers/net/ethernet/intel/ice/ice.h

+++ b/drivers/net/ethernet/intel/ice/ice.h

@@ -186,7 +186,6 @@ enum ice_state {

 	__ICE_NEEDS_RESTART,

 	__ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */

 	__ICE_RESET_OICR_RECV,		/* set by driver after rcv reset OICR */

-	__ICE_DCBNL_DEVRESET,		/* set by dcbnl devreset */

 	__ICE_PFR_REQ,			/* set by driver and peers */

 	__ICE_CORER_REQ,		/* set by driver and peers */

 	__ICE_GLOBR_REQ,		/* set by driver and peers */

--- a/drivers/net/ethernet/intel/ice/ice_dcb_nl.c

+++ b/drivers/net/ethernet/intel/ice/ice_dcb_nl.c

@@ -20,12 +20,10 @@ static void ice_dcbnl_devreset(struct ne

 	while (ice_is_reset_in_progress(pf->state))

 		usleep_range(1000, 2000);

-	set_bit(__ICE_DCBNL_DEVRESET, pf->state);

 	dev_close(netdev);

 	netdev_state_change(netdev);

 	dev_open(netdev, NULL);

 	netdev_state_change(netdev);

-	clear_bit(__ICE_DCBNL_DEVRESET, pf->state);

 }

 /**

--- a/drivers/net/ethernet/intel/ice/ice_lib.c

+++ b/drivers/net/ethernet/intel/ice/ice_lib.c

@@ -2810,7 +2810,6 @@ err_vsi:

 bool ice_is_reset_in_progress(unsigned long *state)

 {

 	return test_bit(__ICE_RESET_OICR_RECV, state) ||

-	       test_bit(__ICE_DCBNL_DEVRESET, state) ||

 	       test_bit(__ICE_PFR_REQ, state) ||

 	       test_bit(__ICE_CORER_REQ, state) ||

 	       test_bit(__ICE_GLOBR_REQ, state);