6 files changed, 59 insertions, 31 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index a7630d5ec892..d78c495a86a0 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -100,7 +100,7 @@
 #define CSR_REG_BASE                    0x1000
 #define CSR_REG_SIZE                    0x0800
 #define EEPROM_BASE                     0x0000
-#define EEPROM_SIZE                     0x0110
+#define EEPROM_SIZE                     0x0200
 #define BBP_BASE                        0x0000
 #define BBP_SIZE                        0x00ff
 #define RF_BASE                         0x0004
@@ -2625,11 +2625,13 @@ struct mac_iveiv_entry {
 /*
  * DMA descriptor defines.
  */
-#define TXWI_DESC_SIZE                  (4 * sizeof(__le32))
-#define RXWI_DESC_SIZE                  (4 * sizeof(__le32))
 
-#define TXWI_DESC_SIZE_5592             (5 * sizeof(__le32))
-#define RXWI_DESC_SIZE_5592             (6 * sizeof(__le32))
+#define TXWI_DESC_SIZE_4WORDS           (4 * sizeof(__le32))
+#define TXWI_DESC_SIZE_5WORDS           (5 * sizeof(__le32))
+
+#define RXWI_DESC_SIZE_4WORDS           (4 * sizeof(__le32))
+#define RXWI_DESC_SIZE_6WORDS           (6 * sizeof(__le32))
+
 /*
  * TX WI structure
  */
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 3aa30ddcbfea..1f80ea5e29dd 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2392,7 +2392,7 @@ static void rt2800_config_channel_rf55xx(struct rt2x00_dev *rt2x00dev,
         rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
 
         rt2800_rfcsr_read(rt2x00dev, 50, &rfcsr);
-        if (info->default_power1 > power_bound)
+        if (info->default_power2 > power_bound)
                 rt2x00_set_field8(&rfcsr, RFCSR50_TX, power_bound);
         else
                 rt2x00_set_field8(&rfcsr, RFCSR50_TX, info->default_power2);
@@ -2678,30 +2678,53 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 
         tx_pin = 0;
 
-        /* Turn on unused PA or LNA when not using 1T or 1R */
-        if (rt2x00dev->default_ant.tx_chain_num == 2) {
+        switch (rt2x00dev->default_ant.tx_chain_num) {
+        case 3:
+                /* Turn on tertiary PAs */
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A2_EN,
+                                   rf->channel > 14);
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G2_EN,
+                                   rf->channel <= 14);
+                /* fall-through */
+        case 2:
+                /* Turn on secondary PAs */
                 rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN,
                                    rf->channel > 14);
                 rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN,
                                    rf->channel <= 14);
+                /* fall-through */
+        case 1:
+                /* Turn on primary PAs */
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A0_EN,
+                                   rf->channel > 14);
+                if (test_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags))
+                        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN, 1);
+                else
+                        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN,
+                                           rf->channel <= 14);
+                break;
         }
 
-        /* Turn on unused PA or LNA when not using 1T or 1R */
-        if (rt2x00dev->default_ant.rx_chain_num == 2) {
+        switch (rt2x00dev->default_ant.rx_chain_num) {
+        case 3:
+                /* Turn on tertiary LNAs */
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A2_EN, 1);
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G2_EN, 1);
+                /* fall-through */
+        case 2:
+                /* Turn on secondary LNAs */
                 rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A1_EN, 1);
                 rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G1_EN, 1);
+                /* fall-through */
+        case 1:
+                /* Turn on primary LNAs */
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN, 1);
+                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_EN, 1);
+                break;
         }
 
-        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN, 1);
-        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_EN, 1);
         rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);
         rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1);
-        if (test_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags))
-                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN, 1);
-        else
-                rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN,
-                                   rf->channel <= 14);
-        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A0_EN, rf->channel > 14);
 
         rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
 
@@ -6254,8 +6277,8 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                 default_power2 = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A2);
 
                 for (i = 14; i < spec->num_channels; i++) {
-                        info[i].default_power1 = default_power1[i];
-                        info[i].default_power2 = default_power2[i];
+                        info[i].default_power1 = default_power1[i - 14];
+                        info[i].default_power2 = default_power2[i - 14];
                 }
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 7c7478219bbc..00055627eb8d 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -637,6 +637,7 @@ static void rt2800pci_write_tx_desc(struct queue_entry *entry,
         struct queue_entry_priv_mmio *entry_priv = entry->priv_data;
         __le32 *txd = entry_priv->desc;
         u32 word;
+        const unsigned int txwi_size = entry->queue->winfo_size;
 
         /*
          * The buffers pointed by SD_PTR0/SD_LEN0 and SD_PTR1/SD_LEN1
@@ -659,14 +660,14 @@ static void rt2800pci_write_tx_desc(struct queue_entry *entry,
                            !test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));
         rt2x00_set_field32(&word, TXD_W1_BURST,
                            test_bit(ENTRY_TXD_BURST, &txdesc->flags));
-        rt2x00_set_field32(&word, TXD_W1_SD_LEN0, TXWI_DESC_SIZE);
+        rt2x00_set_field32(&word, TXD_W1_SD_LEN0, txwi_size);
         rt2x00_set_field32(&word, TXD_W1_LAST_SEC0, 0);
         rt2x00_set_field32(&word, TXD_W1_DMA_DONE, 0);
         rt2x00_desc_write(txd, 1, word);
 
         word = 0;
         rt2x00_set_field32(&word, TXD_W2_SD_PTR1,
-                           skbdesc->skb_dma + TXWI_DESC_SIZE);
+                           skbdesc->skb_dma + txwi_size);
         rt2x00_desc_write(txd, 2, word);
 
         word = 0;
@@ -1193,7 +1194,7 @@ static void rt2800pci_queue_init(struct data_queue *queue)
                 queue->limit = 128;
                 queue->data_size = AGGREGATION_SIZE;
                 queue->desc_size = RXD_DESC_SIZE;
-                queue->winfo_size = RXWI_DESC_SIZE;
+                queue->winfo_size = RXWI_DESC_SIZE_4WORDS;
                 queue->priv_size = sizeof(struct queue_entry_priv_mmio);
                 break;
 
@@ -1204,7 +1205,7 @@ static void rt2800pci_queue_init(struct data_queue *queue)
                 queue->limit = 64;
                 queue->data_size = AGGREGATION_SIZE;
                 queue->desc_size = TXD_DESC_SIZE;
-                queue->winfo_size = TXWI_DESC_SIZE;
+                queue->winfo_size = TXWI_DESC_SIZE_4WORDS;
                 queue->priv_size = sizeof(struct queue_entry_priv_mmio);
                 break;
 
@@ -1212,7 +1213,7 @@ static void rt2800pci_queue_init(struct data_queue *queue)
                 queue->limit = 8;
                 queue->data_size = 0; /* No DMA required for beacons */
                 queue->desc_size = TXD_DESC_SIZE;
-                queue->winfo_size = TXWI_DESC_SIZE;
+                queue->winfo_size = TXWI_DESC_SIZE_4WORDS;
                 queue->priv_size = sizeof(struct queue_entry_priv_mmio);
                 break;
 
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 7edd903dd749..840833b26bfa 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -855,11 +855,11 @@ static void rt2800usb_queue_init(struct data_queue *queue)
         unsigned short txwi_size, rxwi_size;
 
         if (rt2x00_rt(rt2x00dev, RT5592)) {
-                txwi_size = TXWI_DESC_SIZE_5592;
-                rxwi_size = RXWI_DESC_SIZE_5592;
+                txwi_size = TXWI_DESC_SIZE_5WORDS;
+                rxwi_size = RXWI_DESC_SIZE_6WORDS;
         } else {
-                txwi_size = TXWI_DESC_SIZE;
-                rxwi_size = RXWI_DESC_SIZE;
+                txwi_size = TXWI_DESC_SIZE_4WORDS;
+                rxwi_size = RXWI_DESC_SIZE_4WORDS;
         }
 
         switch (queue->qid) {
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 53754bc66d05..54d3ddfc9888 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2825,7 +2825,8 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                 tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);
                 for (i = 14; i < spec->num_channels; i++) {
                         info[i].max_power = MAX_TXPOWER;
-                        info[i].default_power1 = TXPOWER_FROM_DEV(tx_power[i]);
+                        info[i].default_power1 =
+                                        TXPOWER_FROM_DEV(tx_power[i - 14]);
                 }
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 1616ed484ceb..1d3880e09a13 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -2167,7 +2167,8 @@ static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                 tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);
                 for (i = 14; i < spec->num_channels; i++) {
                         info[i].max_power = MAX_TXPOWER;
-                        info[i].default_power1 = TXPOWER_FROM_DEV(tx_power[i]);
+                        info[i].default_power1 =
+                                        TXPOWER_FROM_DEV(tx_power[i - 14]);
                 }
         }