package/kernel/mac80211/patches/020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch

   1 From 1f242a3de702d5a19c479685d35b050837122724 Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Mon, 10 Apr 2017 15:29:45 +0200
   4 Subject: [PATCH] rt2x00: reverse external PA capability flag logic
   5
   6 Consequently refer to external PA instead of inverting the logic and
   7 use an internal PA capability flag which is a bit confusing.
   8 Currently this is used for Rt3352 only, but MT7620A also allows for an
   9 external PA which will be supported by a follow up patch.
  10
  11 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  12 Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
  13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14 ---
  15  drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 40 +++++++++++++-------------
  16  drivers/net/wireless/ralink/rt2x00/rt2x00.h    |  4 +--
  17  2 files changed, 22 insertions(+), 22 deletions(-)
  18
  19 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  20 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  21 @@ -7014,9 +7014,9 @@ static void rt2800_init_rfcsr_3290(struc
  22
  23  static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
  24  {
  25 -       int tx0_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX0,
  26 +       int tx0_ext_pa = test_bit(CAPABILITY_EXTERNAL_PA_TX0,
  27                                   &rt2x00dev->cap_flags);
  28 -       int tx1_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX1,
  29 +       int tx1_ext_pa = test_bit(CAPABILITY_EXTERNAL_PA_TX1,
  30                                   &rt2x00dev->cap_flags);
  31         u8 rfcsr;
  32
  33 @@ -7056,9 +7056,9 @@ static void rt2800_init_rfcsr_3352(struc
  34         rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
  35         rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
  36         rfcsr = 0x01;
  37 -       if (!tx0_int_pa)
  38 +       if (tx0_ext_pa)
  39                 rt2x00_set_field8(&rfcsr, RFCSR34_TX0_EXT_PA, 1);
  40 -       if (!tx1_int_pa)
  41 +       if (tx1_ext_pa)
  42                 rt2x00_set_field8(&rfcsr, RFCSR34_TX1_EXT_PA, 1);
  43         rt2800_rfcsr_write(rt2x00dev, 34, rfcsr);
  44         rt2800_rfcsr_write(rt2x00dev, 35, 0x03);
  45 @@ -7068,13 +7068,13 @@ static void rt2800_init_rfcsr_3352(struc
  46         rt2800_rfcsr_write(rt2x00dev, 39, 0xc5);
  47         rt2800_rfcsr_write(rt2x00dev, 40, 0x33);
  48         rfcsr = 0x52;
  49 -       if (tx0_int_pa) {
  50 +       if (!tx0_ext_pa) {
  51                 rt2x00_set_field8(&rfcsr, RFCSR41_BIT1, 1);
  52                 rt2x00_set_field8(&rfcsr, RFCSR41_BIT4, 1);
  53         }
  54         rt2800_rfcsr_write(rt2x00dev, 41, rfcsr);
  55         rfcsr = 0x52;
  56 -       if (tx1_int_pa) {
  57 +       if (!tx1_ext_pa) {
  58                 rt2x00_set_field8(&rfcsr, RFCSR42_BIT1, 1);
  59                 rt2x00_set_field8(&rfcsr, RFCSR42_BIT4, 1);
  60         }
  61 @@ -7087,19 +7087,19 @@ static void rt2800_init_rfcsr_3352(struc
  62         rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
  63         rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
  64         rfcsr = 0x2d;
  65 -       if (!tx0_int_pa)
  66 +       if (tx0_ext_pa)
  67                 rt2x00_set_field8(&rfcsr, RFCSR50_TX0_EXT_PA, 1);
  68 -       if (!tx1_int_pa)
  69 +       if (tx1_ext_pa)
  70                 rt2x00_set_field8(&rfcsr, RFCSR50_TX1_EXT_PA, 1);
  71         rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
  72 -       rt2800_rfcsr_write(rt2x00dev, 51, (tx0_int_pa ? 0x7f : 0x52));
  73 -       rt2800_rfcsr_write(rt2x00dev, 52, (tx0_int_pa ? 0x00 : 0xc0));
  74 -       rt2800_rfcsr_write(rt2x00dev, 53, (tx0_int_pa ? 0x52 : 0xd2));
  75 -       rt2800_rfcsr_write(rt2x00dev, 54, (tx0_int_pa ? 0x1b : 0xc0));
  76 -       rt2800_rfcsr_write(rt2x00dev, 55, (tx1_int_pa ? 0x7f : 0x52));
  77 -       rt2800_rfcsr_write(rt2x00dev, 56, (tx1_int_pa ? 0x00 : 0xc0));
  78 -       rt2800_rfcsr_write(rt2x00dev, 57, (tx0_int_pa ? 0x52 : 0x49));
  79 -       rt2800_rfcsr_write(rt2x00dev, 58, (tx1_int_pa ? 0x1b : 0xc0));
  80 +       rt2800_rfcsr_write(rt2x00dev, 51, (tx0_ext_pa ? 0x52 : 0x7f));
  81 +       rt2800_rfcsr_write(rt2x00dev, 52, (tx0_ext_pa ? 0xc0 : 0x00));
  82 +       rt2800_rfcsr_write(rt2x00dev, 53, (tx0_ext_pa ? 0xd2 : 0x52));
  83 +       rt2800_rfcsr_write(rt2x00dev, 54, (tx0_ext_pa ? 0xc0 : 0x1b));
  84 +       rt2800_rfcsr_write(rt2x00dev, 55, (tx1_ext_pa ? 0x52 : 0x7f));
  85 +       rt2800_rfcsr_write(rt2x00dev, 56, (tx1_ext_pa ? 0xc0 : 0x00));
  86 +       rt2800_rfcsr_write(rt2x00dev, 57, (tx0_ext_pa ? 0x49 : 0x52));
  87 +       rt2800_rfcsr_write(rt2x00dev, 58, (tx1_ext_pa ? 0xc0 : 0x1b));
  88         rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
  89         rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
  90         rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
  91 @@ -8782,13 +8782,13 @@ static int rt2800_init_eeprom(struct rt2
  92         rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
  93
  94         if (rt2x00_rt(rt2x00dev, RT3352)) {
  95 -               if (!rt2x00_get_field16(eeprom,
  96 +               if (rt2x00_get_field16(eeprom,
  97                     EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
  98 -                   __set_bit(CAPABILITY_INTERNAL_PA_TX0,
  99 +                   __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
 100                               &rt2x00dev->cap_flags);
 101 -               if (!rt2x00_get_field16(eeprom,
 102 +               if (rt2x00_get_field16(eeprom,
 103                     EEPROM_NIC_CONF1_EXTERNAL_TX1_PA_3352))
 104 -                   __set_bit(CAPABILITY_INTERNAL_PA_TX1,
 105 +                   __set_bit(CAPABILITY_EXTERNAL_PA_TX1,
 106                               &rt2x00dev->cap_flags);
 107         }
 108
 109 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
 110 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
 111 @@ -719,8 +719,8 @@ enum rt2x00_capability_flags {
 112         CAPABILITY_DOUBLE_ANTENNA,
 113         CAPABILITY_BT_COEXIST,
 114         CAPABILITY_VCO_RECALIBRATION,
 115 -       CAPABILITY_INTERNAL_PA_TX0,
 116 -       CAPABILITY_INTERNAL_PA_TX1,
 117 +       CAPABILITY_EXTERNAL_PA_TX0,
 118 +       CAPABILITY_EXTERNAL_PA_TX1,
 119  };
 120
 121  /*