package/mac80211/patches/312-rt2x00-Fix-TX-descriptor-usage-rt2800usb.patch

   1 From e9a3a3b9744f0204ec4beec8f9bea3c11ce6f54b Mon Sep 17 00:00:00 2001
   2 From: Ivo van Doorn <IvDoorn@gmail.com>
   3 Date: Sat, 10 Jan 2009 19:21:46 +0100
   4 Subject: [PATCH] rt2x00: Fix TX descriptor usage (rt2800usb)
   5
   6 Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
   7 ---
   8  drivers/net/wireless/rt2x00/rt2800usb.c |   46 ++++++++++---------------------
   9  drivers/net/wireless/rt2x00/rt2800usb.h |    1 +
  10  2 files changed, 16 insertions(+), 31 deletions(-)
  11
  12 --- a/drivers/net/wireless/rt2x00/rt2800usb.c
  13 +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
  14 @@ -1635,8 +1635,8 @@ static void rt2800usb_write_tx_desc(stru
  15                                     struct txentry_desc *txdesc)
  16  {
  17         struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
  18 -       __le32 *txd = skbdesc->desc;
  19 -       __le32 *txwi = txd + TXD_DESC_SIZE;
  20 +       __le32 *txi = skbdesc->desc;
  21 +       __le32 *txwi = txi + TXINFO_DESC_SIZE;
  22         u32 word;
  23
  24         /*
  25 @@ -1683,31 +1683,15 @@ static void rt2800usb_write_tx_desc(stru
  26         /*
  27          * Initialize TX descriptor
  28          */
  29 -       rt2x00_desc_read(txd, 0, &word);
  30 -       rt2x00_set_field32(&word, TXD_W0_SD_PTR0, skbdesc->skb_dma);
  31 -       rt2x00_desc_write(txd, 0, word);
  32 -
  33 -       rt2x00_desc_read(txd, 1, &word);
  34 -       rt2x00_set_field32(&word, TXD_W1_SD_LEN1, skb->len);
  35 -       rt2x00_set_field32(&word, TXD_W1_LAST_SEC1, 1);
  36 -       rt2x00_set_field32(&word, TXD_W1_BURST,
  37 +       rt2x00_desc_read(txi, 0, &word);
  38 +       rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN, skb->len);
  39 +       rt2x00_set_field32(&word, TXINFO_W0_WIV, 1);
  40 +       rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2);
  41 +       rt2x00_set_field32(&word, TXINFO_W0_SW_USE_LAST_ROUND, 0);
  42 +       rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_NEXT_VALID, 0);
  43 +       rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_BURST,
  44                            test_bit(ENTRY_TXD_BURST, &txdesc->flags));
  45 -       rt2x00_set_field32(&word, TXD_W1_SD_LEN0,
  46 -                          rt2x00dev->hw->extra_tx_headroom);
  47 -       rt2x00_set_field32(&word, TXD_W1_LAST_SEC0,
  48 -                          !test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));
  49 -       rt2x00_set_field32(&word, TXD_W1_DMA_DONE, 0);
  50 -       rt2x00_desc_write(txd, 1, word);
  51 -
  52 -       rt2x00_desc_read(txd, 2, &word);
  53 -       rt2x00_set_field32(&word, TXD_W2_SD_PTR1,
  54 -                          skbdesc->skb_dma + rt2x00dev->hw->extra_tx_headroom);
  55 -       rt2x00_desc_write(txd, 2, word);
  56 -
  57 -       rt2x00_desc_read(txd, 3, &word);
  58 -       rt2x00_set_field32(&word, TXD_W3_WIV, 1);
  59 -       rt2x00_set_field32(&word, TXD_W3_QSEL, 2);
  60 -       rt2x00_desc_write(txd, 3, word);
  61 +       rt2x00_desc_write(txi, 0, word);
  62  }
  63
  64  /*
  65 @@ -1881,9 +1865,9 @@ static void rt2800usb_fill_rxdone(struct
  66         rxdesc->size = rt2x00_get_field32(rxwi0, RXWI_W0_MPDU_TOTAL_BYTE_COUNT);
  67
  68         /*
  69 -        * Remove TXWI descriptor from start of buffer.
  70 +        * Remove RXWI descriptor from start of buffer.
  71          */
  72 -       skb_pull(entry->skb, TXWI_DESC_SIZE + skbdesc->desc_len);
  73 +       skb_pull(entry->skb, RXWI_DESC_SIZE + skbdesc->desc_len);
  74         skb_trim(entry->skb, rxdesc->size);
  75  }
  76
  77 @@ -2146,7 +2130,7 @@ static int rt2800usb_probe_hw_mode(struc
  78             IEEE80211_HW_SIGNAL_DBM |
  79             IEEE80211_HW_SUPPORTS_PS |
  80             IEEE80211_HW_PS_NULLFUNC_STACK;
  81 -       rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE + TXINFO_DESC_SIZE;
  82 +       rt2x00dev->hw->extra_tx_headroom = TXINFO_DESC_SIZE + TXWI_DESC_SIZE;
  83
  84         SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
  85         SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
  86 @@ -2445,14 +2429,14 @@ static const struct data_queue_desc rt28
  87  static const struct data_queue_desc rt2800usb_queue_tx = {
  88         .entry_num              = TX_ENTRIES,
  89         .data_size              = DATA_FRAME_SIZE,
  90 -       .desc_size              = TXD_DESC_SIZE,
  91 +       .desc_size              = TXINFO_DESC_SIZE + TXWI_DESC_SIZE,
  92         .priv_size              = sizeof(struct queue_entry_priv_usb),
  93  };
  94
  95  static const struct data_queue_desc rt2800usb_queue_bcn = {
  96         .entry_num              = 8 * BEACON_ENTRIES,
  97         .data_size              = MGMT_FRAME_SIZE,
  98 -       .desc_size              = TXWI_DESC_SIZE,
  99 +       .desc_size              = TXINFO_DESC_SIZE + TXWI_DESC_SIZE,
 100         .priv_size              = sizeof(struct queue_entry_priv_usb),
 101  };
 102
 103 --- a/drivers/net/wireless/rt2x00/rt2800usb.h
 104 +++ b/drivers/net/wireless/rt2x00/rt2800usb.h
 105 @@ -1744,6 +1744,7 @@ struct hw_key_entry {
 106  #define TXINFO_W0_USB_DMA_TX_PKT_LEN   FIELD32(0x0000ffff)
 107  #define TXINFO_W0_WIV                  FIELD32(0x01000000)
 108  #define TXINFO_W0_QSEL                 FIELD32(0x06000000)
 109 +#define TXINFO_W0_SW_USE_LAST_ROUND    FIELD32(0x08000000)
 110  #define TXINFO_W0_USB_DMA_NEXT_VALID   FIELD32(0x40000000)
 111  #define TXINFO_W0_USB_DMA_TX_BURST     FIELD32(0x80000000)
 112