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>
103 lines
3.4 KiB
Diff
103 lines
3.4 KiB
Diff
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -8555,6 +8555,71 @@ void rt2800_r_calibration(struct rt2x00_
|
|
}
|
|
EXPORT_SYMBOL_GPL(rt2800_r_calibration);
|
|
|
|
+void rt2800_rxdcoc_calibration(struct rt2x00_dev *rt2x00dev)
|
|
+{
|
|
+ u8 bbpreg = 0;
|
|
+ u32 macvalue = 0, macvalue1 = 0;
|
|
+ u8 saverfb0r2, saverfb5r4, saverfb7r4, rfvalue;
|
|
+ int i;
|
|
+
|
|
+ saverfb0r2 = rt2800_rfcsr_read_bank(rt2x00dev, 0, 2);
|
|
+ rfvalue = saverfb0r2;
|
|
+ rfvalue |= 0x03;
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 2, rfvalue);
|
|
+
|
|
+ rt2800_bbp_write(rt2x00dev, 158, 141);
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
+ bbpreg |= 0x10;
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
+
|
|
+ macvalue = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL);
|
|
+ rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0x8);
|
|
+
|
|
+ for (i = 0; i < 10000; i++) {
|
|
+ macvalue1 = rt2800_register_read(rt2x00dev, MAC_STATUS_CFG);
|
|
+ if (macvalue1 & 0x1)
|
|
+ udelay(50);
|
|
+ else
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ saverfb5r4 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 0);
|
|
+ saverfb7r4 = rt2800_rfcsr_read_bank(rt2x00dev, 7, 4);
|
|
+ saverfb5r4 = saverfb5r4 & (~0x40);
|
|
+ saverfb7r4 = saverfb7r4 & (~0x40);
|
|
+ rt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x64);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 4, saverfb5r4);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 7, 4, saverfb7r4);
|
|
+
|
|
+ rt2800_bbp_write(rt2x00dev, 158, 141);
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
+ bbpreg = bbpreg & (~0x40);
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
+ bbpreg |= 0x48;
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
+
|
|
+ for (i = 0; i < 10000; i++) {
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
+ if ((bbpreg & 0x40)==0)
|
|
+ break;
|
|
+ udelay(50);
|
|
+ }
|
|
+
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
+ bbpreg = bbpreg & (~0x40);
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
+
|
|
+ rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, macvalue);
|
|
+
|
|
+ rt2800_bbp_write(rt2x00dev, 158, 141);
|
|
+ bbpreg = rt2800_bbp_read(rt2x00dev, 159);
|
|
+ bbpreg &= (~0x10);
|
|
+ rt2800_bbp_write(rt2x00dev, 159, bbpreg);
|
|
+
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 2, saverfb0r2);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(rt2800_rxdcoc_calibration);
|
|
+
|
|
static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
|
|
bool set_bw, bool is_ht40)
|
|
{
|
|
@@ -9164,6 +9229,7 @@ static void rt2800_init_rfcsr_6352(struc
|
|
|
|
rt2800_r_calibration(rt2x00dev);
|
|
rt2800_rf_self_txdc_cal(rt2x00dev);
|
|
+ rt2800_rxdcoc_calibration(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
|
|
@@ -246,6 +246,7 @@ void rt2800_vco_calibration(struct rt2x0
|
|
void rt2800_rf_self_txdc_cal(struct rt2x00_dev *rt2x00dev);
|
|
int rt2800_calcrcalibrationcode(struct rt2x00_dev *rt2x00dev, int d1, int d2);
|
|
void rt2800_r_calibration(struct rt2x00_dev *rt2x00dev);
|
|
+void rt2800_rxdcoc_calibration(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
|
|
@@ -575,6 +575,7 @@ struct rt2x00lib_ops {
|
|
void (*rf_self_txdc_cal) (struct rt2x00_dev *rt2x00dev);
|
|
int (*calcrcalibrationcode) (struct rt2x00_dev *rt2x00dev, int d1, int d2);
|
|
void (*r_calibration) (struct rt2x00_dev *rt2x00dev);
|
|
+ void (*rxdcoc_calibration) (struct rt2x00_dev *rt2x00dev);
|
|
|
|
/*
|
|
* Data queue handlers.
|