mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 21:44:27 -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>
194 lines
6.6 KiB
Diff
194 lines
6.6 KiB
Diff
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -8401,6 +8401,160 @@ void rt2800_rf_self_txdc_cal(struct rt2x
|
|
}
|
|
EXPORT_SYMBOL_GPL(rt2800_rf_self_txdc_cal);
|
|
|
|
+int rt2800_calcrcalibrationcode(struct rt2x00_dev *rt2x00dev, int d1, int d2)
|
|
+{
|
|
+ int calcode;
|
|
+ calcode = ((d2 - d1) * 1000) / 43;
|
|
+ if ((calcode%10) >= 5)
|
|
+ calcode += 10;
|
|
+ calcode = (calcode / 10);
|
|
+
|
|
+ return calcode;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(rt2800_calcrcalibrationcode);
|
|
+
|
|
+void rt2800_r_calibration(struct rt2x00_dev *rt2x00dev)
|
|
+{
|
|
+ u32 savemacsysctrl;
|
|
+ u8 saverfb0r1, saverfb0r34, saverfb0r35;
|
|
+ u8 saverfb5r4, saverfb5r17, saverfb5r18;
|
|
+ u8 saverfb5r19, saverfb5r20;
|
|
+ u8 savebbpr22, savebbpr47, savebbpr49;
|
|
+ u8 bytevalue = 0;
|
|
+ int rcalcode;
|
|
+ u8 r_cal_code = 0;
|
|
+ char d1 = 0, d2 = 0;
|
|
+ u8 rfvalue;
|
|
+ u32 MAC_RF_BYPASS0, MAC_RF_CONTROL0, MAC_PWR_PIN_CFG;
|
|
+
|
|
+ saverfb0r1 = rt2800_rfcsr_read_bank(rt2x00dev, 0, 1);
|
|
+ saverfb0r34 = rt2800_rfcsr_read_bank(rt2x00dev, 0, 34);
|
|
+ saverfb0r35 = rt2800_rfcsr_read_bank(rt2x00dev, 0, 35);
|
|
+ saverfb5r4 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 4);
|
|
+ saverfb5r17 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 17);
|
|
+ saverfb5r18 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 18);
|
|
+ saverfb5r19 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 19);
|
|
+ saverfb5r20 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 20);
|
|
+
|
|
+ savebbpr22 = rt2800_bbp_read(rt2x00dev, 22);
|
|
+ savebbpr47 = rt2800_bbp_read(rt2x00dev, 47);
|
|
+ savebbpr49 = rt2800_bbp_read(rt2x00dev, 49);
|
|
+
|
|
+ savemacsysctrl = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL);
|
|
+ MAC_RF_BYPASS0 = rt2800_register_read(rt2x00dev, RF_BYPASS0);
|
|
+ MAC_RF_CONTROL0 = rt2800_register_read(rt2x00dev, RF_CONTROL0);
|
|
+ MAC_PWR_PIN_CFG = rt2800_register_read(rt2x00dev, PWR_PIN_CFG);
|
|
+
|
|
+ {
|
|
+ u32 maccfg, macstatus;
|
|
+ int i;
|
|
+
|
|
+ maccfg = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL);
|
|
+ maccfg &= (~0x04);
|
|
+ rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, maccfg);
|
|
+
|
|
+ for (i = 0; i < 10000; i++) {
|
|
+ macstatus = rt2800_register_read(rt2x00dev, MAC_STATUS_CFG);
|
|
+ if (macstatus & 0x1)
|
|
+ udelay(50);
|
|
+ else
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if (i == 10000)
|
|
+ rt2x00_warn(rt2x00dev, "Wait MAC Tx Status to MAX !!!\n");
|
|
+
|
|
+ maccfg = rt2800_register_read(rt2x00dev, MAC_SYS_CTRL);
|
|
+ maccfg &= (~0x04);
|
|
+ rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, maccfg);
|
|
+
|
|
+ for (i = 0; i < 10000; i++) {
|
|
+ macstatus = rt2800_register_read(rt2x00dev, MAC_STATUS_CFG);
|
|
+ if (macstatus & 0x2)
|
|
+ udelay(50);
|
|
+ else
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if (i == 10000)
|
|
+ rt2x00_warn(rt2x00dev, "Wait MAC Rx Status to MAX !!!\n");
|
|
+ }
|
|
+
|
|
+ rfvalue = (MAC_RF_BYPASS0 | 0x3004);
|
|
+ rt2800_register_write(rt2x00dev, RF_BYPASS0, rfvalue);
|
|
+ rfvalue = (MAC_RF_CONTROL0 | (~0x3002));
|
|
+ rt2800_register_write(rt2x00dev, RF_CONTROL0, rfvalue);
|
|
+
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 4, 0x27);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 17, 0x80);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 18, 0x83);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 19, 0x00);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 20, 0x20);
|
|
+
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 1, 0x00);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 34, 0x13);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 35, 0x00);
|
|
+
|
|
+ rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x1);
|
|
+
|
|
+ rt2800_bbp_write(rt2x00dev, 47, 0x04);
|
|
+ rt2800_bbp_write(rt2x00dev, 22, 0x80);
|
|
+ udelay(100);
|
|
+ bytevalue = rt2800_bbp_read(rt2x00dev, 49);
|
|
+ if (bytevalue > 128)
|
|
+ d1 = bytevalue - 256;
|
|
+ else
|
|
+ d1 = (char)bytevalue;
|
|
+ rt2800_bbp_write(rt2x00dev, 22, 0x0);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 35, 0x01);
|
|
+
|
|
+ rt2800_bbp_write(rt2x00dev, 22, 0x80);
|
|
+ udelay(100);
|
|
+ bytevalue = rt2800_bbp_read(rt2x00dev, 49);
|
|
+ if (bytevalue > 128)
|
|
+ d2 = bytevalue - 256;
|
|
+ else
|
|
+ d2 = (char)bytevalue;
|
|
+ rt2800_bbp_write(rt2x00dev, 22, 0x0);
|
|
+
|
|
+ rcalcode = rt2800_calcrcalibrationcode(rt2x00dev, d1, d2);
|
|
+ if (rcalcode < 0)
|
|
+ r_cal_code = 256 + rcalcode;
|
|
+ else
|
|
+ r_cal_code = (u8)rcalcode;
|
|
+
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 7, r_cal_code);
|
|
+
|
|
+ rt2800_bbp_write(rt2x00dev, 22, 0x0);
|
|
+
|
|
+ bytevalue = rt2800_bbp_read(rt2x00dev, 21);
|
|
+ bytevalue |= 0x1;
|
|
+ rt2800_bbp_write(rt2x00dev, 21, bytevalue);
|
|
+ bytevalue = rt2800_bbp_read(rt2x00dev, 21);
|
|
+ bytevalue &= (~0x1);
|
|
+ rt2800_bbp_write(rt2x00dev, 21, bytevalue);
|
|
+
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 1, saverfb0r1);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 34, saverfb0r34);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 0, 35, saverfb0r35);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 4, saverfb5r4);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 17, saverfb5r17);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 18, saverfb5r18);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 19, saverfb5r19);
|
|
+ rt2800_rfcsr_write_bank(rt2x00dev, 5, 20, saverfb5r20);
|
|
+
|
|
+ rt2800_bbp_write(rt2x00dev, 22, savebbpr22);
|
|
+ rt2800_bbp_write(rt2x00dev, 47, savebbpr47);
|
|
+ rt2800_bbp_write(rt2x00dev, 49, savebbpr49);
|
|
+
|
|
+ rt2800_register_write(rt2x00dev, RF_BYPASS0, MAC_RF_BYPASS0);
|
|
+ rt2800_register_write(rt2x00dev, RF_CONTROL0, MAC_RF_CONTROL0);
|
|
+
|
|
+ rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, savemacsysctrl);
|
|
+ rt2800_register_write(rt2x00dev, PWR_PIN_CFG, MAC_PWR_PIN_CFG);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(rt2800_r_calibration);
|
|
+
|
|
static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
|
|
bool set_bw, bool is_ht40)
|
|
{
|
|
@@ -9008,6 +9162,7 @@ static void rt2800_init_rfcsr_6352(struc
|
|
rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
|
|
rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C);
|
|
|
|
+ rt2800_r_calibration(rt2x00dev);
|
|
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
|
|
@@ -244,6 +244,8 @@ void rt2800_link_tuner(struct rt2x00_dev
|
|
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_calcrcalibrationcode(struct rt2x00_dev *rt2x00dev, int d1, int d2);
|
|
+void rt2800_r_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
|
|
@@ -573,6 +573,8 @@ struct rt2x00lib_ops {
|
|
void (*gain_calibration) (struct rt2x00_dev *rt2x00dev);
|
|
void (*vco_calibration) (struct rt2x00_dev *rt2x00dev);
|
|
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);
|
|
|
|
/*
|
|
* Data queue handlers.
|