ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-28 17:48:58 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
b8b7d4cbca
openwrt/package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch

108 lines
3.9 KiB
Diff
Raw Normal View History

mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
From 9782a7f7488443568fa4d6088b73c9aff7eb8510 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 19 Apr 2017 16:14:53 +0200
Subject: [PATCH] rt2x00: add support for external PA on MT7620
To: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Helmut Schaa <helmut.schaa@googlemail.com>,
linux-wireless@vger.kernel.org,
Kalle Valo <kvalo@codeaurora.org>
mac80211: rt2x00: cleanup ePA, RXIQ and TX-LOFT code 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>
2019-03-01 05:57:40 +00:00
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
mac80211: rt2x00: cleanup ePA, RXIQ and TX-LOFT code 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>
2019-03-01 05:57:40 +00:00
Signed-off-by: Tomislav Po=C5=BEega <pozega.tomislav@gmail.com>
[pozega.tomislav@gmail.com: use chanreg and dccal helpers.]
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
---
drivers/net/wireless/ralink/rt2x00/rt2800.h | 1 +
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 70 +++++++++++++++++++++++++-
2 files changed, 70 insertions(+), 1 deletion(-)
--- a/drivers/net/wireless/ralink/rt2x00/rt2800.h
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h
mac80211: Update to version 5.2-rc7 This updates mac80211 to version 5.2-rc7, this contains all the changes to the wireless subsystem up to Linux 5.2-rc7. * The removed patches are applied upstream * b43 now uses kmod-lib-cordic * Update the nl80211.h file in iw to match backports version. * Remove the two backports from kernel 4.9, they were needed for mt76, but that can use the version from backports now, otherwise they collide and cause compile errors. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-07-06 22:08:20 +00:00
@@ -2739,6 +2739,7 @@ enum rt2800_eeprom_word {
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
#define EEPROM_NIC_CONF2_RX_STREAM FIELD16(0x000f)
#define EEPROM_NIC_CONF2_TX_STREAM FIELD16(0x00f0)
#define EEPROM_NIC_CONF2_CRYSTAL FIELD16(0x0600)
+#define EEPROM_NIC_CONF2_EXTERNAL_PA FIELD16(0xc000)
/*
* EEPROM LNA
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
mac80211: Update to version 5.3-rc4-1 The removed patches were applied upstream. The type of the RT2X00_LIB_EEPROM config option was changed to bool, because boolean is an invalid value and the new kconfig system complained about this. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-08-03 10:30:38 +00:00
@@ -4360,6 +4360,45 @@ static void rt2800_config_channel(struct
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
rt2800_iq_calibrate(rt2x00dev, rf->channel);
}
+ if (rt2x00_rt(rt2x00dev, RT6352)) {
+ if (test_bit(CAPABILITY_EXTERNAL_PA_TX0,
+ &rt2x00dev->cap_flags)) {
+ rt2x00_warn(rt2x00dev, "Using incomplete support for " \
+ "external PA\n");
mac80211: update to backports-4.14-rc2 This updates mac80211 to backprots-4.14-rc2. This was compile and runtime tested with ath9k, ath10k and b43 with multiple stations and ieee80211w and in different scenarios by many other people. To create the backports-4.14-rc2-1.tar.xz use this repository: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git from tag v4.14-rc2-1 Then run this: ./gentree.py --git-revision v4.14-rc2 --clean <path to linux repo> ../backports-4.14-rc2-1 This also adapts the ath10k-ct and mt76 driver to the changed cfg80211 APIs and syncs the nl80211.h file in iw with the new version from backports-4.14-rc2. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-08-22 21:59:48 +00:00
+ reg = rt2800_register_read(rt2x00dev, RF_CONTROL3);
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
+ reg |= 0x00000101;
+ rt2800_register_write(rt2x00dev, RF_CONTROL3, reg);
+
mac80211: update to backports-4.14-rc2 This updates mac80211 to backprots-4.14-rc2. This was compile and runtime tested with ath9k, ath10k and b43 with multiple stations and ieee80211w and in different scenarios by many other people. To create the backports-4.14-rc2-1.tar.xz use this repository: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git from tag v4.14-rc2-1 Then run this: ./gentree.py --git-revision v4.14-rc2 --clean <path to linux repo> ../backports-4.14-rc2-1 This also adapts the ath10k-ct and mt76 driver to the changed cfg80211 APIs and syncs the nl80211.h file in iw with the new version from backports-4.14-rc2. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-08-22 21:59:48 +00:00
+ reg = rt2800_register_read(rt2x00dev, RF_BYPASS3);
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
+ reg |= 0x00000101;
+ rt2800_register_write(rt2x00dev, RF_BYPASS3, reg);
+
mac80211: rt2x00: cleanup ePA, RXIQ and TX-LOFT code 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>
2019-03-01 05:57:40 +00:00
+ 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);
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
+
+ rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
+ 0x36303636);
+ rt2800_register_write(rt2x00dev, TX0_RF_GAIN_ATTEN,
+ 0x6C6C6B6C);
+ rt2800_register_write(rt2x00dev, TX1_RF_GAIN_ATTEN,
+ 0x6C6C6B6C);
+ }
+ }
+
mac80211: update to backports-4.14-rc2 This updates mac80211 to backprots-4.14-rc2. This was compile and runtime tested with ath9k, ath10k and b43 with multiple stations and ieee80211w and in different scenarios by many other people. To create the backports-4.14-rc2-1.tar.xz use this repository: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git from tag v4.14-rc2-1 Then run this: ./gentree.py --git-revision v4.14-rc2 --clean <path to linux repo> ../backports-4.14-rc2-1 This also adapts the ath10k-ct and mt76 driver to the changed cfg80211 APIs and syncs the nl80211.h file in iw with the new version from backports-4.14-rc2. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-08-22 21:59:48 +00:00
bbp = rt2800_bbp_read(rt2x00dev, 4);
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf));
rt2800_bbp_write(rt2x00dev, 4, bbp);
mac80211: Update to version 5.3-rc4-1 The removed patches were applied upstream. The type of the RT2X00_LIB_EEPROM config option was changed to bool, because boolean is an invalid value and the new kconfig system complained about this. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-08-03 10:30:38 +00:00
@@ -9555,7 +9594,8 @@ static int rt2800_init_eeprom(struct rt2
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
*/
mac80211: update to backports-4.14-rc2 This updates mac80211 to backprots-4.14-rc2. This was compile and runtime tested with ath9k, ath10k and b43 with multiple stations and ieee80211w and in different scenarios by many other people. To create the backports-4.14-rc2-1.tar.xz use this repository: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git from tag v4.14-rc2-1 Then run this: ./gentree.py --git-revision v4.14-rc2 --clean <path to linux repo> ../backports-4.14-rc2-1 This also adapts the ath10k-ct and mt76 driver to the changed cfg80211 APIs and syncs the nl80211.h file in iw with the new version from backports-4.14-rc2. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-08-22 21:59:48 +00:00
eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1);
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
- if (rt2x00_rt(rt2x00dev, RT3352)) {
+ if (rt2x00_rt(rt2x00dev, RT3352) ||
+ rt2x00_rt(rt2x00dev, RT6352)) {
if (rt2x00_get_field16(eeprom,
EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
__set_bit(CAPABILITY_EXTERNAL_PA_TX0,
mac80211: Update to version 5.3-rc4-1 The removed patches were applied upstream. The type of the RT2X00_LIB_EEPROM config option was changed to bool, because boolean is an invalid value and the new kconfig system complained about this. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-08-03 10:30:38 +00:00
@@ -9566,6 +9606,18 @@ static int rt2800_init_eeprom(struct rt2
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
&rt2x00dev->cap_flags);
}
mac80211: update to backports-4.14-rc2 This updates mac80211 to backprots-4.14-rc2. This was compile and runtime tested with ath9k, ath10k and b43 with multiple stations and ieee80211w and in different scenarios by many other people. To create the backports-4.14-rc2-1.tar.xz use this repository: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git from tag v4.14-rc2-1 Then run this: ./gentree.py --git-revision v4.14-rc2 --clean <path to linux repo> ../backports-4.14-rc2-1 This also adapts the ath10k-ct and mt76 driver to the changed cfg80211 APIs and syncs the nl80211.h file in iw with the new version from backports-4.14-rc2. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-08-22 21:59:48 +00:00
+ eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF2);
mac80211: rt2x00: add incomplete support for external PA on MT7620 Do as the vendor driver does -- however, some devices apparently patched support for external PA into the driver similar to how it was done on Rt3352, using EEPROM_NIC_CONF1 rather than EEPROM_NIC_CONF2, hence we check for both fields. Somehow the vendor driver also no longer offers the option of only one of the TX paths having an external PA (which was probably to weird to ever be implemented in practise, though it doesn't seem like a particularly bad idea to me). Do the same in rt2x00 and enable support for external PA on both TX paths whenever it is set for TX0 in EEPROM. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-04-23 23:44:29 +00:00
+
+ if (rt2x00_rt(rt2x00dev, RT6352) && eeprom != 0 && eeprom != 0xffff) {
+ if (rt2x00_get_field16(eeprom,
+ EEPROM_NIC_CONF2_EXTERNAL_PA)) {
+ __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
+ &rt2x00dev->cap_flags);
+ __set_bit(CAPABILITY_EXTERNAL_PA_TX1,
+ &rt2x00dev->cap_flags);
+ }
+ }
+
return 0;
}
Reference in New Issue Copy Permalink