ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-04 02:01:35 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

mac80211: rt2x00: cleanup ePA, RXIQ and TX-LOFT code

Browse Source 
consolidate patch 651-rt2x00-remove-unneccesary-code.patch.
fixup the most obvious whitespace problems in RXIQ and TX-LOFT code.
always backup registers bbpr1, bbpr4, bbpr241 and bbpr242 to avoid
compiler warning about them being potentially uninitialized.
no functional changes (intended)

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2019-03-01 06:57:40 +01:00
parent 7cf6e11721
commit 98f86e61ea
4 changed files with 84 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
View File

@ -6,8 +6,13 @@ To: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Helmut Schaa <helmut.schaa@googlemail.com>, Cc: Helmut Schaa <helmut.schaa@googlemail.com>,
linux-wireless@vger.kernel.org, linux-wireless@vger.kernel.org,
Kalle Valo <kvalo@codeaurora.org> Kalle Valo <kvalo@codeaurora.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Tomislav Po=C5=BEega <pozega.tomislav@gmail.com>
[pozega.tomislav@gmail.com: use chanreg and dccal helpers.]
--- ---
drivers/net/wireless/ralink/rt2x00/rt2800.h | 1 + drivers/net/wireless/ralink/rt2x00/rt2800.h | 1 +
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 70 +++++++++++++++++++++++++- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 70 +++++++++++++++++++++++++-
@ -25,7 +30,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* EEPROM LNA * EEPROM LNA
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -4290,6 +4290,61 @@ static void rt2800_config_channel(struct @@ -4290,6 +4290,45 @@ static void rt2800_config_channel(struct
rt2800_iq_calibrate(rt2x00dev, rf->channel); rt2800_iq_calibrate(rt2x00dev, rf->channel);
} }
@ -42,38 +47,22 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+ reg |= 0x00000101; + reg |= 0x00000101;
+ rt2800_register_write(rt2x00dev, RF_BYPASS3, reg); + rt2800_register_write(rt2x00dev, RF_BYPASS3, reg);
+ +
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 43, 0x73); + rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0x73);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 43, 0x73); + rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0x73);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 44, 0x73); + rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0x73);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 44, 0x73); + rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 45, 0x73); + rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0xC8);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 45, 0x73); + rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xA4);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 46, 0x27); + rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x05);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 46, 0x27); + rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 47, 0xC8); + rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0xC8);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 47, 0xC8); + rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xA4);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 48, 0xA4); + rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x05);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 48, 0xA4); + rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x27);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 49, 0x05); + rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0xC8);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 49, 0x05); + rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xA4);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 54, 0x27); + rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x05);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 54, 0x27); + rt2800_rfcsr_write_dccal(rt2x00dev, 05, 0x00);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 55, 0xC8);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 55, 0xC8);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 56, 0xA4);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 56, 0xA4);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 57, 0x05);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 57, 0x05);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 58, 0x27);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 58, 0x27);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 59, 0xC8);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 59, 0xC8);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 60, 0xA4);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 60, 0xA4);
+ rt2800_rfcsr_write_bank(rt2x00dev, 4, 61, 0x05);
+ rt2800_rfcsr_write_bank(rt2x00dev, 6, 61, 0x05);
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 05, 0x00);
+ rt2800_rfcsr_write_bank(rt2x00dev, 7, 05, 0x00);
+ +
+ rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT, + rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
+ 0x36303636); + 0x36303636);
@ -87,7 +76,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
bbp = rt2800_bbp_read(rt2x00dev, 4); bbp = rt2800_bbp_read(rt2x00dev, 4);
rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf)); rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf));
rt2800_bbp_write(rt2x00dev, 4, bbp); rt2800_bbp_write(rt2x00dev, 4, bbp);
@@ -9487,7 +9542,8 @@ static int rt2800_init_eeprom(struct rt2 @@ -9487,7 +9526,8 @@ static int rt2800_init_eeprom(struct rt2
*/ */
eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1); eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1);
@ -97,7 +86,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
if (rt2x00_get_field16(eeprom, if (rt2x00_get_field16(eeprom,
EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352)) EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
__set_bit(CAPABILITY_EXTERNAL_PA_TX0, __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
@@ -9498,6 +9554,18 @@ static int rt2800_init_eeprom(struct rt2 @@ -9498,6 +9538,18 @@ static int rt2800_init_eeprom(struct rt2
&rt2x00dev->cap_flags); &rt2x00dev->cap_flags);
} }

132
package/kernel/mac80211/patches/rt2x00/651-rt2x00-remove-unneccesary-code.patch
View File

@ -1,132 +0,0 @@
From pozega.tomislav@gmail.com Thu May 18 12:42:27 2017
Return-path: <pozega.tomislav@gmail.com>
Envelope-to: daniel@makrotopia.org
Delivery-date: Thu, 18 May 2017 12:42:27 +0200
Received: from mail by fudo.makrotopia.org with sa-checked (Exim 4.88)
(envelope-from <pozega.tomislav@gmail.com>)
id 1dBIsy-00088b-PU
for daniel@makrotopia.org; Thu, 18 May 2017 12:42:27 +0200
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on fudo.makrotopia.org
X-Spam-Level:
X-Spam-Status: No, score=-0.8 required=2.5 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_LOW shortcircuit=no
autolearn=ham autolearn_force=no version=3.4.1
Received: from mail-oi0-x22a.google.com ([2607:f8b0:4003:c06::22a])
by fudo.makrotopia.org with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128)
(Exim 4.88)
(envelope-from <pozega.tomislav@gmail.com>)
id 1dBIsv-00088Q-Dq
for daniel@makrotopia.org; Thu, 18 May 2017 12:42:24 +0200
Received: by mail-oi0-x22a.google.com with SMTP id w10so48782189oif.0
for <daniel@makrotopia.org>; Thu, 18 May 2017 03:42:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20161025;
h=mime-version:from:date:message-id:subject:to;
bh=9dF7PHDassYY74+N6dAhmsL/B9i5oG3SEuMzHuazhJo=;
b=cBGJ44v+o4ASyCPmHCBRMmRYnJCv4Gx6lzDiScKn0XqYmNHYpZTPg5cAY1GZFUhHdz
9QT5fzhJKFikBliSuJc/7/pI8KzvyEAdvawiWA7/5fbeiTZ+zjJnzRVGezqkYDKxjR6u
7TsoJxR2/oFwo7bOFlThhee+Nwf7qaX8AVal7JdkqovekX79JQ5vsKAa4LapDp7Cl0wr
KCh0WRUHGEgpTLJFyQ3ThPmLqc8bhmu+6/V/LJ53VOY7uksZHMhvaKkk9vDCoOuPnBMK
Cj2/c7z9RTErz/xlHg6HxnBe/pPc31XUsuPJUleOEdZASczPsreEEKacKCONVlP1wjAB
iOkA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
bh=9dF7PHDassYY74+N6dAhmsL/B9i5oG3SEuMzHuazhJo=;
b=LJAe4ZwS9aNJypROW7j+I9aNfRBWyDYy0c8ABnDbLrIoF9P2AA/Vs/Cli5f7GjaAxr
1JCx602ach+7R7QjQq/nqNmLuhRCfSvB0TGrq4R4v+CJ4ADO541+PddnFiU1dlIXQRP2
TE2FOydSO0FGJBMg+kY0eFiidBtYj1T5x7IHAhQzufiuiF6/1xZS8h61CYJjLzt/aR5y
JxOxsVvu3W2YQ0T5wKmAPlKtarFH6ZZgs446bRYt1MX5KAWzIoBM1+IPMMv7lSCpCaDR
fwH05aDyaJW2IzXH5R9Tq7gGYycYjx/SnO7JupJXJVvOzKgBJxp60JwJhCfqCwESDuuD
8nNA==
X-Gm-Message-State: AODbwcDOpdFZgbxAxFsVsqFdCBN3pRGDvEclZ1heVg2byNZ9BuG5kqJg
GvZ9x4NGt0v8lVGa3esDw0N1KiJENg==
X-Received: by 10.157.17.217 with SMTP id y25mr1310632oty.137.1495104134863;
Thu, 18 May 2017 03:42:14 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.157.0.105 with HTTP; Thu, 18 May 2017 03:42:14 -0700 (PDT)
From: Tom Psyborg <pozega.tomislav@gmail.com>
Date: Thu, 18 May 2017 12:42:14 +0200
Message-ID: <CAKR_QVJBSKw2uCY4RbHZPvbGkMcvnBh+j6F+9t93mG3BakjX3Q@mail.gmail.com>
Subject: [PATCH] rt2x00: remove unneccesary code
To: linux-wireless <linux-wireless@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Jes Sorensen <jes.sorensen@gmail.com>, Stanislaw Gruszka <sgruszka@redhat.com>,
David Miller <davem@davemloft.net>, Helmut Schaa <helmut.schaa@googlemail.com>,
Kalle Valo <kvalo@codeaurora.org>, Daniel Golle <daniel@makrotopia.org>,
Mathias Kresin <dev@kresin.me>, Johannes Berg <johannes.berg@intel.com>,
Serge Vasilugin <vasilugin@yandex.ru>, Roman Yeryomin <roman@advem.lv>,
Networking <netdev@vger.kernel.org>
Content-Type: multipart/alternative; boundary="94eb2c1905d2dc6361054fca0e62"
Status: RO
Content-Length: 11079
Lines: 178
--94eb2c1905d2dc6361054fca0e62
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Use chanreg and dccal helpers to reduce the size of ePA code.
Signed-off-by: Tomislav Po=C5=BEega <pozega.tomislav@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
[daniel@makrotopia.org: fixed white-space so patch applies]
---
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -4303,38 +4303,22 @@ static void rt2800_config_channel(struct
reg |= 0x00000101;
rt2800_register_write(rt2x00dev, RF_BYPASS3, reg);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 43, 0x73);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 43, 0x73);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 44, 0x73);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 44, 0x73);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 45, 0x73);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 45, 0x73);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 46, 0x27);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 46, 0x27);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 47, 0xC8);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 47, 0xC8);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 48, 0xA4);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 48, 0xA4);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 49, 0x05);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 49, 0x05);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 54, 0x27);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 54, 0x27);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 55, 0xC8);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 55, 0xC8);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 56, 0xA4);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 56, 0xA4);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 57, 0x05);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 57, 0x05);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 58, 0x27);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 58, 0x27);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 59, 0xC8);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 59, 0xC8);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 60, 0xA4);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 60, 0xA4);
- rt2800_rfcsr_write_bank(rt2x00dev, 4, 61, 0x05);
- rt2800_rfcsr_write_bank(rt2x00dev, 6, 61, 0x05);
- rt2800_rfcsr_write_bank(rt2x00dev, 5, 05, 0x00);
- rt2800_rfcsr_write_bank(rt2x00dev, 7, 05, 0x00);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0x73);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0x73);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0x73);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0xC8);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xA4);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x05);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0xC8);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xA4);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x05);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x27);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0xC8);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xA4);
+ rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x05);
+ rt2800_rfcsr_write_dccal(rt2x00dev, 05, 0x00);
rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
0x36303636);

7
package/kernel/mac80211/patches/rt2x00/986-rt2x00-add-TX-LOFT-calibration.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -9000,6 +9000,957 @@ restore_value: @@ -9000,6 +9000,954 @@ restore_value:
} }
EXPORT_SYMBOL_GPL(rt2800_rxiq_calibration); EXPORT_SYMBOL_GPL(rt2800_rxiq_calibration);
@ -216,7 +216,6 @@
+ ptmp = ptmp + (fftout_q * fftout_q); + ptmp = ptmp + (fftout_q * fftout_q);
+ ptmp = ptmp >> 1; + ptmp = ptmp >> 1;
+ pint = pint + ptmp; + pint = pint + ptmp;
+
+ } + }
+ +
+ return pint; + return pint;
@ -725,12 +724,10 @@
+ macorg4 = rt2800_register_read(rt2x00dev, RF_CONTROL3); + macorg4 = rt2800_register_read(rt2x00dev, RF_CONTROL3);
+ macorg5 = rt2800_register_read(rt2x00dev, RF_BYPASS3); + macorg5 = rt2800_register_read(rt2x00dev, RF_BYPASS3);
+ +
+ if (test_bit(CAPABILITY_EXTERNAL_PA_TX0, &rt2x00dev->cap_flags)) {
+ bbpr1 = rt2800_bbp_read(rt2x00dev, 1); + bbpr1 = rt2800_bbp_read(rt2x00dev, 1);
+ bbpr4 = rt2800_bbp_read(rt2x00dev, 4); + bbpr4 = rt2800_bbp_read(rt2x00dev, 4);
+ bbpr241 = rt2800_bbp_read(rt2x00dev, 241); + bbpr241 = rt2800_bbp_read(rt2x00dev, 241);
+ bbpr242 = rt2800_bbp_read(rt2x00dev, 242); + bbpr242 = rt2800_bbp_read(rt2x00dev, 242);
+ }
+ mac13b8 = rt2800_register_read(rt2x00dev, 0x13b8); + mac13b8 = rt2800_register_read(rt2x00dev, 0x13b8);
+ +
+ macvalue = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL); + macvalue = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL);
@ -958,7 +955,7 @@
static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev, static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
bool set_bw, bool is_ht40) bool set_bw, bool is_ht40)
{ {
@@ -9612,6 +10563,7 @@ static void rt2800_init_rfcsr_6352(struc @@ -9612,6 +10560,7 @@ static void rt2800_init_rfcsr_6352(struc
rt2800_rxdcoc_calibration(rt2x00dev); rt2800_rxdcoc_calibration(rt2x00dev);
rt2800_bw_filter_calibration(rt2x00dev, true); rt2800_bw_filter_calibration(rt2x00dev, true);
rt2800_bw_filter_calibration(rt2x00dev, false); rt2800_bw_filter_calibration(rt2x00dev, false);