From mboxrd@z Thu Jan 1 00:00:00 1970 From: Larry Finger Subject: [PATCH] bcm43xx: Drain TX status before starting IRQs Date: Mon, 06 Nov 2006 09:45:31 -0600 Message-ID: <454F589B.mailHTM1RAIDJ@lwfinger.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: Michael Buesch , netdev@vger.kernel.org, Bcm43xx-dev@lists.berlios.de, Stefano Brivio Return-path: Received: from ms-smtp-03.rdc-kc.rr.com ([24.94.166.129]:50400 "EHLO ms-smtp-03.rdc-kc.rr.com") by vger.kernel.org with ESMTP id S1753248AbWKFPqf (ORCPT ); Mon, 6 Nov 2006 10:46:35 -0500 To: John Linville Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Michael Buesch Drain the Microcode TX-status-FIFO before we enable IRQs. This is required, because the FIFO may still have entries left from a previous run. Those would immediately fire after enabling IRQs and would lead to an oops in the DMA TXstatus handling code. Signed-off-by: Michael Buesch Signed-off-by: Larry Finger --- John, Please apply this to wireless-2.6 and push it to 2.6.19. It has already been sent to -stable for inclusion in 2.6.18.3. This patch replaces one with the same name that was sent by Michael on October 19. It had a bug, fixed in this version, that would lock up certain core revisions. Larry Index: wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c =================================================================== --- wireless-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -1467,6 +1467,23 @@ static void handle_irq_transmit_status(s } } +static void drain_txstatus_queue(struct bcm43xx_private *bcm) +{ + u32 dummy; + + if (bcm->current_core->rev < 5) + return; + /* Read all entries from the microcode TXstatus FIFO + * and throw them away. + */ + while (1) { + dummy = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_0); + if (!dummy) + break; + dummy = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_1); + } +} + static void bcm43xx_generate_noise_sample(struct bcm43xx_private *bcm) { bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x408, 0x7F7F); @@ -3569,6 +3586,7 @@ int bcm43xx_select_wireless_core(struct bcm43xx_macfilter_clear(bcm, BCM43xx_MACFILTER_ASSOC); bcm43xx_macfilter_set(bcm, BCM43xx_MACFILTER_SELF, (u8 *)(bcm->net_dev->dev_addr)); bcm43xx_security_init(bcm); + drain_txstatus_queue(bcm); ieee80211softmac_start(bcm->net_dev); /* Let's go! Be careful after enabling the IRQs.