* [PATCH v5 0/5] rt2800: register programing tweaks and clean ups
@ 2019-02-13 10:09 Stanislaw Gruszka
2019-02-13 10:09 ` [PATCH v5 1/5] rt2x00: remove unneeded check Stanislaw Gruszka
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Stanislaw Gruszka @ 2019-02-13 10:09 UTC (permalink / raw)
To: linux-wireless
Cc: Tomislav Požega, Daniel Golle, Felix Fietkau, Mathias Kresin
This is repost of
https://lore.kernel.org/linux-wireless/1539334591-9965-1-git-send-email-sgruszka@redhat.com/
with controversial patches removed. I will work on them letter.
Stanislaw Gruszka (3):
rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band
rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620
rt2800: comment and simplify AGC init for RT6352
Tomislav Požega (2):
rt2x00: remove unneeded check
rt2x00: remove confusing AGC register
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 141 +++++++++++++------------
1 file changed, 72 insertions(+), 69 deletions(-)
--
2.7.5
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v5 1/5] rt2x00: remove unneeded check 2019-02-13 10:09 [PATCH v5 0/5] rt2800: register programing tweaks and clean ups Stanislaw Gruszka @ 2019-02-13 10:09 ` Stanislaw Gruszka 2019-02-19 15:19 ` Kalle Valo 2019-02-13 10:09 ` [PATCH v5 2/5] rt2x00: remove confusing AGC register Stanislaw Gruszka ` (3 subsequent siblings) 4 siblings, 1 reply; 7+ messages in thread From: Stanislaw Gruszka @ 2019-02-13 10:09 UTC (permalink / raw) To: linux-wireless Cc: Tomislav Požega, Daniel Golle, Felix Fietkau, Mathias Kresin From: Tomislav Požega <pozega.tomislav@gmail.com> Remove band check from rf53xx channel config routine since all chips using it are single band. Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 103 ++++++++++++------------- 1 file changed, 50 insertions(+), 53 deletions(-) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 7f813f6f8792..0165e274a884 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -2966,6 +2966,7 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, struct channel_info *info) { u8 rfcsr; + int idx = rf->channel-1; rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1); rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3); @@ -3003,60 +3004,56 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, rt2800_freq_cal_mode1(rt2x00dev); - if (rf->channel <= 14) { - int idx = rf->channel-1; - - if (rt2x00_has_cap_bt_coexist(rt2x00dev)) { - if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) { - /* r55/r59 value array of channel 1~14 */ - static const char r55_bt_rev[] = {0x83, 0x83, - 0x83, 0x73, 0x73, 0x63, 0x53, 0x53, - 0x53, 0x43, 0x43, 0x43, 0x43, 0x43}; - static const char r59_bt_rev[] = {0x0e, 0x0e, - 0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09, - 0x07, 0x07, 0x07, 0x07, 0x07, 0x07}; - - rt2800_rfcsr_write(rt2x00dev, 55, - r55_bt_rev[idx]); - rt2800_rfcsr_write(rt2x00dev, 59, - r59_bt_rev[idx]); - } else { - static const char r59_bt[] = {0x8b, 0x8b, 0x8b, - 0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89, - 0x88, 0x88, 0x86, 0x85, 0x84}; - - rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]); - } + if (rt2x00_has_cap_bt_coexist(rt2x00dev)) { + if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) { + /* r55/r59 value array of channel 1~14 */ + static const char r55_bt_rev[] = {0x83, 0x83, + 0x83, 0x73, 0x73, 0x63, 0x53, 0x53, + 0x53, 0x43, 0x43, 0x43, 0x43, 0x43}; + static const char r59_bt_rev[] = {0x0e, 0x0e, + 0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09, + 0x07, 0x07, 0x07, 0x07, 0x07, 0x07}; + + rt2800_rfcsr_write(rt2x00dev, 55, + r55_bt_rev[idx]); + rt2800_rfcsr_write(rt2x00dev, 59, + r59_bt_rev[idx]); } else { - if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) { - static const char r55_nonbt_rev[] = {0x23, 0x23, - 0x23, 0x23, 0x13, 0x13, 0x03, 0x03, - 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}; - static const char r59_nonbt_rev[] = {0x07, 0x07, - 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, - 0x07, 0x07, 0x06, 0x05, 0x04, 0x04}; - - rt2800_rfcsr_write(rt2x00dev, 55, - r55_nonbt_rev[idx]); - rt2800_rfcsr_write(rt2x00dev, 59, - r59_nonbt_rev[idx]); - } else if (rt2x00_rt(rt2x00dev, RT5390) || - rt2x00_rt(rt2x00dev, RT5392) || - rt2x00_rt(rt2x00dev, RT6352)) { - static const char r59_non_bt[] = {0x8f, 0x8f, - 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d, - 0x8a, 0x88, 0x88, 0x87, 0x87, 0x86}; - - rt2800_rfcsr_write(rt2x00dev, 59, - r59_non_bt[idx]); - } else if (rt2x00_rt(rt2x00dev, RT5350)) { - static const char r59_non_bt[] = {0x0b, 0x0b, - 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, - 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06}; - - rt2800_rfcsr_write(rt2x00dev, 59, - r59_non_bt[idx]); - } + static const char r59_bt[] = {0x8b, 0x8b, 0x8b, + 0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89, + 0x88, 0x88, 0x86, 0x85, 0x84}; + + rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]); + } + } else { + if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) { + static const char r55_nonbt_rev[] = {0x23, 0x23, + 0x23, 0x23, 0x13, 0x13, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}; + static const char r59_nonbt_rev[] = {0x07, 0x07, + 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, + 0x07, 0x07, 0x06, 0x05, 0x04, 0x04}; + + rt2800_rfcsr_write(rt2x00dev, 55, + r55_nonbt_rev[idx]); + rt2800_rfcsr_write(rt2x00dev, 59, + r59_nonbt_rev[idx]); + } else if (rt2x00_rt(rt2x00dev, RT5390) || + rt2x00_rt(rt2x00dev, RT5392) || + rt2x00_rt(rt2x00dev, RT6352)) { + static const char r59_non_bt[] = {0x8f, 0x8f, + 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d, + 0x8a, 0x88, 0x88, 0x87, 0x87, 0x86}; + + rt2800_rfcsr_write(rt2x00dev, 59, + r59_non_bt[idx]); + } else if (rt2x00_rt(rt2x00dev, RT5350)) { + static const char r59_non_bt[] = {0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, + 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06}; + + rt2800_rfcsr_write(rt2x00dev, 59, + r59_non_bt[idx]); } } } -- 2.7.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v5 1/5] rt2x00: remove unneeded check 2019-02-13 10:09 ` [PATCH v5 1/5] rt2x00: remove unneeded check Stanislaw Gruszka @ 2019-02-19 15:19 ` Kalle Valo 0 siblings, 0 replies; 7+ messages in thread From: Kalle Valo @ 2019-02-19 15:19 UTC (permalink / raw) To: Stanislaw Gruszka Cc: linux-wireless, Tomislav Požega, Daniel Golle, Felix Fietkau, Mathias Kresin Stanislaw Gruszka <sgruszka@redhat.com> wrote: > From: Tomislav Požega <pozega.tomislav@gmail.com> > > Remove band check from rf53xx channel config routine since all chips > using it are single band. > > Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com> > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> 5 patches applied to wireless-drivers-next.git, thanks. 17ae2acd1a6f rt2x00: remove unneeded check 5991a2ecd070 rt2x00: remove confusing AGC register 9ad3b5565445 rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band 7aca14885ede rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 c7ff1bfeaf1c rt2800: comment and simplify AGC init for RT6352 -- https://patchwork.kernel.org/patch/10809543/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v5 2/5] rt2x00: remove confusing AGC register 2019-02-13 10:09 [PATCH v5 0/5] rt2800: register programing tweaks and clean ups Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 1/5] rt2x00: remove unneeded check Stanislaw Gruszka @ 2019-02-13 10:09 ` Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 3/5] rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band Stanislaw Gruszka ` (2 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Stanislaw Gruszka @ 2019-02-13 10:09 UTC (permalink / raw) To: linux-wireless Cc: Tomislav Požega, Daniel Golle, Felix Fietkau, Mathias Kresin From: Tomislav Požega <pozega.tomislav@gmail.com> Register 66 was causing issues on RT6352 if set to the same value as in MTK driver. With 1c reg value device was working fine in both HT20 and HT40 modes. Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 0165e274a884..f420b6af1f2a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -3983,11 +3983,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, rt2800_bbp_write(rt2x00dev, 196, reg); /* AGC init */ - if (rt2x00_rt(rt2x00dev, RT6352)) - reg = 0x04; - else - reg = rf->channel <= 14 ? 0x1c : 0x24; - + reg = rf->channel <= 14 ? 0x1c : 0x24; reg += 2 * rt2x00dev->lna_gain; rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg); -- 2.7.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v5 3/5] rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band 2019-02-13 10:09 [PATCH v5 0/5] rt2800: register programing tweaks and clean ups Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 1/5] rt2x00: remove unneeded check Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 2/5] rt2x00: remove confusing AGC register Stanislaw Gruszka @ 2019-02-13 10:09 ` Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 4/5] rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 5/5] rt2800: comment and simplify AGC init for RT6352 Stanislaw Gruszka 4 siblings, 0 replies; 7+ messages in thread From: Stanislaw Gruszka @ 2019-02-13 10:09 UTC (permalink / raw) To: linux-wireless Cc: Tomislav Požega, Daniel Golle, Felix Fietkau, Mathias Kresin Do not enable TX_PIN_CFG_LNA_PE_A* bits for 2.4GHz band and vice versa TX_PIN_CFG_LNA_PE_G* bits for 5GHz. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index f420b6af1f2a..0c956a7f7a71 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -3893,18 +3893,24 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 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); + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A2_EN, + rf->channel > 14); + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G2_EN, + rf->channel <= 14); /* 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); + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A1_EN, + rf->channel > 14); + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G1_EN, + rf->channel <= 14); /* 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); + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN, + rf->channel > 14); + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_EN, + rf->channel <= 14); break; } -- 2.7.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v5 4/5] rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 2019-02-13 10:09 [PATCH v5 0/5] rt2800: register programing tweaks and clean ups Stanislaw Gruszka ` (2 preceding siblings ...) 2019-02-13 10:09 ` [PATCH v5 3/5] rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band Stanislaw Gruszka @ 2019-02-13 10:09 ` Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 5/5] rt2800: comment and simplify AGC init for RT6352 Stanislaw Gruszka 4 siblings, 0 replies; 7+ messages in thread From: Stanislaw Gruszka @ 2019-02-13 10:09 UTC (permalink / raw) To: linux-wireless Cc: Tomislav Požega, Daniel Golle, Felix Fietkau, Mathias Kresin The TX_PIN_CFG_RFRX_EN bit was not set on other devices than MT7620, restore old behavaviour since setting this bit maight not be correct for older devices. Fixes: 41977e86c984 ("rt2x00: add support for MT7620") Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 0c956a7f7a71..6886e09c0b27 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -3858,10 +3858,12 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, if (rt2x00_rt(rt2x00dev, RT3572)) rt2800_rfcsr_write(rt2x00dev, 8, 0); - if (rt2x00_rt(rt2x00dev, RT6352)) + if (rt2x00_rt(rt2x00dev, RT6352)) { tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG); - else + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFRX_EN, 1); + } else { tx_pin = 0; + } switch (rt2x00dev->default_ant.tx_chain_num) { case 3: @@ -3916,7 +3918,6 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1); rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1); - rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFRX_EN, 1); /* mt7620 */ rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin); -- 2.7.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v5 5/5] rt2800: comment and simplify AGC init for RT6352 2019-02-13 10:09 [PATCH v5 0/5] rt2800: register programing tweaks and clean ups Stanislaw Gruszka ` (3 preceding siblings ...) 2019-02-13 10:09 ` [PATCH v5 4/5] rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 Stanislaw Gruszka @ 2019-02-13 10:09 ` Stanislaw Gruszka 4 siblings, 0 replies; 7+ messages in thread From: Stanislaw Gruszka @ 2019-02-13 10:09 UTC (permalink / raw) To: linux-wireless Cc: Tomislav Požega, Daniel Golle, Felix Fietkau, Mathias Kresin We do not need separate lines for calculating register values. Also add comment that value is different than in vendor driver. Suggested-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 6886e09c0b27..a03b5284a050 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -3989,9 +3989,12 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, rt2800_bbp_write(rt2x00dev, 195, 141); rt2800_bbp_write(rt2x00dev, 196, reg); - /* AGC init */ - reg = rf->channel <= 14 ? 0x1c : 0x24; - reg += 2 * rt2x00dev->lna_gain; + /* AGC init. + * Despite the vendor driver using different values here for + * RT6352 chip, we use 0x1c for now. This may have to be changed + * once TSSI got implemented. + */ + reg = (rf->channel <= 14 ? 0x1c : 0x24) + 2*rt2x00dev->lna_gain; rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg); rt2800_iq_calibrate(rt2x00dev, rf->channel); -- 2.7.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-02-19 15:19 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-02-13 10:09 [PATCH v5 0/5] rt2800: register programing tweaks and clean ups Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 1/5] rt2x00: remove unneeded check Stanislaw Gruszka 2019-02-19 15:19 ` Kalle Valo 2019-02-13 10:09 ` [PATCH v5 2/5] rt2x00: remove confusing AGC register Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 3/5] rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 4/5] rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 Stanislaw Gruszka 2019-02-13 10:09 ` [PATCH v5 5/5] rt2800: comment and simplify AGC init for RT6352 Stanislaw Gruszka
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).