1 From patchwork Sat Sep 17 20:27:10 2022
2 Content-Type: text/plain; charset="utf-8"
4 Content-Transfer-Encoding: 7bit
5 X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
6 X-Patchwork-Id: 12979245
7 X-Patchwork-Delegate: kvalo@adurom.com
8 Return-Path: <linux-wireless-owner@kernel.org>
9 Date: Sat, 17 Sep 2022 21:27:10 +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 04/16] rt2x00: move up and reuse busy wait functions
21 <3fdb9dc15e76a9f9c1948b4a3a1308a7a5677bb8.1663445157.git.daniel@makrotopia.org>
22 References: <cover.1663445157.git.daniel@makrotopia.org>
24 Content-Disposition: inline
25 In-Reply-To: <cover.1663445157.git.daniel@makrotopia.org>
27 List-ID: <linux-wireless.vger.kernel.org>
28 X-Mailing-List: linux-wireless@vger.kernel.org
30 Move bbp_ready and rf_ready busy wait functions up in the code so they
31 can more easily be used. Allow specifying register mask in rf_ready
32 function which is useful for calibration routines which will be added
35 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
36 Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
38 .../net/wireless/ralink/rt2x00/rt2800lib.c | 99 +++++++++----------
39 1 file changed, 46 insertions(+), 53 deletions(-)
41 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
42 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
43 @@ -2143,6 +2143,48 @@ void rt2800_config_erp(struct rt2x00_dev
45 EXPORT_SYMBOL_GPL(rt2800_config_erp);
47 +static int rt2800_wait_bbp_rf_ready(struct rt2x00_dev *rt2x00dev,
48 + const struct rt2x00_field32 mask)
53 + for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
54 + reg = rt2800_register_read(rt2x00dev, MAC_STATUS_CFG);
55 + if (!rt2x00_get_field32(reg, mask))
58 + udelay(REGISTER_BUSY_DELAY);
61 + rt2x00_err(rt2x00dev, "BBP/RF register access failed, aborting\n");
65 +static int rt2800_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)
71 + * BBP was enabled after firmware was loaded,
72 + * but we need to reactivate it now.
74 + rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
75 + rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
78 + for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
79 + value = rt2800_bbp_read(rt2x00dev, 0);
80 + if ((value != 0xff) && (value != 0x00))
82 + udelay(REGISTER_BUSY_DELAY);
85 + rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");
89 static void rt2800_config_3572bt_ant(struct rt2x00_dev *rt2x00dev)
92 @@ -3799,10 +3841,9 @@ static void rt2800_config_alc(struct rt2
93 struct ieee80211_channel *chan,
95 u16 eeprom, target_power, max_power;
96 - u32 mac_sys_ctrl, mac_status;
102 /* hardware unit is 0.5dBm, limited to 23.5dBm */
104 @@ -3838,16 +3879,8 @@ static void rt2800_config_alc(struct rt2
106 rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0);
107 /* Check MAC Tx/Rx idle */
108 - for (i = 0; i < 10000; i++) {
109 - mac_status = rt2800_register_read(rt2x00dev, MAC_STATUS_CFG);
110 - if (mac_status & 0x3)
111 - usleep_range(50, 200);
117 - rt2x00_warn(rt2x00dev, "Wait MAC Status to MAX !!!\n");
118 + if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev, MAC_STATUS_CFG_BBP_RF_BUSY)))
119 + rt2x00_warn(rt2x00dev, "RF busy while configuring ALC\n");
121 if (chan->center_freq > 2457) {
122 bbp = rt2800_bbp_read(rt2x00dev, 30);
123 @@ -6249,46 +6282,6 @@ static int rt2800_init_registers(struct
127 -static int rt2800_wait_bbp_rf_ready(struct rt2x00_dev *rt2x00dev)
132 - for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
133 - reg = rt2800_register_read(rt2x00dev, MAC_STATUS_CFG);
134 - if (!rt2x00_get_field32(reg, MAC_STATUS_CFG_BBP_RF_BUSY))
137 - udelay(REGISTER_BUSY_DELAY);
140 - rt2x00_err(rt2x00dev, "BBP/RF register access failed, aborting\n");
144 -static int rt2800_wait_bbp_ready(struct rt2x00_dev *rt2x00dev)
150 - * BBP was enabled after firmware was loaded,
151 - * but we need to reactivate it now.
153 - rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
154 - rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
157 - for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
158 - value = rt2800_bbp_read(rt2x00dev, 0);
159 - if ((value != 0xff) && (value != 0x00))
161 - udelay(REGISTER_BUSY_DELAY);
164 - rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");
168 static void rt2800_bbp4_mac_if_ctrl(struct rt2x00_dev *rt2x00dev)
170 @@ -9110,7 +9103,7 @@ int rt2800_enable_radio(struct rt2x00_de
172 * Wait BBP/RF to wake up.
174 - if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev)))
175 + if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev, MAC_STATUS_CFG_BBP_RF_BUSY)))