extern char *nvram_get(char *name);
#endif
-/* Module parameters */
+#if defined(CONFIG_BCM43XX_DMA) && defined(CONFIG_BCM43XX_PIO)
static int modparam_pio;
module_param_named(pio, modparam_pio, int, 0444);
MODULE_PARM_DESC(pio, "enable(1) / disable(0) PIO mode");
+#elif defined(CONFIG_BCM43XX_DMA)
+# define modparam_pio 0
+#elif defined(CONFIG_BCM43XX_PIO)
+# define modparam_pio 1
+#endif
static int modparam_bad_frames_preempt;
module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
{
u32 flags = 0x00040000;
- if ((bcm43xx_core_enabled(bcm)) && (!bcm->pio_mode)) {
+ if ((bcm43xx_core_enabled(bcm)) &&
+ !bcm43xx_using_pio(bcm)) {
//FIXME: Do we _really_ want #ifndef CONFIG_BCM947XX here?
#ifndef CONFIG_BCM947XX
/* reset all used DMA controllers. */
}
//TODO: There are more (unknown) flags to test. see bcm43xx_main.h
- if (bcm->pio_mode)
+ if (bcm43xx_using_pio(bcm))
bcm43xx_pio_handle_xmitstatus(bcm, &stat);
else
bcm43xx_dma_handle_xmitstatus(bcm, &stat);
assert(!(dma_reason[1] & BCM43xx_DMAIRQ_RX_DONE));
assert(!(dma_reason[2] & BCM43xx_DMAIRQ_RX_DONE));
if (dma_reason[0] & BCM43xx_DMAIRQ_RX_DONE) {
- if (bcm->pio_mode)
+ if (bcm43xx_using_pio(bcm))
bcm43xx_pio_rx(bcm->current_core->pio->queue0);
else
bcm43xx_dma_rx(bcm->current_core->dma->rx_ring0);
}
if (dma_reason[3] & BCM43xx_DMAIRQ_RX_DONE) {
if (likely(bcm->current_core->rev < 5)) {
- if (bcm->pio_mode)
+ if (bcm43xx_using_pio(bcm))
bcm43xx_pio_rx(bcm->current_core->pio->queue3);
else
bcm43xx_dma_rx(bcm->current_core->dma->rx_ring1);
bcm->dma_reason[3] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA4_REASON)
& 0x0001dc00;
- if ((bcm->pio_mode) &&
+ if (bcm43xx_using_pio(bcm) &&
(bcm->current_core->rev < 3) &&
(!(reason & BCM43xx_IRQ_PIO_WORKAROUND))) {
/* Apply a PIO specific workaround to the dma_reasons */
value32 |= 0x100000; //FIXME: What's this? Is this correct?
bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value32);
- if (bcm->pio_mode) {
+ if (bcm43xx_using_pio(bcm)) {
bcm43xx_write32(bcm, 0x0210, 0x00000100);
bcm43xx_write32(bcm, 0x0230, 0x00000100);
bcm43xx_write32(bcm, 0x0250, 0x00000100);
if (bcm->current_core->rev >= 5)
bcm43xx_write16(bcm, 0x043C, 0x000C);
- if (!bcm->pio_mode) {
- err = bcm43xx_dma_init(bcm);
- if (err)
- goto err_chip_cleanup;
- } else {
+ if (bcm43xx_using_pio(bcm))
err = bcm43xx_pio_init(bcm);
- if (err)
- goto err_chip_cleanup;
- }
+ else
+ err = bcm43xx_dma_init(bcm);
+ if (err)
+ goto err_chip_cleanup;
bcm43xx_write16(bcm, 0x0612, 0x0050);
bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0416, 0x0050);
bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0414, 0x01F4);
{
int err = -ENODEV;
- if (bcm->pio_mode)
- err = bcm43xx_pio_transfer_txb(bcm, txb);
+ if (bcm43xx_using_pio(bcm))
+ err = bcm43xx_pio_tx(bcm, txb);
else
err = bcm43xx_dma_tx(bcm, txb);
return 0;
}
-static void bcm43xx_init_private(struct bcm43xx_private *bcm,
- struct net_device *net_dev,
- struct pci_dev *pci_dev,
- struct workqueue_struct *wq)
+static int bcm43xx_init_private(struct bcm43xx_private *bcm,
+ struct net_device *net_dev,
+ struct pci_dev *pci_dev,
+ struct workqueue_struct *wq)
{
bcm->ieee = netdev_priv(net_dev);
bcm->softmac = ieee80211_priv(net_dev);
(unsigned long)bcm);
tasklet_disable_nosync(&bcm->isr_tasklet);
if (modparam_pio) {
- bcm->pio_mode = 1;
+ bcm->__using_pio = 1;
} else {
- if (pci_set_dma_mask(pci_dev, DMA_30BIT_MASK) == 0) {
- bcm->pio_mode = 0;
- } else {
+ if (pci_set_dma_mask(pci_dev, DMA_30BIT_MASK)) {
+#ifdef CONFIG_BCM43XX_PIO
printk(KERN_WARNING PFX "DMA not supported. Falling back to PIO.\n");
- bcm->pio_mode = 1;
+ bcm->__using_pio = 1;
+#else
+ printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. "
+ "Recompile the driver with PIO support, please.\n");
+ return -ENODEV;
+#endif /* CONFIG_BCM43XX_PIO */
}
}
bcm->rts_threshold = BCM43xx_DEFAULT_RTS_THRESHOLD;
bcm->ieee->tx_headroom = sizeof(struct bcm43xx_txhdr);
bcm->ieee->set_security = bcm43xx_ieee80211_set_security;
bcm->ieee->hard_start_xmit = bcm43xx_ieee80211_hard_start_xmit;
+
+ return 0;
}
static int __devinit bcm43xx_init_one(struct pci_dev *pdev,
err = -ENOMEM;
goto err_free_netdev;
}
- bcm43xx_init_private(bcm, net_dev, pdev, wq);
+ err = bcm43xx_init_private(bcm, net_dev, pdev, wq);
+ if (err)
+ goto err_destroy_wq;
pci_set_drvdata(pdev, net_dev);
bcm43xx_free_board(bcm);
bcm->firmware_norelease = 0;
bcm43xx_detach_board(bcm);
- bcm43xx_init_private(bcm, net_dev, pci_dev, wq);
+ err = bcm43xx_init_private(bcm, net_dev, pci_dev, wq);
+ if (err)
+ goto failure;
err = bcm43xx_attach_board(bcm);
if (err)
goto failure;
#include <linux/delay.h>
-static inline
-u16 bcm43xx_pio_read(struct bcm43xx_pioqueue *queue,
- u16 offset)
+static void tx_start(struct bcm43xx_pioqueue *queue)
{
- return bcm43xx_read16(queue->bcm, queue->mmio_base + offset);
+ bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+ BCM43xx_PIO_TXCTL_INIT);
}
-static inline
-void bcm43xx_pio_write(struct bcm43xx_pioqueue *queue,
- u16 offset, u16 value)
+static void tx_octet(struct bcm43xx_pioqueue *queue,
+ u8 octet)
{
- bcm43xx_write16(queue->bcm, queue->mmio_base + offset, value);
+ if (queue->need_workarounds) {
+ bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA,
+ octet);
+ bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+ BCM43xx_PIO_TXCTL_WRITEHI);
+ } else {
+ bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+ BCM43xx_PIO_TXCTL_WRITEHI);
+ bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA,
+ octet);
+ }
}
-static inline
-void tx_start(struct bcm43xx_pioqueue *queue)
+static u16 tx_get_next_word(struct bcm43xx_txhdr *txhdr,
+ const u8 *packet,
+ unsigned int *pos)
{
- bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, BCM43xx_PIO_TXCTL_INIT);
-}
+ const u8 *source;
+ unsigned int i = *pos;
+ u16 ret;
-static inline
-void tx_octet(struct bcm43xx_pioqueue *queue,
- u8 octet)
-{
- if (queue->bcm->current_core->rev < 3) {
- bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, octet);
- bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, BCM43xx_PIO_TXCTL_WRITEHI);
+ if (i < sizeof(*txhdr)) {
+ source = (const u8 *)txhdr;
} else {
- bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, BCM43xx_PIO_TXCTL_WRITEHI);
- bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, octet);
+ source = packet;
+ i -= sizeof(*txhdr);
}
+ ret = le16_to_cpu( *((u16 *)(source + i)) );
+ *pos += 2;
+
+ return ret;
}
-static inline
-void tx_data(struct bcm43xx_pioqueue *queue,
- u8 *packet,
- unsigned int octets)
+static void tx_data(struct bcm43xx_pioqueue *queue,
+ struct bcm43xx_txhdr *txhdr,
+ const u8 *packet,
+ unsigned int octets)
{
u16 data;
unsigned int i = 0;
- if (queue->bcm->current_core->rev < 3) {
- data = be16_to_cpu( *((u16 *)packet) );
+ if (queue->need_workarounds) {
+ data = tx_get_next_word(txhdr, packet, &i);
bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, data);
- i += 2;
}
bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
- BCM43xx_PIO_TXCTL_WRITELO | BCM43xx_PIO_TXCTL_WRITEHI);
- for ( ; i < octets - 1; i += 2) {
- data = be16_to_cpu( *((u16 *)(packet + i)) );
+ BCM43xx_PIO_TXCTL_WRITELO |
+ BCM43xx_PIO_TXCTL_WRITEHI);
+ while (i < octets - 1) {
+ data = tx_get_next_word(txhdr, packet, &i);
bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, data);
}
if (octets % 2)
- tx_octet(queue, packet[octets - 1]);
+ tx_octet(queue, packet[octets - sizeof(*txhdr) - 1]);
}
-static inline
-void tx_complete(struct bcm43xx_pioqueue *queue,
- struct sk_buff *skb)
+static void tx_complete(struct bcm43xx_pioqueue *queue,
+ struct sk_buff *skb)
{
- u16 data;
-
- if (queue->bcm->current_core->rev < 3) {
- data = be16_to_cpu( *((u16 *)(skb->data + skb->len - 2)) );
- bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA, data);
+ if (queue->need_workarounds) {
+ bcm43xx_pio_write(queue, BCM43xx_PIO_TXDATA,
+ skb->data[skb->len - 1]);
bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
- BCM43xx_PIO_TXCTL_WRITEHI | BCM43xx_PIO_TXCTL_COMPLETE);
+ BCM43xx_PIO_TXCTL_WRITEHI |
+ BCM43xx_PIO_TXCTL_COMPLETE);
} else {
- bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL, BCM43xx_PIO_TXCTL_COMPLETE);
+ bcm43xx_pio_write(queue, BCM43xx_PIO_TXCTL,
+ BCM43xx_PIO_TXCTL_COMPLETE);
}
}
-static inline
-u16 generate_cookie(struct bcm43xx_pioqueue *queue,
- int packetindex)
+static u16 generate_cookie(struct bcm43xx_pioqueue *queue,
+ int packetindex)
{
u16 cookie = 0x0000;
* for the packet index (in the cache).
*/
switch (queue->mmio_base) {
- default:
- assert(0);
case BCM43xx_MMIO_PIO1_BASE:
break;
case BCM43xx_MMIO_PIO2_BASE:
case BCM43xx_MMIO_PIO4_BASE:
cookie = 0x3000;
break;
+ default:
+ assert(0);
}
assert(((u16)packetindex & 0xF000) == 0x0000);
cookie |= (u16)packetindex;
return cookie;
}
-static inline
+static
struct bcm43xx_pioqueue * parse_cookie(struct bcm43xx_private *bcm,
u16 cookie,
struct bcm43xx_pio_txpacket **packet)
{
+ struct bcm43xx_pio *pio = bcm->current_core->pio;
struct bcm43xx_pioqueue *queue = NULL;
int packetindex;
switch (cookie & 0xF000) {
case 0x0000:
- queue = bcm->current_core->pio->queue0;
+ queue = pio->queue0;
break;
case 0x1000:
- queue = bcm->current_core->pio->queue1;
+ queue = pio->queue1;
break;
case 0x2000:
- queue = bcm->current_core->pio->queue2;
+ queue = pio->queue2;
break;
case 0x3000:
- queue = bcm->current_core->pio->queue3;
+ queue = pio->queue3;
break;
default:
assert(0);
}
-
packetindex = (cookie & 0x0FFF);
assert(packetindex >= 0 && packetindex < BCM43xx_PIO_MAXTXPACKETS);
- *packet = queue->__tx_packets_cache + packetindex;
+ *packet = &(queue->tx_packets_cache[packetindex]);
return queue;
}
-static inline
-void pio_tx_write_fragment(struct bcm43xx_pioqueue *queue,
- struct sk_buff *skb,
- struct bcm43xx_pio_txpacket *packet)
+static void pio_tx_write_fragment(struct bcm43xx_pioqueue *queue,
+ struct sk_buff *skb,
+ struct bcm43xx_pio_txpacket *packet)
{
+ struct bcm43xx_txhdr txhdr;
unsigned int octets;
assert(skb_shinfo(skb)->nr_frags == 0);
- assert(skb_headroom(skb) >= sizeof(struct bcm43xx_txhdr));
-
- __skb_push(skb, sizeof(struct bcm43xx_txhdr));
bcm43xx_generate_txhdr(queue->bcm,
- (struct bcm43xx_txhdr *)skb->data,
- skb->data + sizeof(struct bcm43xx_txhdr),
- skb->len - sizeof(struct bcm43xx_txhdr),
+ &txhdr, skb->data, skb->len,
(packet->xmitted_frags == 0),
generate_cookie(queue, pio_txpacket_getindex(packet)));
tx_start(queue);
- octets = skb->len;
- if (queue->bcm->current_core->rev < 3) //FIXME: && this is the last packet in the queue.
- octets -= 2;
- tx_data(queue, (u8 *)skb->data, octets);
+ octets = skb->len + sizeof(txhdr);
+ if (queue->need_workarounds)
+ octets--;
+ tx_data(queue, &txhdr, (u8 *)skb->data, octets);
tx_complete(queue, skb);
}
-static inline
-int pio_tx_packet(struct bcm43xx_pio_txpacket *packet)
+static void free_txpacket(struct bcm43xx_pio_txpacket *packet,
+ int irq_context)
+{
+ struct bcm43xx_pioqueue *queue = packet->queue;
+
+ ieee80211_txb_free(packet->txb);
+ list_move(&packet->list, &queue->txfree);
+ queue->nr_txfree++;
+
+ assert(queue->tx_devq_used >= packet->xmitted_octets);
+ assert(queue->tx_devq_packets >= packet->xmitted_frags);
+ queue->tx_devq_used -= packet->xmitted_octets;
+ queue->tx_devq_packets -= packet->xmitted_frags;
+}
+
+static int pio_tx_packet(struct bcm43xx_pio_txpacket *packet)
{
struct bcm43xx_pioqueue *queue = packet->queue;
struct ieee80211_txb *txb = packet->txb;
skb = txb->fragments[i];
octets = (u16)skb->len + sizeof(struct bcm43xx_txhdr);
-
assert(queue->tx_devq_size >= octets);
assert(queue->tx_devq_packets <= BCM43xx_PIO_MAXTXDEVQPACKETS);
assert(queue->tx_devq_used <= queue->tx_devq_size);
/* Check if there is sufficient free space on the device
- * TX queue. If not, return and let the TX-work-handler
+ * TX queue. If not, return and let the TX tasklet
* retry later.
*/
if (queue->tx_devq_packets == BCM43xx_PIO_MAXTXDEVQPACKETS)
return 0;
}
-static void free_txpacket(struct bcm43xx_pio_txpacket *packet)
+static void tx_tasklet(unsigned long d)
{
- struct bcm43xx_pioqueue *queue = packet->queue;
-
- ieee80211_txb_free(packet->txb);
-
- list_move(&packet->list, &packet->queue->txfree);
-
- assert(queue->tx_devq_used >= packet->xmitted_octets);
- queue->tx_devq_used -= packet->xmitted_octets;
- assert(queue->tx_devq_packets >= packet->xmitted_frags);
- queue->tx_devq_packets -= packet->xmitted_frags;
-}
-
-static void txwork_handler(void *d)
-{
- struct bcm43xx_pioqueue *queue = d;
+ struct bcm43xx_pioqueue *queue = (struct bcm43xx_pioqueue *)d;
+ struct bcm43xx_private *bcm = queue->bcm;
unsigned long flags;
struct bcm43xx_pio_txpacket *packet, *tmp_packet;
int err;
- spin_lock_irqsave(&queue->txlock, flags);
+ spin_lock_irqsave(&bcm->lock, flags);
list_for_each_entry_safe(packet, tmp_packet, &queue->txqueue, list) {
assert(packet->xmitted_frags < packet->txb->nr_frags);
if (packet->xmitted_frags == 0) {
skb = packet->txb->fragments[i];
if (unlikely(skb->len > queue->tx_devq_size)) {
dprintkl(KERN_ERR PFX "PIO TX device queue too small. "
- "Dropping packet...\n");
- free_txpacket(packet);
+ "Dropping packet.\n");
+ free_txpacket(packet, 1);
goto next_packet;
}
}
}
- /* Now try to transmit the packet.
+ /* Try to transmit the packet.
* This may not completely succeed.
*/
err = pio_tx_packet(packet);
if (err)
break;
-next_packet:
+ next_packet:
continue;
}
- spin_unlock_irqrestore(&queue->txlock, flags);
+ spin_unlock_irqrestore(&bcm->lock, flags);
}
static void setup_txqueues(struct bcm43xx_pioqueue *queue)
struct bcm43xx_pio_txpacket *packet;
int i;
+ queue->nr_txfree = BCM43xx_PIO_MAXTXPACKETS;
for (i = 0; i < BCM43xx_PIO_MAXTXPACKETS; i++) {
- packet = queue->__tx_packets_cache + i;
+ packet = &(queue->tx_packets_cache[i]);
packet->queue = queue;
INIT_LIST_HEAD(&packet->list);
u32 value;
u16 qsize;
- queue = kmalloc(sizeof(*queue), GFP_KERNEL);
+ queue = kzalloc(sizeof(*queue), GFP_KERNEL);
if (!queue)
goto out;
- memset(queue, 0, sizeof(*queue));
queue->bcm = bcm;
queue->mmio_base = pio_mmio_base;
+ queue->need_workarounds = (bcm->current_core->rev < 3);
INIT_LIST_HEAD(&queue->txfree);
INIT_LIST_HEAD(&queue->txqueue);
INIT_LIST_HEAD(&queue->txrunning);
- spin_lock_init(&queue->txlock);
- INIT_WORK(&queue->txwork, txwork_handler, queue);
+ tasklet_init(&queue->txtask, tx_tasklet,
+ (unsigned long)queue);
value = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
value |= BCM43xx_SBF_XFER_REG_BYTESWAP;
qsize = bcm43xx_read16(bcm, queue->mmio_base + BCM43xx_PIO_TXQBUFSIZE);
if (qsize <= BCM43xx_PIO_TXQADJUST) {
- printk(KERN_ERR PFX "PIO tx queue too small (%u)\n", qsize);
+ printk(KERN_ERR PFX "PIO tx device-queue too small (%u)\n", qsize);
goto err_freequeue;
}
qsize -= BCM43xx_PIO_TXQADJUST;
netif_tx_disable(queue->bcm->net_dev);
assert(queue->bcm->shutting_down);
- cancel_delayed_work(&queue->txwork);
- flush_workqueue(queue->bcm->workqueue);
+ tasklet_disable(&queue->txtask);
list_for_each_entry_safe(packet, tmp_packet, &queue->txrunning, list)
- free_txpacket(packet);
+ free_txpacket(packet, 0);
list_for_each_entry_safe(packet, tmp_packet, &queue->txqueue, list)
- free_txpacket(packet);
+ free_txpacket(packet, 0);
}
static void bcm43xx_destroy_pioqueue(struct bcm43xx_pioqueue *queue)
void bcm43xx_pio_free(struct bcm43xx_private *bcm)
{
- bcm43xx_destroy_pioqueue(bcm->current_core->pio->queue3);
- bcm->current_core->pio->queue3 = NULL;
- bcm43xx_destroy_pioqueue(bcm->current_core->pio->queue2);
- bcm->current_core->pio->queue2 = NULL;
- bcm43xx_destroy_pioqueue(bcm->current_core->pio->queue1);
- bcm->current_core->pio->queue1 = NULL;
- bcm43xx_destroy_pioqueue(bcm->current_core->pio->queue0);
- bcm->current_core->pio->queue0 = NULL;
+ struct bcm43xx_pio *pio = bcm->current_core->pio;
+
+ bcm43xx_destroy_pioqueue(pio->queue3);
+ pio->queue3 = NULL;
+ bcm43xx_destroy_pioqueue(pio->queue2);
+ pio->queue2 = NULL;
+ bcm43xx_destroy_pioqueue(pio->queue1);
+ pio->queue1 = NULL;
+ bcm43xx_destroy_pioqueue(pio->queue0);
+ pio->queue0 = NULL;
}
int bcm43xx_pio_init(struct bcm43xx_private *bcm)
{
+ struct bcm43xx_pio *pio = bcm->current_core->pio;
struct bcm43xx_pioqueue *queue;
int err = -ENOMEM;
queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO1_BASE);
if (!queue)
goto out;
- bcm->current_core->pio->queue0 = queue;
+ pio->queue0 = queue;
queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO2_BASE);
if (!queue)
goto err_destroy0;
- bcm->current_core->pio->queue1 = queue;
+ pio->queue1 = queue;
queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO3_BASE);
if (!queue)
goto err_destroy1;
- bcm->current_core->pio->queue2 = queue;
+ pio->queue2 = queue;
queue = bcm43xx_setup_pioqueue(bcm, BCM43xx_MMIO_PIO4_BASE);
if (!queue)
goto err_destroy2;
- bcm->current_core->pio->queue3 = queue;
+ pio->queue3 = queue;
if (bcm->current_core->rev < 3)
bcm->irq_savedstate |= BCM43xx_IRQ_PIO_WORKAROUND;
return err;
err_destroy2:
- bcm43xx_destroy_pioqueue(bcm->current_core->pio->queue2);
- bcm->current_core->pio->queue2 = NULL;
+ bcm43xx_destroy_pioqueue(pio->queue2);
+ pio->queue2 = NULL;
err_destroy1:
- bcm43xx_destroy_pioqueue(bcm->current_core->pio->queue1);
- bcm->current_core->pio->queue1 = NULL;
+ bcm43xx_destroy_pioqueue(pio->queue1);
+ pio->queue1 = NULL;
err_destroy0:
- bcm43xx_destroy_pioqueue(bcm->current_core->pio->queue0);
- bcm->current_core->pio->queue0 = NULL;
+ bcm43xx_destroy_pioqueue(pio->queue0);
+ pio->queue0 = NULL;
goto out;
}
-static inline
-int pio_transfer_txb(struct bcm43xx_pioqueue *queue,
- struct ieee80211_txb *txb)
+int bcm43xx_pio_tx(struct bcm43xx_private *bcm,
+ struct ieee80211_txb *txb)
{
+ struct bcm43xx_pioqueue *queue = bcm->current_core->pio->queue1;
struct bcm43xx_pio_txpacket *packet;
- unsigned long flags;
u16 tmp;
- spin_lock_irqsave(&queue->txlock, flags);
assert(!queue->tx_suspended);
assert(!list_empty(&queue->txfree));
tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL);
- if (tmp & BCM43xx_PIO_TXCTL_SUSPEND) {
- spin_unlock_irqrestore(&queue->txlock, flags);
+ if (tmp & BCM43xx_PIO_TXCTL_SUSPEND)
return -EBUSY;
- }
packet = list_entry(queue->txfree.next, struct bcm43xx_pio_txpacket, list);
-
packet->txb = txb;
- list_move_tail(&packet->list, &queue->txqueue);
- packet->xmitted_octets = 0;
packet->xmitted_frags = 0;
+ packet->xmitted_octets = 0;
+ list_move_tail(&packet->list, &queue->txqueue);
+ queue->nr_txfree--;
+ assert(queue->nr_txfree < BCM43xx_PIO_MAXTXPACKETS);
/* Suspend TX, if we are out of packets in the "free" queue. */
if (unlikely(list_empty(&queue->txfree))) {
queue->tx_suspended = 1;
}
- spin_unlock_irqrestore(&queue->txlock, flags);
- queue_work(queue->bcm->workqueue, &queue->txwork);
+ tasklet_schedule(&queue->txtask);
return 0;
}
-int fastcall bcm43xx_pio_transfer_txb(struct bcm43xx_private *bcm,
- struct ieee80211_txb *txb)
-{
- return pio_transfer_txb(bcm->current_core->pio->queue1, txb);
-}
-
-void fastcall
-bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm,
- struct bcm43xx_xmitstatus *status)
+void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm,
+ struct bcm43xx_xmitstatus *status)
{
struct bcm43xx_pioqueue *queue;
struct bcm43xx_pio_txpacket *packet;
- unsigned long flags;
queue = parse_cookie(bcm, status->cookie, &packet);
assert(queue);
- spin_lock_irqsave(&queue->txlock, flags);
- free_txpacket(packet);
+//TODO
+if (!queue)
+return;
+ free_txpacket(packet, 1);
if (unlikely(queue->tx_suspended)) {
queue->tx_suspended = 0;
netif_wake_queue(queue->bcm->net_dev);
}
-
- /* If there are packets on the txqueue,
- * start the work handler again.
- */
- if (!list_empty(&queue->txqueue)) {
- queue_work(queue->bcm->workqueue,
- &queue->txwork);
- }
- spin_unlock_irqrestore(&queue->txlock, flags);
+ /* If there are packets on the txqueue, poke the tasklet. */
+ if (!list_empty(&queue->txqueue))
+ tasklet_schedule(&queue->txtask);
}
static void pio_rx_error(struct bcm43xx_pioqueue *queue,
+ int clear_buffers,
const char *error)
{
- printk("PIO RX error: %s\n", error);
- bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL, BCM43xx_PIO_RXCTL_READY);
+ int i;
+
+ printkl("PIO RX error: %s\n", error);
+ bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL,
+ BCM43xx_PIO_RXCTL_READY);
+ if (clear_buffers) {
+ assert(queue->mmio_base == BCM43xx_MMIO_PIO1_BASE);
+ for (i = 0; i < 15; i++) {
+ /* Dummy read. */
+ bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
+ }
+ }
}
-void fastcall
-bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue)
+void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue)
{
u16 preamble[21] = { 0 };
struct bcm43xx_rxhdr *rxhdr;
- u16 tmp;
- u16 len;
- int i, err;
- int preamble_readwords;
+ u16 tmp, len, rxflags2;
+ int i, preamble_readwords;
struct sk_buff *skb;
+return;
tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXCTL);
if (!(tmp & BCM43xx_PIO_RXCTL_DATAAVAILABLE)) {
- dprintkl(KERN_ERR PFX "PIO RX: No data available\n");
+ dprintkl(KERN_ERR PFX "PIO RX: No data available\n");//TODO: remove this printk.
return;
}
- bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL, BCM43xx_PIO_RXCTL_DATAAVAILABLE);
+ bcm43xx_pio_write(queue, BCM43xx_PIO_RXCTL,
+ BCM43xx_PIO_RXCTL_DATAAVAILABLE);
for (i = 0; i < 10; i++) {
tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXCTL);
return;
data_ready:
+//FIXME: endianess in this function.
len = le16_to_cpu(bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA));
if (unlikely(len > 0x700)) {
- pio_rx_error(queue, "len > 0x700");
+ pio_rx_error(queue, 0, "len > 0x700");
return;
}
if (unlikely(len == 0 && queue->mmio_base != BCM43xx_MMIO_PIO4_BASE)) {
- pio_rx_error(queue, "len == 0");
+ pio_rx_error(queue, 0, "len == 0");
return;
}
preamble[0] = cpu_to_le16(len);
preamble_readwords = 18 / sizeof(u16);
for (i = 0; i < preamble_readwords; i++) {
tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
- preamble[i + 1] = cpu_to_be16(tmp);
+ preamble[i + 1] = cpu_to_be16(tmp);//FIXME?
}
rxhdr = (struct bcm43xx_rxhdr *)preamble;
- if (unlikely(rxhdr->flags2 & BCM43xx_RXHDR_FLAGS2_INVALIDFRAME)) {
- pio_rx_error(queue, "invalid frame");
- if (queue->mmio_base == BCM43xx_MMIO_PIO1_BASE) {
- for (i = 0; i < 15; i++)
- bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA); /* dummy read. */
- }
+ rxflags2 = le16_to_cpu(rxhdr->flags2);
+ if (unlikely(rxflags2 & BCM43xx_RXHDR_FLAGS2_INVALIDFRAME)) {
+ pio_rx_error(queue,
+ (queue->mmio_base == BCM43xx_MMIO_PIO1_BASE),
+ "invalid frame");
return;
}
-//FIXME
-#if 0
if (queue->mmio_base == BCM43xx_MMIO_PIO4_BASE) {
- bcm43xx_rx_transmitstatus(queue->bcm,
- (const struct bcm43xx_hwxmitstatus *)(preamble + 1));
+ /* We received an xmit status. */
+ struct bcm43xx_hwxmitstatus *hw;
+ struct bcm43xx_xmitstatus stat;
+
+ hw = (struct bcm43xx_hwxmitstatus *)(preamble + 1);
+ stat.cookie = le16_to_cpu(hw->cookie);
+ stat.flags = hw->flags;
+ stat.cnt1 = hw->cnt1;
+ stat.cnt2 = hw->cnt2;
+ stat.seq = le16_to_cpu(hw->seq);
+ stat.unknown = le16_to_cpu(hw->unknown);
+
+ bcm43xx_debugfs_log_txstat(queue->bcm, &stat);
+ bcm43xx_pio_handle_xmitstatus(queue->bcm, &stat);
+
return;
}
-#endif
+
skb = dev_alloc_skb(len);
if (unlikely(!skb)) {
- pio_rx_error(queue, "out of memory");
+ pio_rx_error(queue, 1, "OOM");
return;
}
skb_put(skb, len);
*((u16 *)(skb->data + i)) = tmp;
}
if (len % 2) {
- tmp = cpu_to_be16(bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA));
+ tmp = bcm43xx_pio_read(queue, BCM43xx_PIO_RXDATA);
skb->data[len - 1] = (tmp & 0x00FF);
- skb->data[0] = (tmp & 0xFF00) >> 8;
+ if (rxflags2 & BCM43xx_RXHDR_FLAGS2_TYPE2FRAME)
+ skb->data[0x20] = (tmp & 0xFF00) >> 8;
+ else
+ skb->data[0x1E] = (tmp & 0xFF00) >> 8;
}
- err = bcm43xx_rx(queue->bcm, skb, rxhdr);
- if (unlikely(err))
- dev_kfree_skb_irq(skb);
+ bcm43xx_rx(queue->bcm, skb, rxhdr);
}
/* vim: set ts=8 sw=8 sts=8: */
projects / linux-2.6 / commitdiff