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

Commit 59f01183 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwl3945: fix wakeup interrupt 



We have only 5 tx queues on 3945, updating il->txq[5] results in
writing random value to HBUS_TARG_WRPTR register.

Additionally use spin lock to protect txq->write_ptr and
txq->need_update fields also modified in TX path.

Tested-by: default avatarPedro Francisco <pedrogfrancisco@gmail.com>
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e3c91683

drivers/net/wireless/iwlegacy/3945-mac.c

+3 −1
Original line number Diff line number Diff line
@@ -1495,12 +1495,14 @@ il3945_irq_tasklet(struct il_priv *il) 
	if (inta & CSR_INT_BIT_WAKEUP) {

		D_ISR("Wakeup interrupt\n");

		il_rx_queue_update_write_ptr(il, &il->rxq);



		spin_lock_irqsave(&il->lock, flags);

		il_txq_update_write_ptr(il, &il->txq[0]);

		il_txq_update_write_ptr(il, &il->txq[1]);

		il_txq_update_write_ptr(il, &il->txq[2]);

		il_txq_update_write_ptr(il, &il->txq[3]);

		il_txq_update_write_ptr(il, &il->txq[4]);

		il_txq_update_write_ptr(il, &il->txq[5]);

		spin_unlock_irqrestore(&il->lock, flags);



		il->isr_stats.wakeup++;

		handled |= CSR_INT_BIT_WAKEUP;