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

Commit 3aa1cdf8 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Fix int selftest for recent devices. 



This patch fixes interrupt selftest failures for recent devices (57765,
5717, 5718. 5719, 5720) by disabling MSI one-shot mode and applying the
status tag workaround to the selftest code.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d53fa12

drivers/net/tg3.c

+6 −2
Original line number Diff line number Diff line
@@ -9183,7 +9183,7 @@ static int tg3_test_interrupt(struct tg3 *tp) 
	 * Turn off MSI one shot mode.  Otherwise this test has no

	 * observable way to know whether the interrupt was delivered.

	 */

	if (tg3_flag(tp, 57765_PLUS) && tg3_flag(tp, USING_MSI)) {

	if (tg3_flag(tp, 57765_PLUS)) {

		val = tr32(MSGINT_MODE) | MSGINT_MODE_ONE_SHOT_DISABLE;

		tw32(MSGINT_MODE, val);

	}
@@ -9211,6 +9211,10 @@ static int tg3_test_interrupt(struct tg3 *tp) 
			break;

		}



		if (tg3_flag(tp, 57765_PLUS) &&

		    tnapi->hw_status->status_tag != tnapi->last_tag)

			tw32_mailbox_f(tnapi->int_mbox, tnapi->last_tag << 24);



		msleep(10);

	}
@@ -9225,7 +9229,7 @@ static int tg3_test_interrupt(struct tg3 *tp) 


	if (intr_ok) {

		/* Reenable MSI one shot mode. */

		if (tg3_flag(tp, 57765_PLUS) && tg3_flag(tp, USING_MSI)) {

		if (tg3_flag(tp, 57765_PLUS)) {

			val = tr32(MSGINT_MODE) & ~MSGINT_MODE_ONE_SHOT_DISABLE;

			tw32(MSGINT_MODE, val);

		}