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

Commit da7add32 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc 



Ben Hutchings says:

====================
Daniel Pieczko fixed two bugs in reset handling that particularly
affected the new SFC9120 controller.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 87397fe1 b2d32f03

drivers/net/ethernet/sfc/mcdi.c

+5 −5
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 


/* A reboot/assertion causes the MCDI status word to be set after the

 * command word is set or a REBOOT event is sent. If we notice a reboot

 * via these mechanisms then wait 20ms for the status word to be set.

 * via these mechanisms then wait 250ms for the status word to be set.

 */

#define MCDI_STATUS_DELAY_US		100

#define MCDI_STATUS_DELAY_COUNT		200

#define MCDI_STATUS_DELAY_COUNT		2500

#define MCDI_STATUS_SLEEP_MS						\

	(MCDI_STATUS_DELAY_US * MCDI_STATUS_DELAY_COUNT / 1000)
@@ -800,9 +800,6 @@ static void efx_mcdi_ev_death(struct efx_nic *efx, int rc) 
	} else {

		int count;



		/* Nobody was waiting for an MCDI request, so trigger a reset */

		efx_schedule_reset(efx, RESET_TYPE_MC_FAILURE);



		/* Consume the status word since efx_mcdi_rpc_finish() won't */

		for (count = 0; count < MCDI_STATUS_DELAY_COUNT; ++count) {

			if (efx_mcdi_poll_reboot(efx))
@@ -810,6 +807,9 @@ static void efx_mcdi_ev_death(struct efx_nic *efx, int rc) 
			udelay(MCDI_STATUS_DELAY_US);

		}

		mcdi->new_epoch = true;



		/* Nobody was waiting for an MCDI request, so trigger a reset */

		efx_schedule_reset(efx, RESET_TYPE_MC_FAILURE);

	}



	spin_unlock(&mcdi->iface_lock);