Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bf7a7b8 authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Fix CS4227-related semaphore error on reset failure 



If the reset never completes, it is necessary to retake the
semaphore before returning, because the caller will release
the semaphore.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarDarin Miller <darin.j.miller@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 72bfd32d

drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c

+9 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ static s32 ixgbe_write_pe(struct ixgbe_hw *hw, u8 reg, u8 value) 
 * ixgbe_reset_cs4227 - Reset CS4227 using port expander

 * @hw: pointer to hardware structure

 *

 * This function assumes that the caller has acquired the proper semaphore.

 * Returns error code

 */

static s32 ixgbe_reset_cs4227(struct ixgbe_hw *hw)
@@ -296,6 +297,14 @@ static void ixgbe_check_cs4227(struct ixgbe_hw *hw) 
		hw->mac.ops.release_swfw_sync(hw, swfw_mask);

		msleep(IXGBE_CS4227_CHECK_DELAY);

	}

	/* If still pending, assume other instance failed. */

	if (retry == IXGBE_CS4227_RETRIES) {

		status = hw->mac.ops.acquire_swfw_sync(hw, swfw_mask);

		if (status) {

			hw_err(hw, "semaphore failed with %d\n", status);

			return;

		}

	}



	/* Reset the CS4227. */

	status = ixgbe_reset_cs4227(hw);