2022-09-16 23:09:51

by Daniel Golle

Subject: [PATCH 04/15] rt2x00: add RF self TXDC calibration for MT7620

From: Tomislav Požega <[email protected]>

Add TX self calibration based on mtk driver.

Signed-off-by: Tomislav Požega <[email protected]>
---
.../net/wireless/ralink/rt2x00/rt2800lib.c | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index b34453bd87174f..d8b7f90c05c42b 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -8435,6 +8435,53 @@ static void rt2800_init_rfcsr_5592(struct rt2x00_dev *rt2x00dev)
rt2800_led_open_drain_enable(rt2x00dev);
}

+static void rt2800_rf_self_txdc_cal(struct rt2x00_dev *rt2x00dev)
+{
+ u8 rfb5r1_org, rfb7r1_org, rfvalue;
+ u32 mac0518, mac051c, mac0528, mac052c;
+ u8 i;
+
+ mac0518 = rt2800_register_read(rt2x00dev, RF_CONTROL0);
+ mac051c = rt2800_register_read(rt2x00dev, RF_BYPASS0);
+ mac0528 = rt2800_register_read(rt2x00dev, RF_CONTROL2);
+ mac052c = rt2800_register_read(rt2x00dev, RF_BYPASS2);
+
+ rt2800_register_write(rt2x00dev, RF_BYPASS0, 0x0);
+ rt2800_register_write(rt2x00dev, RF_BYPASS2, 0x0);
+
+ rt2800_register_write(rt2x00dev, RF_CONTROL0, 0xC);
+ rt2800_register_write(rt2x00dev, RF_BYPASS0, 0x3306);
+ rt2800_register_write(rt2x00dev, RF_CONTROL2, 0x3330);
+ rt2800_register_write(rt2x00dev, RF_BYPASS2, 0xfffff);
+ rfb5r1_org = rt2800_rfcsr_read_bank(rt2x00dev, 5, 1);
+ rfb7r1_org = rt2800_rfcsr_read_bank(rt2x00dev, 7, 1);
+
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, 0x4);
+ for (i = 0; i < 100; i = i + 1) {
+ usleep_range(50, 100);
+ rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 5, 1);
+ if ((rfvalue & 0x04) != 0x4)
+ break;
+ }
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, rfb5r1_org);
+
+ rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, 0x4);
+ for (i = 0; i < 100; i = i + 1) {
+ usleep_range(50, 100);
+ rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 7, 1);
+ if ((rfvalue & 0x04) != 0x4)
+ break;
+ }
+ rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, rfb7r1_org);
+
+ rt2800_register_write(rt2x00dev, RF_BYPASS0, 0x0);
+ rt2800_register_write(rt2x00dev, RF_BYPASS2, 0x0);
+ rt2800_register_write(rt2x00dev, RF_CONTROL0, mac0518);
+ rt2800_register_write(rt2x00dev, RF_BYPASS0, mac051c);
+ rt2800_register_write(rt2x00dev, RF_CONTROL2, mac0528);
+ rt2800_register_write(rt2x00dev, RF_BYPASS2, mac052c);
+}
+
static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
bool set_bw, bool is_ht40)
{
@@ -9042,6 +9089,7 @@ static void rt2800_init_rfcsr_6352(struct rt2x00_dev *rt2x00dev)
rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C);

+ rt2800_rf_self_txdc_cal(rt2x00dev);
rt2800_bw_filter_calibration(rt2x00dev, true);
rt2800_bw_filter_calibration(rt2x00dev, false);
}
--
2.37.3

2022-09-17 12:36:06

by Stanislaw Gruszka

Subject: Re: [PATCH 04/15] rt2x00: add RF self TXDC calibration for MT7620

On Sat, Sep 17, 2022 at 12:05:27AM +0100, Daniel Golle wrote:
> From: Tomislav Požega <[email protected]>
>
> Add TX self calibration based on mtk driver.
>
> Signed-off-by: Tomislav Požega <[email protected]>

Daniel, this needs your Signed-off-by,

Acked-by: Stanislaw Gruszka <[email protected]>

> + rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, 0x4);
> + for (i = 0; i < 100; i = i + 1) {

Why not i++ ? :-)
>

2022-09-17 12:38:48

by Daniel Golle

Subject: Re: [PATCH 04/15] rt2x00: add RF self TXDC calibration for MT7620

On Sat, Sep 17, 2022 at 02:34:40PM +0200, Stanislaw Gruszka wrote:
> On Sat, Sep 17, 2022 at 12:05:27AM +0100, Daniel Golle wrote:
> > From: Tomislav Požega <[email protected]>
> >
> > Add TX self calibration based on mtk driver.
> >
> > Signed-off-by: Tomislav Požega <[email protected]>
>
> Daniel, this needs your Signed-off-by,
>
> Acked-by: Stanislaw Gruszka <[email protected]>
>
> > + rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, 0x4);
> > + for (i = 0; i < 100; i = i + 1) {
>
> Why not i++ ? :-)

or even ++i. I'll fix that in v2.