| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293 |
- From 738832d9e91098f5b3ddb4e71fe8e666575c6bdb Mon Sep 17 00:00:00 2001
- From: Jes Sorensen <Jes.Sorensen@redhat.com>
- Date: Wed, 24 Aug 2016 13:54:00 -0400
- Subject: [PATCH] rtl8xxxu: Do not set auto rate fallback on 8188eu
- Introduce a fileops flag to indicate whether the device has this
- feature.
- Reported-by: Taehee Yoo <ap420073@gmail.com>
- Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
- ---
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 15 ++++++++++-----
- 6 files changed, 15 insertions(+), 5 deletions(-)
- --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
- +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
- @@ -1398,6 +1398,7 @@ struct rtl8xxxu_fileops {
- u8 has_s0s1:1;
- u8 has_tx_report:1;
- u8 gen2_thermal_meter:1;
- + u8 has_darfrc:1;
- u32 adda_1t_init;
- u32 adda_1t_path_on;
- u32 adda_2t_path_on_a;
- --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
- +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
- @@ -572,6 +572,7 @@ struct rtl8xxxu_fileops rtl8192cu_fops =
- .rx_agg_buf_size = 16000,
- .tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
- .rx_desc_size = sizeof(struct rtl8xxxu_rxdesc16),
- + .has_darfrc = 1,
- .adda_1t_init = 0x0b1b25a0,
- .adda_1t_path_on = 0x0bdb25a0,
- .adda_2t_path_on_a = 0x04db25a4,
- --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
- +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
- @@ -1655,6 +1655,7 @@ struct rtl8xxxu_fileops rtl8192eu_fops =
- .rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24),
- .has_s0s1 = 0,
- .gen2_thermal_meter = 1,
- + .has_darfrc = 1,
- .adda_1t_init = 0x0fc01616,
- .adda_1t_path_on = 0x0fc01616,
- .adda_2t_path_on_a = 0x0fc01616,
- --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
- +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
- @@ -389,6 +389,7 @@ struct rtl8xxxu_fileops rtl8723au_fops =
- .rx_agg_buf_size = 16000,
- .tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
- .rx_desc_size = sizeof(struct rtl8xxxu_rxdesc16),
- + .has_darfrc = 1,
- .adda_1t_init = 0x0b1b25a0,
- .adda_1t_path_on = 0x0bdb25a0,
- .adda_2t_path_on_a = 0x04db25a4,
- --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
- +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
- @@ -1673,6 +1673,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops =
- .has_s0s1 = 1,
- .has_tx_report = 1,
- .gen2_thermal_meter = 1,
- + .has_darfrc = 1,
- .adda_1t_init = 0x01c00014,
- .adda_1t_path_on = 0x01c00014,
- .adda_2t_path_on_a = 0x01c00014,
- --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
- +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
- @@ -4105,11 +4105,16 @@ static int rtl8xxxu_init_device(struct i
- rtl8xxxu_write32(priv, REG_EDCA_VI_PARAM, 0x005ea324);
- rtl8xxxu_write32(priv, REG_EDCA_VO_PARAM, 0x002fa226);
-
- - /* Set data auto rate fallback retry count */
- - rtl8xxxu_write32(priv, REG_DARFRC, 0x00000000);
- - rtl8xxxu_write32(priv, REG_DARFRC + 4, 0x10080404);
- - rtl8xxxu_write32(priv, REG_RARFRC, 0x04030201);
- - rtl8xxxu_write32(priv, REG_RARFRC + 4, 0x08070605);
- + /*
- + * Set data auto rate fallback retry count.
- + * Notably the 8188eu doesn't seem to use this
- + */
- + if (fops->has_darfrc) {
- + rtl8xxxu_write32(priv, REG_DARFRC, 0x00000000);
- + rtl8xxxu_write32(priv, REG_DARFRC + 4, 0x10080404);
- + rtl8xxxu_write32(priv, REG_RARFRC, 0x04030201);
- + rtl8xxxu_write32(priv, REG_RARFRC + 4, 0x08070605);
- + }
-
- val8 = rtl8xxxu_read8(priv, REG_FWHW_TXQ_CTRL);
- val8 |= FWHW_TXQ_CTRL_AMPDU_RETRY;
|
