Skip to content

Commit

Permalink
b43legacy: reinit on too many PHY TX errors
Browse files Browse the repository at this point in the history
Restart the hardware on too many PHY TX errors. A thousand PHY TX errors
per 15 seconds means we won't be able to recover for sure.

Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Stefano Brivio authored and David S. Miller committed Jan 28, 2008
1 parent 5be3bda commit a293ee9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
5 changes: 5 additions & 0 deletions drivers/net/wireless/b43legacy/b43legacy.h
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@
#define B43legacy_DEFAULT_SHORT_RETRY_LIMIT 7
#define B43legacy_DEFAULT_LONG_RETRY_LIMIT 4

#define B43legacy_PHY_TX_BADNESS_LIMIT 1000

/* Max size of a security key */
#define B43legacy_SEC_KEYSIZE 16
/* Security algorithms. */
Expand Down Expand Up @@ -511,6 +513,9 @@ struct b43legacy_phy {
u16 lofcal;

u16 initval;

/* PHY TX errors counter. */
atomic_t txerr_cnt;
};

/* Data structures for DMA transmission, per 80211 core. */
Expand Down
15 changes: 14 additions & 1 deletion drivers/net/wireless/b43legacy/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1221,8 +1221,15 @@ static void b43legacy_interrupt_tasklet(struct b43legacy_wldev *dev)
if (unlikely(reason & B43legacy_IRQ_MAC_TXERR))
b43legacyerr(dev->wl, "MAC transmission error\n");

if (unlikely(reason & B43legacy_IRQ_PHY_TXERR))
if (unlikely(reason & B43legacy_IRQ_PHY_TXERR)) {
b43legacyerr(dev->wl, "PHY transmission error\n");
rmb();
if (unlikely(atomic_dec_and_test(&dev->phy.txerr_cnt))) {
b43legacyerr(dev->wl, "Too many PHY TX errors, "
"restarting the controller\n");
b43legacy_controller_restart(dev, "PHY TX errors");
}
}

if (unlikely(merged_dma_reason & (B43legacy_DMAIRQ_FATALMASK |
B43legacy_DMAIRQ_NONFATALMASK))) {
Expand Down Expand Up @@ -2094,6 +2101,9 @@ static int b43legacy_chip_init(struct b43legacy_wldev *dev)
b43legacy_write16(dev, B43legacy_MMIO_POWERUP_DELAY,
dev->dev->bus->chipco.fast_pwrup_delay);

/* PHY TX errors counter. */
atomic_set(&phy->txerr_cnt, B43legacy_PHY_TX_BADNESS_LIMIT);

B43legacy_WARN_ON(err != 0);
b43legacydbg(dev->wl, "Chip initialized\n");
out:
Expand Down Expand Up @@ -2138,6 +2148,9 @@ static void b43legacy_periodic_every30sec(struct b43legacy_wldev *dev)
static void b43legacy_periodic_every15sec(struct b43legacy_wldev *dev)
{
b43legacy_phy_xmitpower(dev); /* FIXME: unless scanning? */

atomic_set(&dev->phy.txerr_cnt, B43legacy_PHY_TX_BADNESS_LIMIT);
wmb();
}

static void do_periodic_work(struct b43legacy_wldev *dev)
Expand Down

0 comments on commit a293ee9

Please sign in to comment.