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

Commit 7f230735 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Fix missed MSI workaround 



This patch fixes a minor counter initialization bug and makes the MSI
workaround slightly more efficient by attempting to service pending
interrupts before applying the workaround.

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

drivers/net/ethernet/broadcom/tg3.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -8105,7 +8105,7 @@ static void tg3_rings_reset(struct tg3 *tp) 
				tw32_mailbox(tp->napi[i].prodmbox, 0);

				tw32_mailbox(tp->napi[i].prodmbox, 0);

			tw32_rx_mbox(tp->napi[i].consmbox, 0);

			tw32_rx_mbox(tp->napi[i].consmbox, 0);

			tw32_mailbox_f(tp->napi[i].int_mbox, 1);

			tw32_mailbox_f(tp->napi[i].int_mbox, 1);

			tp->napi[0].chk_msi_cnt = 0;

			tp->napi[i].chk_msi_cnt = 0;

			tp->napi[i].last_rx_cons = 0;

			tp->napi[i].last_rx_cons = 0;

			tp->napi[i].last_tx_cons = 0;

			tp->napi[i].last_tx_cons = 0;

		}

		}
@@ -9185,8 +9185,7 @@ static void tg3_chk_missed_msi(struct tg3 *tp) 
					tnapi->chk_msi_cnt++;

					tnapi->chk_msi_cnt++;

					return;

					return;

				}

				}

				tw32_mailbox(tnapi->int_mbox,

				tg3_msi(0, tnapi);

					     tnapi->last_tag << 24);

			}

			}

		}

		}

		tnapi->chk_msi_cnt = 0;

		tnapi->chk_msi_cnt = 0;