mac80211: Update to version 5.15.81
[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / rt2x00 / 007-v6.1-rt2x00-add-RXDCOC-calibration-for-MT7620.patch
1 From patchwork Sat Sep 17 20:27:56 2022
2 Content-Type: text/plain; charset="utf-8"
3 MIME-Version: 1.0
4 Content-Transfer-Encoding: 8bit
5 X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
6 X-Patchwork-Id: 12979248
7 X-Patchwork-Delegate: kvalo@adurom.com
8 Return-Path: <linux-wireless-owner@kernel.org>
9 Date: Sat, 17 Sep 2022 21:27:56 +0100
10 From: Daniel Golle <daniel@makrotopia.org>
11 To: linux-wireless@vger.kernel.org, Stanislaw Gruszka <stf_xl@wp.pl>,
12 Helmut Schaa <helmut.schaa@googlemail.com>
13 Cc: Kalle Valo <kvalo@kernel.org>,
14 "David S. Miller" <davem@davemloft.net>,
15 Eric Dumazet <edumazet@google.com>,
16 Jakub Kicinski <kuba@kernel.org>,
17 Paolo Abeni <pabeni@redhat.com>,
18 Johannes Berg <johannes.berg@intel.com>
19 Subject: [PATCH v3 07/16] rt2x00: add RXDCOC calibration for MT7620
20 Message-ID:
21 <850b30f652e88de30d79e968af4eb47aa5bc2511.1663445157.git.daniel@makrotopia.org>
22 References: <cover.1663445157.git.daniel@makrotopia.org>
23 MIME-Version: 1.0
24 Content-Disposition: inline
25 In-Reply-To: <cover.1663445157.git.daniel@makrotopia.org>
26 Precedence: bulk
27 List-ID: <linux-wireless.vger.kernel.org>
28 X-Mailing-List: linux-wireless@vger.kernel.org
29
30 From: Tomislav Požega <pozega.tomislav@gmail.com>
31
32 Add RXDCOC calibration code from mtk driver.
33
34 Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
35 [fixed typo reported by Serge Vasilugin <vasilugin@yandex.ru>]
36 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
37 Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
38 ---
39 .../net/wireless/ralink/rt2x00/rt2800lib.c | 60 +++++++++++++++++++
40 1 file changed, 60 insertions(+)
41
42 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
43 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
44 @@ -8633,6 +8633,65 @@ static void rt2800_r_calibration(struct
45 rt2800_register_write(rt2x00dev, PWR_PIN_CFG, MAC_PWR_PIN_CFG);
46 }
47
48 +static void rt2800_rxdcoc_calibration(struct rt2x00_dev *rt2x00dev)
49 +{
50 + u8 bbpreg = 0;
51 + u32 macvalue = 0;
52 + u8 saverfb0r2, saverfb5r4, saverfb7r4, rfvalue;
53 + int i;
54 +
55 + saverfb0r2 = rt2800_rfcsr_read_bank(rt2x00dev, 0, 2);
56 + rfvalue = saverfb0r2;
57 + rfvalue |= 0x03;
58 + rt2800_rfcsr_write_bank(rt2x00dev, 0, 2, rfvalue);
59 +
60 + rt2800_bbp_write(rt2x00dev, 158, 141);
61 + bbpreg = rt2800_bbp_read(rt2x00dev, 159);
62 + bbpreg |= 0x10;
63 + rt2800_bbp_write(rt2x00dev, 159, bbpreg);
64 +
65 + macvalue = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL);
66 + rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0x8);
67 +
68 + if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev, MAC_STATUS_CFG_BBP_RF_BUSY_TX)))
69 + rt2x00_warn(rt2x00dev, "RF TX busy in RX RXDCOC calibration\n");
70 +
71 + saverfb5r4 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 4);
72 + saverfb7r4 = rt2800_rfcsr_read_bank(rt2x00dev, 7, 4);
73 + saverfb5r4 = saverfb5r4 & (~0x40);
74 + saverfb7r4 = saverfb7r4 & (~0x40);
75 + rt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x64);
76 + rt2800_rfcsr_write_bank(rt2x00dev, 5, 4, saverfb5r4);
77 + rt2800_rfcsr_write_bank(rt2x00dev, 7, 4, saverfb7r4);
78 +
79 + rt2800_bbp_write(rt2x00dev, 158, 141);
80 + bbpreg = rt2800_bbp_read(rt2x00dev, 159);
81 + bbpreg = bbpreg & (~0x40);
82 + rt2800_bbp_write(rt2x00dev, 159, bbpreg);
83 + bbpreg |= 0x48;
84 + rt2800_bbp_write(rt2x00dev, 159, bbpreg);
85 +
86 + for (i = 0; i < 10000; i++) {
87 + bbpreg = rt2800_bbp_read(rt2x00dev, 159);
88 + if ((bbpreg & 0x40) == 0)
89 + break;
90 + usleep_range(50, 100);
91 + }
92 +
93 + bbpreg = rt2800_bbp_read(rt2x00dev, 159);
94 + bbpreg = bbpreg & (~0x40);
95 + rt2800_bbp_write(rt2x00dev, 159, bbpreg);
96 +
97 + rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, macvalue);
98 +
99 + rt2800_bbp_write(rt2x00dev, 158, 141);
100 + bbpreg = rt2800_bbp_read(rt2x00dev, 159);
101 + bbpreg &= (~0x10);
102 + rt2800_bbp_write(rt2x00dev, 159, bbpreg);
103 +
104 + rt2800_rfcsr_write_bank(rt2x00dev, 0, 2, saverfb0r2);
105 +}
106 +
107 static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
108 bool set_bw, bool is_ht40)
109 {
110 @@ -9242,6 +9301,7 @@ static void rt2800_init_rfcsr_6352(struc
111
112 rt2800_r_calibration(rt2x00dev);
113 rt2800_rf_self_txdc_cal(rt2x00dev);
114 + rt2800_rxdcoc_calibration(rt2x00dev);
115 rt2800_bw_filter_calibration(rt2x00dev, true);
116 rt2800_bw_filter_calibration(rt2x00dev, false);
117 }