2022-09-17 19:11:12 +00:00
|
|
|
From patchwork Sat Sep 17 20:27:26 2022
|
|
|
|
Content-Type: text/plain; charset="utf-8"
|
2022-09-12 20:21:05 +00:00
|
|
|
MIME-Version: 1.0
|
|
|
|
Content-Transfer-Encoding: 8bit
|
2022-09-17 19:11:12 +00:00
|
|
|
X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
|
|
|
|
X-Patchwork-Id: 12979246
|
|
|
|
X-Patchwork-Delegate: kvalo@adurom.com
|
|
|
|
Return-Path: <linux-wireless-owner@kernel.org>
|
|
|
|
Date: Sat, 17 Sep 2022 21:27:26 +0100
|
|
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
|
|
To: linux-wireless@vger.kernel.org, Stanislaw Gruszka <stf_xl@wp.pl>,
|
|
|
|
Helmut Schaa <helmut.schaa@googlemail.com>
|
2022-09-16 23:33:30 +00:00
|
|
|
Cc: Kalle Valo <kvalo@kernel.org>,
|
2022-09-17 19:11:12 +00:00
|
|
|
"David S. Miller" <davem@davemloft.net>,
|
|
|
|
Eric Dumazet <edumazet@google.com>,
|
|
|
|
Jakub Kicinski <kuba@kernel.org>,
|
|
|
|
Paolo Abeni <pabeni@redhat.com>,
|
|
|
|
Johannes Berg <johannes.berg@intel.com>
|
|
|
|
Subject: [PATCH v3 05/16] rt2x00: add RF self TXDC calibration for MT7620
|
|
|
|
Message-ID:
|
|
|
|
<dbb6e5a0c12d6101477bd09e83253091d21512c9.1663445157.git.daniel@makrotopia.org>
|
|
|
|
References: <cover.1663445157.git.daniel@makrotopia.org>
|
|
|
|
MIME-Version: 1.0
|
|
|
|
Content-Disposition: inline
|
|
|
|
In-Reply-To: <cover.1663445157.git.daniel@makrotopia.org>
|
|
|
|
Precedence: bulk
|
|
|
|
List-ID: <linux-wireless.vger.kernel.org>
|
|
|
|
X-Mailing-List: linux-wireless@vger.kernel.org
|
2022-09-16 23:33:30 +00:00
|
|
|
|
|
|
|
From: Tomislav Požega <pozega.tomislav@gmail.com>
|
2022-09-12 20:21:05 +00:00
|
|
|
|
|
|
|
Add TX self calibration based on mtk driver.
|
|
|
|
|
|
|
|
Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
|
2022-09-17 19:11:12 +00:00
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
|
Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
|
2022-09-12 20:21:05 +00:00
|
|
|
---
|
2022-09-17 19:11:12 +00:00
|
|
|
v2: use ++i instead of i = i + 1 in loops
|
|
|
|
|
2022-09-16 23:33:30 +00:00
|
|
|
.../net/wireless/ralink/rt2x00/rt2800lib.c | 48 +++++++++++++++++++
|
|
|
|
1 file changed, 48 insertions(+)
|
2022-09-12 20:21:05 +00:00
|
|
|
|
2018-01-08 12:42:27 +00:00
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
2022-09-17 19:11:12 +00:00
|
|
|
@@ -8428,6 +8428,53 @@ static void rt2800_init_rfcsr_5592(struc
|
2018-01-08 12:42:27 +00:00
|
|
|
rt2800_led_open_drain_enable(rt2x00dev);
|
|
|
|
}
|
|
|
|
|
2020-03-30 22:35:04 +00:00
|
|
|
+static void rt2800_rf_self_txdc_cal(struct rt2x00_dev *rt2x00dev)
|
2018-01-08 12:42:27 +00:00
|
|
|
+{
|
|
|
|
+ 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);
|
2022-09-17 19:11:12 +00:00
|
|
|
+ for (i = 0; i < 100; ++i) {
|
2022-09-16 23:33:30 +00:00
|
|
|
+ usleep_range(50, 100);
|
2018-01-08 12:42:27 +00:00
|
|
|
+ rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 5, 1);
|
2022-09-16 23:33:30 +00:00
|
|
|
+ if ((rfvalue & 0x04) != 0x4)
|
2018-01-08 12:42:27 +00:00
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, rfb5r1_org);
|
|
|
|
+
|
|
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, 0x4);
|
2022-09-17 19:11:12 +00:00
|
|
|
+ for (i = 0; i < 100; ++i) {
|
2022-09-16 23:33:30 +00:00
|
|
|
+ usleep_range(50, 100);
|
2018-01-08 12:42:27 +00:00
|
|
|
+ rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 7, 1);
|
2022-09-16 23:33:30 +00:00
|
|
|
+ if ((rfvalue & 0x04) != 0x4)
|
2018-01-08 12:42:27 +00:00
|
|
|
+ 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)
|
|
|
|
{
|
2022-09-17 19:11:12 +00:00
|
|
|
@@ -9035,6 +9082,7 @@ static void rt2800_init_rfcsr_6352(struc
|
2018-01-08 12:42:27 +00:00
|
|
|
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);
|
|
|
|
}
|