mac80211: rt2x00: clear IV's on start to fix AP mode regression

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / rt2x00 / 650-rt2x00-add-support-for-external-PA-on-MT7620.patch

diff --git a/package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch b/package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
index 7f80e110ab1ed569a8c76ca3da8e86e416fb44c0..2d733a3180dcc8a1457e0f1f39a0e1e5200dde66 100644 (file)
--- a/package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
+++ b/package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
@@ -6,8 +6,13 @@ To: Stanislaw Gruszka <sgruszka@redhat.com>
 Cc: Helmut Schaa <helmut.schaa@googlemail.com>,
     linux-wireless@vger.kernel.org,
     Kalle Valo <kvalo@codeaurora.org>
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
 
 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Signed-off-by: Tomislav Po=C5=BEega <pozega.tomislav@gmail.com>
+[pozega.tomislav@gmail.com: use chanreg and dccal helpers.]
+
 ---
  drivers/net/wireless/ralink/rt2x00/rt2800.h    |  1 +
  drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 70 +++++++++++++++++++++++++-
@@ -15,7 +20,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h
-@@ -2750,6 +2750,7 @@ enum rt2800_eeprom_word {
+@@ -2739,6 +2739,7 @@ enum rt2800_eeprom_word {
  #define EEPROM_NIC_CONF2_RX_STREAM    FIELD16(0x000f)
  #define EEPROM_NIC_CONF2_TX_STREAM    FIELD16(0x00f0)
  #define EEPROM_NIC_CONF2_CRYSTAL      FIELD16(0x0600)
@@ -25,7 +30,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
   * EEPROM LNA
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-@@ -4123,6 +4123,61 @@ static void rt2800_config_channel(struct
+@@ -4360,6 +4360,45 @@ static void rt2800_config_channel(struct
                rt2800_iq_calibrate(rt2x00dev, rf->channel);
        }
  
@@ -42,38 +47,22 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +                      reg |= 0x00000101;
 +                      rt2800_register_write(rt2x00dev, RF_BYPASS3, reg);
 +
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 43, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 43, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 44, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 44, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 45, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 45, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 46, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 46, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 47, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 47, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 48, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 48, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 49, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 49, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 54, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 54, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 55, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 55, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 56, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 56, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 57, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 57, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 58, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 58, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 59, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 59, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 60, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 60, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 61, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 61, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 5, 05, 0x00);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 7, 05, 0x00);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0x73);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0x73);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0x73);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0xC8);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xA4);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x05);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0xC8);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xA4);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x05);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x27);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0xC8);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xA4);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x05);
++                      rt2800_rfcsr_write_dccal(rt2x00dev, 05, 0x00);
 +
 +                      rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
 +                                            0x36303636);
@@ -87,7 +76,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        bbp = rt2800_bbp_read(rt2x00dev, 4);
        rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf));
        rt2800_bbp_write(rt2x00dev, 4, bbp);
-@@ -9320,7 +9375,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -9564,7 +9603,8 @@ static int rt2800_init_eeprom(struct rt2
         */
        eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1);
  
@@ -97,7 +86,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                if (rt2x00_get_field16(eeprom,
                    EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
                    __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
-@@ -9331,6 +9387,18 @@ static int rt2800_init_eeprom(struct rt2
+@@ -9575,6 +9615,18 @@ static int rt2800_init_eeprom(struct rt2
                              &rt2x00dev->cap_flags);
        }