Commit 032b4325 authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: cleanup short msleep's (<20ms) to use usleep_range 



Since msleep might not sleep for the desired amount when less
than 20ms use usleep_range.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0fa6d832

drivers/net/ixgbe/ixgbe_82598.c

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset, 
			sfp_stat = sfp_stat & IXGBE_I2C_EEPROM_STATUS_MASK;

			if (sfp_stat != IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS)

				break;

			msleep(10);

			usleep_range(10000, 20000);

		}



		if (sfp_stat != IXGBE_I2C_EEPROM_STATUS_PASS) {

drivers/net/ixgbe/ixgbe_82599.c

+9 −5
Original line number Diff line number Diff line
@@ -130,8 +130,12 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw) 


		/* Release the semaphore */

		ixgbe_release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);

		/* Delay obtaining semaphore again to allow FW access */

		msleep(hw->eeprom.semaphore_delay);

		/*

		 * Delay obtaining semaphore again to allow FW access,

		 * semaphore_delay is in ms usleep_range needs us.

		 */

		usleep_range(hw->eeprom.semaphore_delay * 1000,

			     hw->eeprom.semaphore_delay * 2000);



		/* Now restart DSP by setting Restart_AN and clearing LMS */

		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, ((IXGBE_READ_REG(hw,
@@ -140,7 +144,7 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw) 


		/* Wait for AN to leave state 0 */

		for (i = 0; i < 10; i++) {

			msleep(4);

			usleep_range(4000, 8000);

			reg_anlp1 = IXGBE_READ_REG(hw, IXGBE_ANLP1);

			if (reg_anlp1 & IXGBE_ANLP1_AN_STATE_MASK)

				break;
@@ -1178,7 +1182,7 @@ s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc) 
		if (IXGBE_READ_REG(hw, IXGBE_FDIRCTRL) &

		                   IXGBE_FDIRCTRL_INIT_DONE)

			break;

		msleep(1);

		usleep_range(1000, 2000);

	}

	if (i >= IXGBE_FDIR_INIT_DONE_POLL)

		hw_dbg(hw, "Flow Director Signature poll time exceeded!\n");
@@ -1273,7 +1277,7 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc) 
		if (IXGBE_READ_REG(hw, IXGBE_FDIRCTRL) &

		                   IXGBE_FDIRCTRL_INIT_DONE)

			break;

		msleep(1);

		usleep_range(1000, 2000);

	}

	if (i >= IXGBE_FDIR_INIT_DONE_POLL)

		hw_dbg(hw, "Flow Director Perfect poll time exceeded!\n");

drivers/net/ixgbe/ixgbe_common.c

+9 −5
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw) 
	reg_val &= ~(IXGBE_RXCTRL_RXEN);

	IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, reg_val);

	IXGBE_WRITE_FLUSH(hw);

	msleep(2);

	usleep_range(2000, 4000);



	/* Clear interrupt mask to stop from interrupts being generated */

	IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_IRQ_CLEAR_MASK);
@@ -1151,8 +1151,12 @@ static void ixgbe_release_eeprom(struct ixgbe_hw *hw) 


	hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);



	/* Delay before attempt to obtain semaphore again to allow FW access */

	msleep(hw->eeprom.semaphore_delay);

	/*

	 * Delay before attempt to obtain semaphore again to allow FW

	 * access. semaphore_delay is in ms we need us for usleep_range

	 */

	usleep_range(hw->eeprom.semaphore_delay * 1000,

		     hw->eeprom.semaphore_delay * 2000);

}



/**
@@ -2228,7 +2232,7 @@ s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask) 
		 * thread currently using resource (swmask)

		 */

		ixgbe_release_eeprom_semaphore(hw);

		msleep(5);

		usleep_range(5000, 10000);

		timeout--;

	}
@@ -2302,7 +2306,7 @@ s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index) 
		autoc_reg |= IXGBE_AUTOC_AN_RESTART;

		autoc_reg |= IXGBE_AUTOC_FLU;

		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);

		msleep(10);

		usleep_range(10000, 20000);

	}



	led_reg &= ~IXGBE_LED_MODE_MASK(index);

drivers/net/ixgbe/ixgbe_dcb_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) 
	 */

	if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {

		while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))

			msleep(1);

			usleep_range(1000, 2000);



		ixgbe_fcoe_setapp(adapter, up);

drivers/net/ixgbe/ixgbe_ethtool.c

+7 −7
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
	}



	while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))

		msleep(1);

		usleep_range(1000, 2000);



	if (!netif_running(adapter->netdev)) {

		for (i = 0; i < adapter->num_tx_queues; i++)
@@ -1417,7 +1417,7 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data) 


	/* Disable all the interrupts */

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFFFFFF);

	msleep(10);

	usleep_range(10000, 20000);



	/* Test each interrupt */

	for (; i < 10; i++) {
@@ -1437,7 +1437,7 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data) 
			                ~mask & 0x00007FFF);

			IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS,

			                ~mask & 0x00007FFF);

			msleep(10);

			usleep_range(10000, 20000);



			if (adapter->test_icr & mask) {

				*data = 3;
@@ -1454,7 +1454,7 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data) 
		adapter->test_icr = 0;

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS, mask);

		msleep(10);

		usleep_range(10000, 20000);



		if (!(adapter->test_icr &mask)) {

			*data = 4;
@@ -1474,7 +1474,7 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data) 
			                ~mask & 0x00007FFF);

			IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS,

			                ~mask & 0x00007FFF);

			msleep(10);

			usleep_range(10000, 20000);



			if (adapter->test_icr) {

				*data = 5;
@@ -1485,7 +1485,7 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data) 


	/* Disable all the interrupts */

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFFFFFF);

	msleep(10);

	usleep_range(10000, 20000);



	/* Unhook test interrupt handler */

	free_irq(irq, netdev);
@@ -1613,7 +1613,7 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter) 
	reg_data |= IXGBE_AUTOC_LMS_10G_LINK_NO_AN | IXGBE_AUTOC_FLU;

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_AUTOC, reg_data);

	IXGBE_WRITE_FLUSH(&adapter->hw);

	msleep(10);

	usleep_range(10000, 20000);



	/* Disable Atlas Tx lanes; re-enabled in reset path */

	if (hw->mac.type == ixgbe_mac_82598EB) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE