wlcore: split wl12xx/wl18xx sg parameters
[cascardo/linux.git] / drivers / net / wireless / ti / wl12xx / main.c
index af0fe2e..a0d6ccc 100644 (file)
@@ -39,6 +39,7 @@
 #include "scan.h"
 #include "event.h"
 #include "debugfs.h"
+#include "conf.h"
 
 static char *fref_param;
 static char *tcxo_param;
@@ -46,69 +47,69 @@ static char *tcxo_param;
 static struct wlcore_conf wl12xx_conf = {
        .sg = {
                .params = {
-                       [CONF_SG_ACL_BT_MASTER_MIN_BR] = 10,
-                       [CONF_SG_ACL_BT_MASTER_MAX_BR] = 180,
-                       [CONF_SG_ACL_BT_SLAVE_MIN_BR] = 10,
-                       [CONF_SG_ACL_BT_SLAVE_MAX_BR] = 180,
-                       [CONF_SG_ACL_BT_MASTER_MIN_EDR] = 10,
-                       [CONF_SG_ACL_BT_MASTER_MAX_EDR] = 80,
-                       [CONF_SG_ACL_BT_SLAVE_MIN_EDR] = 10,
-                       [CONF_SG_ACL_BT_SLAVE_MAX_EDR] = 80,
-                       [CONF_SG_ACL_WLAN_PS_MASTER_BR] = 8,
-                       [CONF_SG_ACL_WLAN_PS_SLAVE_BR] = 8,
-                       [CONF_SG_ACL_WLAN_PS_MASTER_EDR] = 20,
-                       [CONF_SG_ACL_WLAN_PS_SLAVE_EDR] = 20,
-                       [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_BR] = 20,
-                       [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_BR] = 35,
-                       [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_BR] = 16,
-                       [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_BR] = 35,
-                       [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_EDR] = 32,
-                       [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_EDR] = 50,
-                       [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_EDR] = 28,
-                       [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_EDR] = 50,
-                       [CONF_SG_ACL_ACTIVE_SCAN_WLAN_BR] = 10,
-                       [CONF_SG_ACL_ACTIVE_SCAN_WLAN_EDR] = 20,
-                       [CONF_SG_ACL_PASSIVE_SCAN_BT_BR] = 75,
-                       [CONF_SG_ACL_PASSIVE_SCAN_WLAN_BR] = 15,
-                       [CONF_SG_ACL_PASSIVE_SCAN_BT_EDR] = 27,
-                       [CONF_SG_ACL_PASSIVE_SCAN_WLAN_EDR] = 17,
+                       [WL12XX_CONF_SG_ACL_BT_MASTER_MIN_BR] = 10,
+                       [WL12XX_CONF_SG_ACL_BT_MASTER_MAX_BR] = 180,
+                       [WL12XX_CONF_SG_ACL_BT_SLAVE_MIN_BR] = 10,
+                       [WL12XX_CONF_SG_ACL_BT_SLAVE_MAX_BR] = 180,
+                       [WL12XX_CONF_SG_ACL_BT_MASTER_MIN_EDR] = 10,
+                       [WL12XX_CONF_SG_ACL_BT_MASTER_MAX_EDR] = 80,
+                       [WL12XX_CONF_SG_ACL_BT_SLAVE_MIN_EDR] = 10,
+                       [WL12XX_CONF_SG_ACL_BT_SLAVE_MAX_EDR] = 80,
+                       [WL12XX_CONF_SG_ACL_WLAN_PS_MASTER_BR] = 8,
+                       [WL12XX_CONF_SG_ACL_WLAN_PS_SLAVE_BR] = 8,
+                       [WL12XX_CONF_SG_ACL_WLAN_PS_MASTER_EDR] = 20,
+                       [WL12XX_CONF_SG_ACL_WLAN_PS_SLAVE_EDR] = 20,
+                       [WL12XX_CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_BR] = 20,
+                       [WL12XX_CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_BR] = 35,
+                       [WL12XX_CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_BR] = 16,
+                       [WL12XX_CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_BR] = 35,
+                       [WL12XX_CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_EDR] = 32,
+                       [WL12XX_CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_EDR] = 50,
+                       [WL12XX_CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_EDR] = 28,
+                       [WL12XX_CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_EDR] = 50,
+                       [WL12XX_CONF_SG_ACL_ACTIVE_SCAN_WLAN_BR] = 10,
+                       [WL12XX_CONF_SG_ACL_ACTIVE_SCAN_WLAN_EDR] = 20,
+                       [WL12XX_CONF_SG_ACL_PASSIVE_SCAN_BT_BR] = 75,
+                       [WL12XX_CONF_SG_ACL_PASSIVE_SCAN_WLAN_BR] = 15,
+                       [WL12XX_CONF_SG_ACL_PASSIVE_SCAN_BT_EDR] = 27,
+                       [WL12XX_CONF_SG_ACL_PASSIVE_SCAN_WLAN_EDR] = 17,
                        /* active scan params */
-                       [CONF_SG_AUTO_SCAN_PROBE_REQ] = 170,
-                       [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50,
-                       [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP] = 100,
+                       [WL12XX_CONF_SG_AUTO_SCAN_PROBE_REQ] = 170,
+                       [WL12XX_CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50,
+                       [WL12XX_CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP] = 100,
                        /* passive scan params */
-                       [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_BR] = 800,
-                       [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_EDR] = 200,
-                       [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3] = 200,
+                       [WL12XX_CONF_SG_PASSIVE_SCAN_DUR_FACTOR_A2DP_BR] = 800,
+                       [WL12XX_CONF_SG_PASSIVE_SCAN_DUR_FACTOR_A2DP_EDR] = 200,
+                       [WL12XX_CONF_SG_PASSIVE_SCAN_DUR_FACTOR_HV3] = 200,
                        /* passive scan in dual antenna params */
-                       [CONF_SG_CONSECUTIVE_HV3_IN_PASSIVE_SCAN] = 0,
-                       [CONF_SG_BCN_HV3_COLLISION_THRESH_IN_PASSIVE_SCAN] = 0,
-                       [CONF_SG_TX_RX_PROTECTION_BWIDTH_IN_PASSIVE_SCAN] = 0,
+                       [WL12XX_CONF_SG_CONSECUTIVE_HV3_IN_PASSIVE_SCAN] = 0,
+                       [WL12XX_CONF_SG_BCN_HV3_COLL_THR_IN_PASSIVE_SCAN] = 0,
+                       [WL12XX_CONF_SG_TX_RX_PROTECT_BW_IN_PASSIVE_SCAN] = 0,
                        /* general params */
-                       [CONF_SG_STA_FORCE_PS_IN_BT_SCO] = 1,
-                       [CONF_SG_ANTENNA_CONFIGURATION] = 0,
-                       [CONF_SG_BEACON_MISS_PERCENT] = 60,
-                       [CONF_SG_DHCP_TIME] = 5000,
-                       [CONF_SG_RXT] = 1200,
-                       [CONF_SG_TXT] = 1000,
-                       [CONF_SG_ADAPTIVE_RXT_TXT] = 1,
-                       [CONF_SG_GENERAL_USAGE_BIT_MAP] = 3,
-                       [CONF_SG_HV3_MAX_SERVED] = 6,
-                       [CONF_SG_PS_POLL_TIMEOUT] = 10,
-                       [CONF_SG_UPSD_TIMEOUT] = 10,
-                       [CONF_SG_CONSECUTIVE_CTS_THRESHOLD] = 2,
-                       [CONF_SG_STA_RX_WINDOW_AFTER_DTIM] = 5,
-                       [CONF_SG_STA_CONNECTION_PROTECTION_TIME] = 30,
+                       [WL12XX_CONF_SG_STA_FORCE_PS_IN_BT_SCO] = 1,
+                       [WL12XX_CONF_SG_ANTENNA_CONFIGURATION] = 0,
+                       [WL12XX_CONF_SG_BEACON_MISS_PERCENT] = 60,
+                       [WL12XX_CONF_SG_DHCP_TIME] = 5000,
+                       [WL12XX_CONF_SG_RXT] = 1200,
+                       [WL12XX_CONF_SG_TXT] = 1000,
+                       [WL12XX_CONF_SG_ADAPTIVE_RXT_TXT] = 1,
+                       [WL12XX_CONF_SG_GENERAL_USAGE_BIT_MAP] = 3,
+                       [WL12XX_CONF_SG_HV3_MAX_SERVED] = 6,
+                       [WL12XX_CONF_SG_PS_POLL_TIMEOUT] = 10,
+                       [WL12XX_CONF_SG_UPSD_TIMEOUT] = 10,
+                       [WL12XX_CONF_SG_CONSECUTIVE_CTS_THRESHOLD] = 2,
+                       [WL12XX_CONF_SG_STA_RX_WINDOW_AFTER_DTIM] = 5,
+                       [WL12XX_CONF_SG_STA_CONNECTION_PROTECTION_TIME] = 30,
                        /* AP params */
-                       [CONF_AP_BEACON_MISS_TX] = 3,
-                       [CONF_AP_RX_WINDOW_AFTER_BEACON] = 10,
-                       [CONF_AP_BEACON_WINDOW_INTERVAL] = 2,
-                       [CONF_AP_CONNECTION_PROTECTION_TIME] = 0,
-                       [CONF_AP_BT_ACL_VAL_BT_SERVE_TIME] = 25,
-                       [CONF_AP_BT_ACL_VAL_WL_SERVE_TIME] = 25,
+                       [WL12XX_CONF_AP_BEACON_MISS_TX] = 3,
+                       [WL12XX_CONF_AP_RX_WINDOW_AFTER_BEACON] = 10,
+                       [WL12XX_CONF_AP_BEACON_WINDOW_INTERVAL] = 2,
+                       [WL12XX_CONF_AP_CONNECTION_PROTECTION_TIME] = 0,
+                       [WL12XX_CONF_AP_BT_ACL_VAL_BT_SERVE_TIME] = 25,
+                       [WL12XX_CONF_AP_BT_ACL_VAL_WL_SERVE_TIME] = 25,
                        /* CTS Diluting params */
-                       [CONF_SG_CTS_DILUTED_BAD_RX_PACKETS_TH] = 0,
-                       [CONF_SG_CTS_CHOP_IN_DUAL_ANT_SCO_MASTER] = 0,
+                       [WL12XX_CONF_SG_CTS_DILUTED_BAD_RX_PACKETS_TH] = 0,
+                       [WL12XX_CONF_SG_CTS_CHOP_IN_DUAL_ANT_SCO_MASTER] = 0,
                },
                .state = CONF_SG_PROTECTIVE,
        },
@@ -1809,6 +1810,7 @@ static int wl12xx_setup(struct wl1271 *wl)
 
        BUILD_BUG_ON(WL12XX_MAX_LINKS > WLCORE_MAX_LINKS);
        BUILD_BUG_ON(WL12XX_MAX_AP_STATIONS > WL12XX_MAX_LINKS);
+       BUILD_BUG_ON(WL12XX_CONF_SG_PARAMS_MAX > WLCORE_CONF_SG_PARAMS_MAX);
 
        wl->rtable = wl12xx_rtable;
        wl->num_tx_desc = WL12XX_NUM_TX_DESCRIPTORS;