mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 14:04:26 -04:00
2e0f41e73a
Cherry-pick Multi-AP commits from uptream: 9c06f0f6a hostapd: Add Multi-AP protocol support 5abc7823b wpa_supplicant: Add Multi-AP backhaul STA support a1debd338 tests: Refactor test_multi_ap bfcdac1c8 Multi-AP: Don't reject backhaul STA on fronthaul BSS cb3c156e7 tests: Update multi_ap_fronthaul_on_ap to match implementation 56a2d788f WPS: Add multi_ap_subelem to wps_build_wfa_ext() 83ebf5586 wpa_supplicant: Support Multi-AP backhaul STA onboarding with WPS 66819b07b hostapd: Support Multi-AP backhaul STA onboarding with WPS 8682f384c hostapd: Add README-MULTI-AP b1daf498a tests: Multi-AP WPS provisioning Add support for Multi-AP to the UCI configuration. Every wifi-iface gets an option 'multi_ap'. For APs, its value can be 0 (multi-AP support disabled), 1 (backhaul AP), 2 (fronthaul AP), or 3 (fronthaul + backhaul AP). For STAs, it can be 0 (not a backhaul STA) or 1 (backhaul STA, can only associate with backhaul AP). Also add new optional parameter to wps_start ubus call of wpa_supplicant to indicate that a Multi-AP backhaul link is required. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
90 lines
3.3 KiB
Diff
90 lines
3.3 KiB
Diff
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -8349,6 +8349,58 @@ static void rt2800_init_rfcsr_5592(struc
|
|
rt2800_led_open_drain_enable(rt2x00dev);
|
|
}
|
|
|
|
+void rt2800_rf_self_txdc_cal(struct rt2x00_dev *rt2x00dev)
|
|
+{
|
|
+ u8 rfb5r1_org, rfb7r1_org, rfvalue;
|
|
+ u32 mac0518, mac051c, mac0528, mac052c;
|
|
+ u8 i;
|
|
+
|
|
+ rt2x00_info(rt2x00dev, "RF Tx self calibration start\n");
|
|
+ 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);
|
|
+ for (i = 0; i < 100; i = i + 1) {
|
|
+ udelay(50);
|
|
+ rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 5, 1);
|
|
+ if((rfvalue & 0x04) != 0x4)
|
|
+ break;
|
|
+ }
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, rfb5r1_org);
|
|
+
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, 0x4);
|
|
+ for (i = 0; i < 100; i = i + 1) {
|
|
+ udelay(50);
|
|
+ rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 7, 1);
|
|
+ if((rfvalue & 0x04) != 0x4)
|
|
+ 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);
|
|
+
|
|
+ rt2x00_info(rt2x00dev, "RF Tx self calibration end\n");
|
|
+
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(rt2800_rf_self_txdc_cal);
|
|
+
|
|
static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
|
|
bool set_bw, bool is_ht40)
|
|
{
|
|
@@ -8956,6 +9008,7 @@ static void rt2800_init_rfcsr_6352(struc
|
|
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);
|
|
}
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
|
|
@@ -243,6 +243,7 @@ void rt2800_link_tuner(struct rt2x00_dev
|
|
const u32 count);
|
|
void rt2800_gain_calibration(struct rt2x00_dev *rt2x00dev);
|
|
void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev);
|
|
+void rt2800_rf_self_txdc_cal(struct rt2x00_dev *rt2x00dev);
|
|
|
|
int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev);
|
|
void rt2800_disable_radio(struct rt2x00_dev *rt2x00dev);
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
@@ -572,6 +572,7 @@ struct rt2x00lib_ops {
|
|
struct link_qual *qual, const u32 count);
|
|
void (*gain_calibration) (struct rt2x00_dev *rt2x00dev);
|
|
void (*vco_calibration) (struct rt2x00_dev *rt2x00dev);
|
|
+ void (*rf_self_txdc_cal) (struct rt2x00_dev *rt2x00dev);
|
|
|
|
/*
|
|
* Data queue handlers.
|