ixgbe-shared: Clear SWFW_SYNC register during init
Subsystems (2)
PATCH 1/1 ixgbe-shared: Clear SWFW_SYNC register during init
Added clearing of SW resource bits in the SW/FW synchronization register to ixgbe_init_swfw_sync_X540().
Updated ixgbe_acquire_swfw_sync_X540 SW Manageability host interface resource bit error case to match the error handling of the other SW resource bits. Which is to release the SW resource bits if SW times out while attempting to acquire the resource.
This allows the driver to load in cases where the semaphore bits could be stuck after a reset or a crash.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c +12 -7
@@ -619,12 +619,6 @@ s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u32 mask)usleep_range (5000 ,10000 ); } -/* Failed to get SW only semaphore */ -if (swmask ==IXGBE_GSSR_SW_MNG_SM ) { -hw_dbg (hw,"Failed to get SW only semaphore\n" ); -return IXGBE_ERR_SWFW_SYNC ; - } -/* If the resource is not released by the FW/HW the SW can assume that * the FW/HW malfunctions. In that case the SW should set the SW bit(s) * of the requested resource(s) while ignoring the corresponding FW/HW
@@ -647,7 +641,8 @@ s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u32 mask)*/ if (swfw_sync & swmask) {u32 rmask =IXGBE_GSSR_EEP_SM |IXGBE_GSSR_PHY0_SM | -IXGBE_GSSR_PHY1_SM |IXGBE_GSSR_MAC_CSR_SM ; +IXGBE_GSSR_PHY1_SM |IXGBE_GSSR_MAC_CSR_SM | +IXGBE_GSSR_SW_MNG_SM ;if (swi2c_mask) rmask |=IXGBE_GSSR_I2C_MASK ;
@@ -763,6 +758,8 @@ static void ixgbe_release_swfw_sync_semaphore(struct ixgbe_hw *hw)**/ void ixgbe_init_swfw_sync_X540 (struct ixgbe_hw *hw) { +u32 rmask; +/* First try to grab the semaphore but we don't need to bother * looking to see whether we got the lock or not since we do * the same thing regardless of whether we got the lock or not.
@@ -771,6 +768,14 @@ void ixgbe_init_swfw_sync_X540(struct ixgbe_hw *hw)*/ ixgbe_get_swfw_sync_semaphore (hw);ixgbe_release_swfw_sync_semaphore (hw); + +/* Acquire and release all software resources. */ + rmask =IXGBE_GSSR_EEP_SM |IXGBE_GSSR_PHY0_SM | +IXGBE_GSSR_PHY1_SM |IXGBE_GSSR_MAC_CSR_SM | +IXGBE_GSSR_SW_MNG_SM |IXGBE_GSSR_I2C_MASK ; + +ixgbe_acquire_swfw_sync_X540 (hw, rmask); +ixgbe_release_swfw_sync_X540 (hw, rmask); }/**
Bowers
PATCH 1/1 ixgbe-shared: Clear SWFW_SYNC register during init
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Emil Tantilov
Sent: Wednesday, July 5, 2017 3:48 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH] ixgbe-shared: ClearSWFW_SYNCregister during initAdded clearing of SW resource bits in the SW/FW synchronization register to
ixgbe_init_swfw_sync_X540().Updated
ixgbe_acquire_swfw_sync_X540SW Manageability host interface resource bit error case to match the error handling of the other SW resource bits. Which is to release the SW resource bits if SW times out while attempting to acquire the resource.
Quoted 7 lines
This allows the driver to load in cases where the semaphore bits could be stuck after a reset or a crash.
Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)