bcm43xx: Port patches to d80211
Subsystems (3)
cover bcm43xx: Port patches to d80211
Hi John,
Please apply this series to wireless-dev.
This ports various patches from bcm43xx-softmac to bcm43xx-d80211.
--
PATCH 1/4 bcm43xx: Port new locking scheme to d80211
Port the new locking scheme from bcm43xx-softmac to bcm43xx-d80211.
drivers/net/wireless/d80211/bcm43xx/bcm43xx.h +68 -34
@@ -649,6 +649,17 @@ unsigned int promisc:1; }; +/* Driver initialization status. */ +enum { + BCM43xx_STAT_UNINIT,/* Uninitialized. */ + BCM43xx_STAT_INITIALIZING,/* init_board() in progress. */ + BCM43xx_STAT_INITIALIZED,/* Fully operational. */ + BCM43xx_STAT_SHUTTINGDOWN,/* free_board() in progress. */ + BCM43xx_STAT_RESTARTING,/* controller_restart() called. */ +}; +#define bcm43xx_status (bcm) atomic_read(&(bcm)->init_status) +#define bcm43xx_set_status (bcm, stat) atomic_set(&(bcm)->init_status, (stat)) +struct bcm43xx_private {struct ieee80211_hw *ieee;struct ieee80211_low_level_stats ieee_stats;
@@ -659,18 +670,17 @@void __iomem *mmio_addr; -/* Do not use the lock directly. Use the bcm43xx_lock* helper -* functions, to be MMIO-safe. */ -spinlock_t _lock; - -/* Driver status flags. */ - u32 initialized:1, /* init_board() succeed */ - was_initialized:1, /* for PCI suspend/resume. */ - shutting_down:1, /* free_board() in progress */ +/* Locking, see "theory of locking" text below. */ +spinlock_t irq_lock; +struct mutex mutex; + +/* Driver initialization status BCM43xx_STAT_*** */ +atomic_t init_status; + + u16 was_initialized:1, /* for PCI suspend/resume. */ __using_pio:1, /* Internal, use bcm43xx_using_pio(). */ bad_frames_preempt:1, /* Use "Bad Frames Preemption" (default off) */ reg124_set_0x4:1, /* Some variable to keep track of IRQ stuff. */ - powersaving:1, /* TRUE if we are in PowerSaving mode. FALSE otherwise. */ short_preamble:1, /* TRUE, if short preamble is enabled. */ short_slot:1, /* TRUE, if short slot timing is enabled. */ firmware_norelease:1; /* Do not release the firmware. Used on suspend. */
@@ -738,7 +748,7 @@struct tasklet_struct isr_tasklet;/* Periodic tasks */ -struct timer_list periodic_tasks; +struct work_struct periodic_work;unsigned int periodic_state;struct work_struct restart_work;
@@ -766,21 +776,55 @@#endif }; -/* bcm43xx_(un)lock() protect struct bcm43xx_private. -* Note that _NO_ MMIO writes are allowed. If you want to -* write to the device through MMIO in the critical section, use -* the *_mmio lock functions. -* MMIO read-access is allowed, though. -*/ -#define bcm43xx_lock (bcm, flags) spin_lock_irqsave(&(bcm)->_lock, flags) -#define bcm43xx_unlock (bcm, flags) spin_unlock_irqrestore(&(bcm)->_lock, flags) -/* bcm43xx_(un)lock_mmio() protect struct bcm43xx_private and MMIO. -* MMIO write-access to the device is allowed. -* All MMIO writes are flushed on unlock, so it is guaranteed to not -* interfere with other threads writing MMIO registers. + +/* *** THEORY OF LOCKING *** +* +* We have two different locks in the bcm43xx driver. +* => bcm->mutex: General sleeping mutex. Protects struct bcm43xx_private +* and the device registers. +* => bcm->irq_lock: IRQ spinlock. Protects against IRQ handler concurrency. +* +* We have three types of helper function pairs to utilize these locks. +* (Always use the helper functions.) +* 1) bcm43xx_{un}lock_noirq(): +* Takes bcm->mutex. Does _not_ protect against IRQ concurrency, +* so it is almost always unsafe, if device IRQs are enabled. +* So only use this, if device IRQs are masked. +* Locking may sleep. +* You can sleep within the critical section. +* 2) bcm43xx_{un}lock_irqonly(): +* Takes bcm->irq_lock. Does _not_ protect against +* bcm43xx_lock_noirq() critical sections. +* Does only protect against the IRQ handler path and other +* irqonly() critical sections. +* Locking does not sleep. +* You must not sleep within the critical section. +* 3) bcm43xx_{un}lock_irqsafe(): +* This is the cummulative lock and takes both, mutex and irq_lock. +* Protects against noirq() and irqonly() critical sections (and +* the IRQ handler path). +* Locking may sleep. +* You must not sleep within the critical section. */ -#define bcm43xx_lock_mmio (bcm, flags) bcm43xx_lock(bcm, flags) -#define bcm43xx_unlock_mmio (bcm, flags) do { mmiowb(); bcm43xx_unlock(bcm, flags); } while (0) + +/* Lock type 1 */ +#define bcm43xx_lock_noirq (bcm) mutex_lock(&(bcm)->mutex) +#define bcm43xx_unlock_noirq (bcm) mutex_unlock(&(bcm)->mutex) +/* Lock type 2 */ +#define bcm43xx_lock_irqonly (bcm, flags) \ + spin_lock_irqsave(&(bcm)->irq_lock, flags) +#define bcm43xx_unlock_irqonly (bcm, flags) \ + spin_unlock_irqrestore(&(bcm)->irq_lock, flags) +/* Lock type 3 */ +#define bcm43xx_lock_irqsafe (bcm, flags) do { \ + bcm43xx_lock_noirq(bcm); \ + bcm43xx_lock_irqonly(bcm, flags); \ + } while (0) +#define bcm43xx_unlock_irqsafe (bcm, flags) do { \ + bcm43xx_unlock_irqonly(bcm, flags); \ + bcm43xx_unlock_noirq(bcm); \ + } while (0) +static inline struct bcm43xx_private *bcm43xx_priv (struct net_device *dev)
@@ -848,16 +892,6 @@return &(bcm->core_80211_ext[bcm->current_80211_core_idx].radio); } -/* Are we running in init_board() context? */ -static inline -int bcm43xx_is_initializing (struct bcm43xx_private *bcm) -{ -if (bcm->initialized) -return 0 ; -if (bcm->shutting_down) -return 0 ; -return 1 ; -}static inline struct bcm43xx_lopair * bcm43xx_get_lopair(struct bcm43xx_phyinfo *phy,
drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c +17 -16
@@ -77,8 +77,8 @@down (&big_buffer_sem); -bcm43xx_lock_mmio (bcm, flags); -if (!bcm->initialized) { +bcm43xx_lock_irqsafe (bcm, flags); +if (bcm43xx_status (bcm) != BCM43xx_STAT_INITIALIZED) {fappend ("Board not initialized.\n" ); goto out; }
@@ -121,7 +121,7 @@fappend ("\n" ); out: -bcm43xx_unlock_mmio (bcm, flags); +bcm43xx_unlock_irqsafe (bcm, flags); res =simple_read_from_buffer (userbuf, count, ppos, buf, pos);up (&big_buffer_sem);return res;
@@ -159,8 +159,8 @@unsigned long flags;down (&big_buffer_sem); -bcm43xx_lock_mmio (bcm, flags); -if (!bcm->initialized) { +bcm43xx_lock_irqsafe (bcm, flags); +if (bcm43xx_status (bcm) != BCM43xx_STAT_INITIALIZED) {fappend ("Board not initialized.\n" ); goto out; }
@@ -169,7 +169,7 @@fappend ("boardflags: 0x%04x\n" , bcm->sprom.boardflags); out: -bcm43xx_unlock_mmio (bcm, flags); +bcm43xx_unlock_irqsafe (bcm, flags); res =simple_read_from_buffer (userbuf, count, ppos, buf, pos);up (&big_buffer_sem);return res;
@@ -188,8 +188,8 @@u64 tsf;down (&big_buffer_sem); -bcm43xx_lock_mmio (bcm, flags); -if (!bcm->initialized) { +bcm43xx_lock_irqsafe (bcm, flags); +if (bcm43xx_status (bcm) != BCM43xx_STAT_INITIALIZED) {fappend ("Board not initialized.\n" ); goto out; }
@@ -199,7 +199,7 @@ (unsigned int)(tsf & 0xFFFFFFFFULL)); out: -bcm43xx_unlock_mmio (bcm, flags); +bcm43xx_unlock_irqsafe (bcm, flags); res =simple_read_from_buffer (userbuf, count, ppos, buf, pos);up (&big_buffer_sem);return res;
@@ -221,8 +221,8 @@ res = -EFAULT ; goto out_up; } -bcm43xx_lock_mmio (bcm, flags); -if (!bcm->initialized) { +bcm43xx_lock_irqsafe (bcm, flags); +if (bcm43xx_status (bcm) != BCM43xx_STAT_INITIALIZED) { printk(KERN_INFO PFX "debugfs: Board not initialized.\n"); res = -EFAULT ; goto out_unlock;
@@ -233,10 +233,11 @@ goto out_unlock; }bcm43xx_tsf_write (bcm, tsf); +mmiowb (); res = buf_size; out_unlock: -bcm43xx_unlock_mmio (bcm, flags); +bcm43xx_unlock_irqsafe (bcm, flags); out_up:up (&big_buffer_sem);return res;
@@ -257,7 +258,7 @@int i, cnt, j =0 ;down (&big_buffer_sem); -bcm43xx_lock (bcm, flags); +bcm43xx_lock_irqsafe (bcm, flags);fappend ("Last %d logged xmitstatus blobs (Latest first):\n\n" , BCM43xx_NR_LOGGED_XMITSTATUS);
@@ -293,14 +294,14 @@ i = BCM43xx_NR_LOGGED_XMITSTATUS -1 ; } -bcm43xx_unlock (bcm, flags); +bcm43xx_unlock_irqsafe (bcm, flags); res =simple_read_from_buffer (userbuf, count, ppos, buf, pos); -bcm43xx_lock (bcm, flags); +bcm43xx_lock_irqsafe (bcm, flags);if (*ppos == pos) {/* Done. Drop the copied data. */ e->xmitstatus_printing =0 ; } -bcm43xx_unlock (bcm, flags); +bcm43xx_unlock_irqsafe (bcm, flags);up (&big_buffer_sem);return res; }
drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.c +2 -2
@@ -51,12 +51,12 @@struct bcm43xx_private *bcm = led->bcm;unsigned long flags; -bcm43xx_lock_mmio (bcm, flags); +bcm43xx_lock_irqonly (bcm, flags);if (led->blink_interval) {bcm43xx_led_changestate (led);mod_timer (&led->blink_timer, jiffies + led->blink_interval); } -bcm43xx_unlock_mmio (bcm, flags); +bcm43xx_unlock_irqonly (bcm, flags); } static void bcm43xx_led_blink_start(struct bcm43xx_led *led,
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c +71 -78
419 lines not on this page · raw message
drivers/net/wireless/d80211/bcm43xx/bcm43xx_sysfs.c +16 -22
@@ -120,12 +120,12 @@ GFP_KERNEL);if (!sprom)return -ENOMEM ; -bcm43xx_lock_mmio (bcm, flags); -assert (bcm->initialized); +bcm43xx_lock_irqsafe (bcm, flags); err =bcm43xx_sprom_read (bcm, sprom);if (!err) err =sprom2hex (sprom, buf,PAGE_SIZE ); -bcm43xx_unlock_mmio (bcm, flags); +mmiowb (); +bcm43xx_unlock_irqsafe (bcm, flags);kfree (sprom);return err;
@@ -150,10 +150,10 @@ err =hex2sprom (sprom, buf, count);if (err) goto out_kfree; -bcm43xx_lock_mmio (bcm, flags); -assert (bcm->initialized); +bcm43xx_lock_irqsafe (bcm, flags); err =bcm43xx_sprom_write (bcm, sprom); -bcm43xx_unlock_mmio (bcm, flags); +mmiowb (); +bcm43xx_unlock_irqsafe (bcm, flags); out_kfree:kfree (sprom);
@@ -170,15 +170,13 @@ char *buf) {struct bcm43xx_private *bcm =dev_to_bcm (dev); -unsigned long flags;int err;ssize_t count =0 ;if (!capable (CAP_NET_ADMIN ))return -EPERM ; -bcm43xx_lock (bcm, flags); -assert (bcm->initialized); +bcm43xx_lock_noirq (bcm);switch (bcm43xx_current_radio (bcm)->interfmode) {case BCM43xx_RADIO_INTERFMODE_NONE:
@@ -195,7 +193,7 @@ } err =0 ; -bcm43xx_unlock (bcm, flags); +bcm43xx_unlock_noirq (bcm);return err ? err : count;
@@ -231,16 +229,15 @@return -EINVAL ; } -bcm43xx_lock_mmio (bcm, flags); -assert (bcm->initialized); +bcm43xx_lock_irqsafe (bcm, flags); err =bcm43xx_radio_set_interference_mitigation (bcm, mode);if (err) { printk(KERN_ERR PFX "Interference Mitigation not " "supported by device\n"); } - -bcm43xx_unlock_mmio (bcm, flags); +mmiowb (); +bcm43xx_unlock_irqsafe (bcm, flags);return err ? err : count; }
@@ -254,15 +251,13 @@ char *buf) {struct bcm43xx_private *bcm =dev_to_bcm (dev); -unsigned long flags;int err;ssize_t count;if (!capable (CAP_NET_ADMIN ))return -EPERM ; -bcm43xx_lock (bcm, flags); -assert (bcm->initialized); +bcm43xx_lock_noirq (bcm);if (bcm->short_preamble) count =snprintf (buf,PAGE_SIZE ,"1 (Short Preamble enabled)\n" );
@@ -270,7 +265,7 @@ count =snprintf (buf,PAGE_SIZE ,"0 (Short Preamble disabled)\n" ); err =0 ; -bcm43xx_unlock (bcm, flags); +bcm43xx_unlock_noirq (bcm);return err ? err : count; }
@@ -290,13 +285,12 @@ value =get_boolean (buf, count);if (value <0 )return value; -bcm43xx_lock (bcm, flags); -assert (bcm->initialized); +bcm43xx_lock_irqsafe (bcm, flags); bcm->short_preamble = !!value; err =0 ; -bcm43xx_unlock (bcm, flags); +bcm43xx_unlock_irqsafe (bcm, flags);return err ? err : count; }
@@ -310,7 +304,7 @@struct device *dev = &bcm->pci_dev->dev;int err; -assert (bcm->initialized); +assert (bcm43xx_status (bcm) == BCM43xx_STAT_INITIALIZED); err =device_create_file (dev, &dev_attr_sprom);if (err)
drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.c +1 -1
@@ -1648,7 +1648,7 @@void bcm43xx_phy_lo_g_measure (struct bcm43xx_private *bcm) {static const u8 pairorder[10 ] = {3 ,1 ,5 ,7 ,9 ,2 ,0 ,4 ,6 ,8 }; -const int is_initializing =bcm43xx_is_initializing (bcm); +const int is_initializing = (bcm43xx_status (bcm) == BCM43xx_STAT_INITIALIZING);struct bcm43xx_phyinfo *phy =bcm43xx_current_phy (bcm);struct bcm43xx_radioinfo *radio =bcm43xx_current_radio (bcm);u16 h, i, oldi =0 , j;
drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.c +2 -3
@@ -257,7 +257,7 @@struct bcm43xx_pio_txpacket *packet, *tmp_packet;int err; -bcm43xx_lock_mmio (bcm, flags); +bcm43xx_lock_irqonly (bcm, flags);list_for_each_entry_safe (packet, tmp_packet, &queue->txqueue, list) {/* Try to transmit the packet. This can fail, if * the device queue is full. In case of failure, the
@@ -270,7 +270,7 @@if (err)break ; } -bcm43xx_unlock_mmio (bcm, flags); +bcm43xx_unlock_irqonly (bcm, flags); }static void setup_txqueues (struct bcm43xx_pioqueue *queue)
@@ -339,7 +339,6 @@struct bcm43xx_pio_txpacket *packet, *tmp_packet;ieee80211_netif_oper (queue->bcm->net_dev,NETIF_DETACH ); -assert (queue->bcm->shutting_down);tasklet_disable (&queue->txtask);list_for_each_entry_safe (packet, tmp_packet, &queue->txrunning, list)
--
PATCH 2/4 bcm43xx: Port preemptible-periodic-work to d80211
In reply to Michael BueschPort the preemptible periodic work patch from bcm43xx-softmac to bcm43xx-d80211.
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c +86 -11
@@ -529,11 +529,21 @@return old_mask; } +/* Synchronize IRQ top- and bottom-half. +* IRQs must be masked before calling this. +* This must not be called with the irq_lock held. +*/ +static void bcm43xx_synchronize_irq (struct bcm43xx_private *bcm) +{ +synchronize_irq (bcm->irq); +tasklet_disable (&bcm->isr_tasklet); +} +/* Make sure we don't receive more data from the device. */ static int bcm43xx_disable_interrupts_sync (struct bcm43xx_private *bcm,u32 *oldstate) { -u32 old;unsigned long flags; +u32 old;bcm43xx_lock_irqonly (bcm, flags);if (unlikely (bcm43xx_status (bcm) != BCM43xx_STAT_INITIALIZED)) {
@@ -541,8 +551,9 @@return -EBUSY ; } old =bcm43xx_interrupt_disable (bcm, BCM43xx_IRQ_ALL); -tasklet_disable (&bcm->isr_tasklet);bcm43xx_unlock_irqonly (bcm, flags); +bcm43xx_synchronize_irq (bcm); +if (oldstate) *oldstate = old;
@@ -2951,14 +2962,10 @@//TODO for APHY (temperature?) } -static void bcm43xx_periodic_work_handler (void *d) +static void do_periodic_work (struct bcm43xx_private *bcm) { -struct bcm43xx_private *bcm = d; -unsigned long flags;unsigned int state; -bcm43xx_lock_irqsafe (bcm, flags); - state = bcm->periodic_state;if (state %8 ==0 )bcm43xx_periodic_every120sec (bcm);
@@ -2966,13 +2973,79 @@bcm43xx_periodic_every60sec (bcm);if (state %2 ==0 )bcm43xx_periodic_every30sec (bcm); -bcm43xx_periodic_every15sec (bcm); +if (state %1 ==0 ) +bcm43xx_periodic_every15sec (bcm); bcm->periodic_state = state +1 ;schedule_delayed_work (&bcm->periodic_work,HZ *15 ); +} -mmiowb (); -bcm43xx_unlock_irqsafe (bcm, flags); +/* Estimate a "Badness" value based on the periodic work +* state-machine state. "Badness" is worse (bigger), if the +* periodic work will take longer. +*/ +static int estimate_periodic_work_badness (unsigned int state) +{ +int badness =0 ; + +if (state %8 ==0 )/* every 120 sec */ + badness +=10 ; +if (state %4 ==0 )/* every 60 sec */ + badness +=5 ; +if (state %2 ==0 )/* every 30 sec */ + badness +=1 ; +if (state %1 ==0 )/* every 15 sec */ + badness +=1 ; + +#define BADNESS_LIMIT 4 +return badness; +} + +static void bcm43xx_periodic_work_handler (void *d) +{ +struct bcm43xx_private *bcm = d; +unsigned long flags; +u32 savedirqs =0 ; +int badness; + + badness =estimate_periodic_work_badness (bcm->periodic_state); +if (badness >BADNESS_LIMIT ) { +/* Periodic work will take a long time, so we want it to +* be preemtible. +*/ +bcm43xx_lock_irqonly (bcm, flags); +netif_stop_queue (bcm->net_dev); +if (bcm43xx_using_pio (bcm)) +bcm43xx_pio_freeze_txqueues (bcm); + savedirqs =bcm43xx_interrupt_disable (bcm, BCM43xx_IRQ_ALL); +bcm43xx_unlock_irqonly (bcm, flags); +bcm43xx_lock_noirq (bcm); +bcm43xx_synchronize_irq (bcm); + }else { +/* Periodic work should take short time, so we want low +* locking overhead. +*/ +bcm43xx_lock_irqsafe (bcm, flags); + } + +do_periodic_work (bcm); + +if (badness >BADNESS_LIMIT ) { +bcm43xx_lock_irqonly (bcm, flags); +if (likely (bcm43xx_status (bcm) == BCM43xx_STAT_INITIALIZED)) { +tasklet_enable (&bcm->isr_tasklet); +bcm43xx_interrupt_enable (bcm, savedirqs); +if (bcm43xx_using_pio (bcm)) +bcm43xx_pio_thaw_txqueues (bcm); + } +netif_wake_queue (bcm->net_dev); +mmiowb (); +bcm43xx_unlock_irqonly (bcm, flags); +bcm43xx_unlock_noirq (bcm); + }else { +mmiowb (); +bcm43xx_unlock_irqsafe (bcm, flags); + } }static void bcm43xx_periodic_tasks_delete (struct bcm43xx_private *bcm)
@@ -4178,9 +4251,11 @@static int bcm43xx_net_stop (struct net_device *net_dev) {struct bcm43xx_private *bcm =bcm43xx_priv (net_dev); +int err;if (bcm43xx_status (bcm) == BCM43xx_STAT_INITIALIZED) { -bcm43xx_disable_interrupts_sync (bcm,NULL ); + err =bcm43xx_disable_interrupts_sync (bcm,NULL ); +assert (!err);bcm43xx_free_board (bcm); }
drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.c +6 -1
@@ -1410,7 +1410,10 @@u16 bcm43xx_phy_lo_g_deviation_subval (struct bcm43xx_private *bcm,u16 control) {struct bcm43xx_phyinfo *phy =bcm43xx_current_phy (bcm); +u16 ret; +unsigned long flags; +local_irq_save (flags);if (phy->connected) {bcm43xx_phy_write (bcm,0x15 ,0xE300 ); control <<=8 ;
@@ -1430,8 +1433,10 @@bcm43xx_phy_write (bcm,0x0015 , control |0xFFE0 );udelay (8 ); } + ret =bcm43xx_phy_read (bcm,0x002D ); +local_irq_restore (flags); -return bcm43xx_phy_read (bcm,0x002D ); +return ret; }static u32 bcm43xx_phy_lo_g_singledeviation (struct bcm43xx_private *bcm,u16 control)
drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.c +36 -0
@@ -258,6 +258,9 @@int err;bcm43xx_lock_irqonly (bcm, flags); +if (queue->tx_frozen) + goto out_unlock; +list_for_each_entry_safe (packet, tmp_packet, &queue->txqueue, list) {/* Try to transmit the packet. This can fail, if * the device queue is full. In case of failure, the
@@ -270,6 +273,7 @@if (err)break ; } +out_unlock:bcm43xx_unlock_irqonly (bcm, flags); }
@@ -589,3 +593,35 @@ }bcm43xx_rx (queue->bcm, skb, rxhdr); } + +void bcm43xx_pio_freeze_txqueues (struct bcm43xx_private *bcm) +{ +struct bcm43xx_pio *pio; + +assert (bcm43xx_using_pio (bcm)); + pio =bcm43xx_current_pio (bcm); + pio->queue0->tx_frozen =1 ; + pio->queue1->tx_frozen =1 ; + pio->queue2->tx_frozen =1 ; + pio->queue3->tx_frozen =1 ; +} + +void bcm43xx_pio_thaw_txqueues (struct bcm43xx_private *bcm) +{ +struct bcm43xx_pio *pio; + +assert (bcm43xx_using_pio (bcm)); + pio =bcm43xx_current_pio (bcm); + pio->queue0->tx_frozen =0 ; + pio->queue1->tx_frozen =0 ; + pio->queue2->tx_frozen =0 ; + pio->queue3->tx_frozen =0 ; +if (!list_empty (&pio->queue0->txqueue)) +tasklet_schedule (&pio->queue0->txtask); +if (!list_empty (&pio->queue1->txqueue)) +tasklet_schedule (&pio->queue1->txtask); +if (!list_empty (&pio->queue2->txqueue)) +tasklet_schedule (&pio->queue2->txtask); +if (!list_empty (&pio->queue3->txqueue)) +tasklet_schedule (&pio->queue3->txtask); +}
drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.h +12 -1
@@ -52,6 +52,7 @@u16 mmio_base; u8 tx_suspended:1, + tx_frozen:1, need_workarounds:1; /* Workarounds needed for core.rev < 3 *//* Adjusted size of the device internal TX buffer. */
@@ -106,8 +107,10 @@ struct bcm43xx_xmitstatus *status);void bcm43xx_pio_get_tx_stats (struct bcm43xx_private *bcm,struct ieee80211_tx_queue_stats *stats); -void bcm43xx_pio_rx (struct bcm43xx_pioqueue *queue); +/* Suspend (freeze) the TX tasklet (software level). */ +void bcm43xx_pio_freeze_txqueues (struct bcm43xx_private *bcm); +void bcm43xx_pio_thaw_txqueues (struct bcm43xx_private *bcm);#else /* CONFIG_BCM43XX_D80211_PIO */
@@ -141,6 +144,14 @@void bcm43xx_pio_rx (struct bcm43xx_pioqueue *queue) { } +static inline +void bcm43xx_pio_freeze_txqueues (struct bcm43xx_private *bcm) +{ +} +static inline +void bcm43xx_pio_thaw_txqueues (struct bcm43xx_private *bcm) +{ +}#endif /* CONFIG_BCM43XX_D80211_PIO */ #endif /* BCM43xx_PIO_H_ */
--
PATCH 3/4 bcm43xx: Port suspend-mac-in-long-pwork from d80211
In reply to Michael BueschPort the Suspend MAC In Long Periodic Work patch from bcm43xx-softmac to bcm43xx-d80211.
drivers/net/wireless/d80211/bcm43xx/bcm43xx.h +2 -0
@@ -743,6 +743,8 @@u32 irq_savedstate;/* Link Quality calculation context. */ struct bcm43xx_noise_calculation noisecalc; +/* if > 0 MAC is suspended. if == 0 MAC is enabled. */ +int mac_suspended;/* Interrupt Service Routine tasklet (bottom-half) */ struct tasklet_struct isr_tasklet;
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c +32 -19
83 lines not on this page · raw message
--
PATCH 4/4 bcm43xx: Port PIO fixes to d80211
In reply to Michael BueschPort the PIO fixes from bcm43xx-softmac to bcm43xx-d80211.
drivers/net/wireless/d80211/bcm43xx/bcm43xx_dma.h +8 -0
@@ -223,6 +223,14 @@void bcm43xx_dma_rx (struct bcm43xx_dmaring *ring) { } +static inline +void bcm43xx_dma_tx_suspend (struct bcm43xx_dmaring *ring) +{ +} +static inline +void bcm43xx_dma_tx_resume (struct bcm43xx_dmaring *ring) +{ +}#endif /* CONFIG_BCM43XX_D80211_DMA */ #endif /* BCM43xx_DMA_H_ */
drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.c +78 -35
242 lines not on this page · raw message
drivers/net/wireless/d80211/bcm43xx/bcm43xx_pio.h +16 -3
@@ -14,8 +14,8 @@#define BCM43xx_PIO_RXCTL 0x08#define BCM43xx_PIO_RXDATA 0x0A -#define BCM43xx_PIO_TXCTL_WRITEHI (1 << 0) -#define BCM43xx_PIO_TXCTL_WRITELO (1 << 1) +#define BCM43xx_PIO_TXCTL_WRITELO (1 << 0) +#define BCM43xx_PIO_TXCTL_WRITEHI (1 << 1)#define BCM43xx_PIO_TXCTL_COMPLETE (1 << 2)#define BCM43xx_PIO_TXCTL_INIT (1 << 3)#define BCM43xx_PIO_TXCTL_SUSPEND (1 << 7)
@@ -41,7 +41,7 @@struct bcm43xx_pio_txpacket {struct bcm43xx_pioqueue *queue;struct sk_buff *skb; -struct ieee80211_tx_control *ctl; +struct ieee80211_tx_status txstat;struct list_head list; };
@@ -94,6 +94,7 @@ u16 offset, u16 value) {bcm43xx_write16 (queue->bcm, queue->mmio_base + offset, value); +mmiowb (); }
@@ -108,6 +109,10 @@void bcm43xx_pio_get_tx_stats (struct bcm43xx_private *bcm,struct ieee80211_tx_queue_stats *stats);void bcm43xx_pio_rx (struct bcm43xx_pioqueue *queue); + +/* Suspend TX queue in hardware. */ +void bcm43xx_pio_tx_suspend (struct bcm43xx_pioqueue *queue); +void bcm43xx_pio_tx_resume (struct bcm43xx_pioqueue *queue);/* Suspend (freeze) the TX tasklet (software level). */ void bcm43xx_pio_freeze_txqueues (struct bcm43xx_private *bcm);void bcm43xx_pio_thaw_txqueues (struct bcm43xx_private *bcm);
@@ -145,6 +150,14 @@ { }static inline +void bcm43xx_pio_tx_suspend (struct bcm43xx_pioqueue *queue) +{ +} +static inline +void bcm43xx_pio_tx_resume (struct bcm43xx_pioqueue *queue) +{ +} +static inline void bcm43xx_pio_freeze_txqueues (struct bcm43xx_private *bcm) { }
--