diff options
author | Helmut Schaa <helmut.schaa@googlemail.com> | 2010-04-15 03:13:35 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-16 15:32:00 -0400 |
commit | 745b1ae31ba6644a943ec2b6da2d03f00d8b2dd2 (patch) | |
tree | 09943fff439ab35fd40b222a35627bcdb0dc42aa /drivers/net/wireless/rt2x00 | |
parent | 410866930ea1929b0fdfb533dd84ddaa234b06e4 (diff) |
rt2x00: rt2800pci: fix tx path by not accessing the skb after it was DMA mapped
rt2800pci used the callback write_tx_desc to write the tx descriptor but
also to update the txwi which is part of the dma mapped skb. Since the
memory was already DMA mapped _before_ the call to write_tx_desc the
device didn't get the txwi data at all or only sporadically.
The call order is basically as follows (from rt2x00queue.c):
1) write_tx_data
2) rt2x00queue_map_txskb
3) write_tx_desc
Hence, we shouldn't touch the skb in write_tx_desc anymore.
To fix this issue create a new rt2800pci_write_tx_data callback and use it
for updating the txwi _before_ the memory gets DMA mapped.
The tx descriptor is still written (as before) in write_tx_desc.
This patch allows basic TX on an rt305x soc device but I'm pretty sure
that it will fix pci based cards as well. I can associate just fine with
an AP now but I wasn't able to get a wpa secured connection working yet.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800pci.c | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index 2131f8f0c50..0e52f174896 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c | |||
@@ -613,15 +613,23 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev, | |||
613 | /* | 613 | /* |
614 | * TX descriptor initialization | 614 | * TX descriptor initialization |
615 | */ | 615 | */ |
616 | static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, | 616 | static int rt2800pci_write_tx_data(struct queue_entry* entry, |
617 | struct sk_buff *skb, | 617 | struct txentry_desc *txdesc) |
618 | struct txentry_desc *txdesc) | ||
619 | { | 618 | { |
620 | struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb); | 619 | struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; |
621 | __le32 *txd = skbdesc->desc; | 620 | struct sk_buff *skb = entry->skb; |
622 | __le32 *txwi = (__le32 *)(skb->data - rt2x00dev->ops->extra_tx_headroom); | 621 | struct skb_frame_desc *skbdesc; |
622 | int ret; | ||
623 | __le32 *txwi; | ||
623 | u32 word; | 624 | u32 word; |
624 | 625 | ||
626 | ret = rt2x00pci_write_tx_data(entry, txdesc); | ||
627 | if (ret) | ||
628 | return ret; | ||
629 | |||
630 | skbdesc = get_skb_frame_desc(skb); | ||
631 | txwi = (__le32 *)(skb->data - rt2x00dev->ops->extra_tx_headroom); | ||
632 | |||
625 | /* | 633 | /* |
626 | * Initialize TX Info descriptor | 634 | * Initialize TX Info descriptor |
627 | */ | 635 | */ |
@@ -670,6 +678,18 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, | |||
670 | _rt2x00_desc_write(txwi, 2, 0 /* skbdesc->iv[0] */); | 678 | _rt2x00_desc_write(txwi, 2, 0 /* skbdesc->iv[0] */); |
671 | _rt2x00_desc_write(txwi, 3, 0 /* skbdesc->iv[1] */); | 679 | _rt2x00_desc_write(txwi, 3, 0 /* skbdesc->iv[1] */); |
672 | 680 | ||
681 | return 0; | ||
682 | } | ||
683 | |||
684 | |||
685 | static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, | ||
686 | struct sk_buff *skb, | ||
687 | struct txentry_desc *txdesc) | ||
688 | { | ||
689 | struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb); | ||
690 | __le32 *txd = skbdesc->desc; | ||
691 | u32 word; | ||
692 | |||
673 | /* | 693 | /* |
674 | * The buffers pointed by SD_PTR0/SD_LEN0 and SD_PTR1/SD_LEN1 | 694 | * The buffers pointed by SD_PTR0/SD_LEN0 and SD_PTR1/SD_LEN1 |
675 | * must contains a TXWI structure + 802.11 header + padding + 802.11 | 695 | * must contains a TXWI structure + 802.11 header + padding + 802.11 |
@@ -1135,7 +1155,7 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { | |||
1135 | .reset_tuner = rt2800_reset_tuner, | 1155 | .reset_tuner = rt2800_reset_tuner, |
1136 | .link_tuner = rt2800_link_tuner, | 1156 | .link_tuner = rt2800_link_tuner, |
1137 | .write_tx_desc = rt2800pci_write_tx_desc, | 1157 | .write_tx_desc = rt2800pci_write_tx_desc, |
1138 | .write_tx_data = rt2x00pci_write_tx_data, | 1158 | .write_tx_data = rt2800pci_write_tx_data, |
1139 | .write_beacon = rt2800pci_write_beacon, | 1159 | .write_beacon = rt2800pci_write_beacon, |
1140 | .kick_tx_queue = rt2800pci_kick_tx_queue, | 1160 | .kick_tx_queue = rt2800pci_kick_tx_queue, |
1141 | .kill_tx_queue = rt2800pci_kill_tx_queue, | 1161 | .kill_tx_queue = rt2800pci_kill_tx_queue, |