package/kernel/mac80211/patches/651-0014-rtl8xxxu-Introduce-fops-bitflag-indicating-type-of-t.patch

   1 From 99919affd249419a20984f96c7876fc6ec3759a8 Mon Sep 17 00:00:00 2001
   2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
   3 Date: Fri, 22 Jul 2016 11:18:36 -0400
   4 Subject: [PATCH] rtl8xxxu: Introduce fops bitflag indicating type of thermal
   5  meter
   6
   7 Do not rely on TX descriptor size to determine the thermal meter
   8 type.
   9
  10 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  11 ---
  12  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h       | 1 +
  13  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1 +
  14  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 +
  15  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 2 +-
  16  4 files changed, 4 insertions(+), 1 deletion(-)
  17
  18 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
  19 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
  20 @@ -1342,6 +1342,7 @@ struct rtl8xxxu_fileops {
  21         char rx_desc_size;
  22         u8 has_s0s1:1;
  23         u8 has_tx_report:1;
  24 +       u8 gen2_thermal_meter:1;
  25         u32 adda_1t_init;
  26         u32 adda_1t_path_on;
  27         u32 adda_2t_path_on_a;
  28 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
  29 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
  30 @@ -1505,6 +1505,7 @@ struct rtl8xxxu_fileops rtl8192eu_fops =
  31         .tx_desc_size = sizeof(struct rtl8xxxu_txdesc40),
  32         .rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24),
  33         .has_s0s1 = 0,
  34 +       .gen2_thermal_meter = 1,
  35         .adda_1t_init = 0x0fc01616,
  36         .adda_1t_path_on = 0x0fc01616,
  37         .adda_2t_path_on_a = 0x0fc01616,
  38 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
  39 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
  40 @@ -1667,6 +1667,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops =
  41         .rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24),
  42         .has_s0s1 = 1,
  43         .has_tx_report = 1,
  44 +       .gen2_thermal_meter = 1,
  45         .adda_1t_init = 0x01c00014,
  46         .adda_1t_path_on = 0x01c00014,
  47         .adda_2t_path_on_a = 0x01c00014,
  48 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  49 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  50 @@ -4195,7 +4195,7 @@ static int rtl8xxxu_init_device(struct i
  51         /*
  52          * This should enable thermal meter
  53          */
  54 -       if (priv->fops->tx_desc_size == sizeof(struct rtl8xxxu_txdesc40))
  55 +       if (priv->fops->gen2_thermal_meter)
  56                 rtl8xxxu_write_rfreg(priv,
  57                                      RF_A, RF6052_REG_T_METER_8723B, 0x37cf8);
  58         else