Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 801f870b authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wl12xx: add BT-coexistance for AP 



Initialize AP specific BT coexitance parameters to default values and
enable them in AP mode.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent f7c7c7e6

drivers/net/wireless/wl12xx/acx.c

+35 −5
Original line number Diff line number Diff line
@@ -540,13 +540,13 @@ int wl1271_acx_sg_enable(struct wl1271 *wl, bool enable) 
	return ret;

}



int wl1271_acx_sg_cfg(struct wl1271 *wl)

int wl1271_acx_sta_sg_cfg(struct wl1271 *wl)

{

	struct acx_bt_wlan_coex_param *param;

	struct acx_sta_bt_wlan_coex_param *param;

	struct conf_sg_settings *c = &wl->conf.sg;

	int i, ret;



	wl1271_debug(DEBUG_ACX, "acx sg cfg");

	wl1271_debug(DEBUG_ACX, "acx sg sta cfg");



	param = kzalloc(sizeof(*param), GFP_KERNEL);

	if (!param) {
@@ -555,8 +555,38 @@ int wl1271_acx_sg_cfg(struct wl1271 *wl) 
	}



	/* BT-WLAN coext parameters */

	for (i = 0; i < CONF_SG_PARAMS_MAX; i++)

		param->params[i] = cpu_to_le32(c->params[i]);

	for (i = 0; i < CONF_SG_STA_PARAMS_MAX; i++)

		param->params[i] = cpu_to_le32(c->sta_params[i]);

	param->param_idx = CONF_SG_PARAMS_ALL;



	ret = wl1271_cmd_configure(wl, ACX_SG_CFG, param, sizeof(*param));

	if (ret < 0) {

		wl1271_warning("failed to set sg config: %d", ret);

		goto out;

	}



out:

	kfree(param);

	return ret;

}



int wl1271_acx_ap_sg_cfg(struct wl1271 *wl)

{

	struct acx_ap_bt_wlan_coex_param *param;

	struct conf_sg_settings *c = &wl->conf.sg;

	int i, ret;



	wl1271_debug(DEBUG_ACX, "acx sg ap cfg");



	param = kzalloc(sizeof(*param), GFP_KERNEL);

	if (!param) {

		ret = -ENOMEM;

		goto out;

	}



	/* BT-WLAN coext parameters */

	for (i = 0; i < CONF_SG_AP_PARAMS_MAX; i++)

		param->params[i] = cpu_to_le32(c->ap_params[i]);

	param->param_idx = CONF_SG_PARAMS_ALL;



	ret = wl1271_cmd_configure(wl, ACX_SG_CFG, param, sizeof(*param));

drivers/net/wireless/wl12xx/acx.h

+13 −3
Original line number Diff line number Diff line
@@ -370,14 +370,23 @@ struct acx_bt_wlan_coex { 
	u8 pad[3];

} __packed;



struct acx_bt_wlan_coex_param {

struct acx_sta_bt_wlan_coex_param {

	struct acx_header header;



	__le32 params[CONF_SG_PARAMS_MAX];

	__le32 params[CONF_SG_STA_PARAMS_MAX];

	u8 param_idx;

	u8 padding[3];

} __packed;



struct acx_ap_bt_wlan_coex_param {

	struct acx_header header;



	__le32 params[CONF_SG_AP_PARAMS_MAX];

	u8 param_idx;

	u8 padding[3];

} __packed;





struct acx_dco_itrim_params {

	struct acx_header header;
@@ -1330,7 +1339,8 @@ int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter); 
int wl1271_acx_beacon_filter_table(struct wl1271 *wl);

int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable);

int wl1271_acx_sg_enable(struct wl1271 *wl, bool enable);

int wl1271_acx_sg_cfg(struct wl1271 *wl);

int wl1271_acx_sta_sg_cfg(struct wl1271 *wl);

int wl1271_acx_ap_sg_cfg(struct wl1271 *wl);

int wl1271_acx_cca_threshold(struct wl1271 *wl);

int wl1271_acx_bcn_dtim_options(struct wl1271 *wl);

int wl1271_acx_aid(struct wl1271 *wl, u16 aid);

drivers/net/wireless/wl12xx/conf.h

+33 −2
Original line number Diff line number Diff line
@@ -396,12 +396,43 @@ enum { 
	CONF_SG_TEMP_PARAM_3,

	CONF_SG_TEMP_PARAM_4,

	CONF_SG_TEMP_PARAM_5,

	CONF_SG_PARAMS_MAX,



	/*

	 * AP beacon miss

	 *

	 * Range: 0 - 255

	 */

	CONF_SG_AP_BEACON_MISS_TX,



	/*

	 * AP RX window length

	 *

	 * Range: 0 - 50

	 */

	CONF_SG_RX_WINDOW_LENGTH,



	/*

	 * AP connection protection time

	 *

	 * Range: 0 - 5000

	 */

	CONF_SG_AP_CONNECTION_PROTECTION_TIME,



	CONF_SG_TEMP_PARAM_6,

	CONF_SG_TEMP_PARAM_7,

	CONF_SG_TEMP_PARAM_8,

	CONF_SG_TEMP_PARAM_9,

	CONF_SG_TEMP_PARAM_10,



	CONF_SG_STA_PARAMS_MAX = CONF_SG_TEMP_PARAM_5 + 1,

	CONF_SG_AP_PARAMS_MAX = CONF_SG_TEMP_PARAM_10 + 1,



	CONF_SG_PARAMS_ALL = 0xff

};



struct conf_sg_settings {

	u32 params[CONF_SG_PARAMS_MAX];

	u32 sta_params[CONF_SG_STA_PARAMS_MAX];

	u32 ap_params[CONF_SG_AP_PARAMS_MAX];

	u8 state;

};

drivers/net/wireless/wl12xx/init.c

+9 −6
Original line number Diff line number Diff line
@@ -285,7 +285,10 @@ int wl1271_init_pta(struct wl1271 *wl) 
{

	int ret;



	ret = wl1271_acx_sg_cfg(wl);

	if (wl->bss_type == BSS_TYPE_AP_BSS)

		ret = wl1271_acx_ap_sg_cfg(wl);

	else

		ret = wl1271_acx_sta_sg_cfg(wl);

	if (ret < 0)

		return ret;
@@ -351,11 +354,6 @@ static int wl1271_sta_hw_init(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	/* Bluetooth WLAN coexistence */

	ret = wl1271_init_pta(wl);

	if (ret < 0)

		return ret;



	/* FM WLAN coexistence */

	ret = wl1271_acx_fm_coex(wl);

	if (ret < 0)
@@ -572,6 +570,11 @@ int wl1271_hw_init(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	/* Bluetooth WLAN coexistence */

	ret = wl1271_init_pta(wl);

	if (ret < 0)

		return ret;



	/* Default memory configuration */

	ret = wl1271_acx_init_mem_config(wl);

	if (ret < 0)

drivers/net/wireless/wl12xx/main.c

+56 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


static struct conf_drv_settings default_conf = {

	.sg = {

		.params = {

		.sta_params = {

			[CONF_SG_BT_PER_THRESHOLD]                  = 7500,

			[CONF_SG_HV3_MAX_OVERRIDE]                  = 0,

			[CONF_SG_BT_NFS_SAMPLE_INTERVAL]            = 400,
@@ -101,6 +101,61 @@ static struct conf_drv_settings default_conf = { 
			[CONF_SG_DHCP_TIME]                         = 5000,

			[CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP]  = 100,

		},

		.ap_params = {

			[CONF_SG_BT_PER_THRESHOLD]                  = 7500,

			[CONF_SG_HV3_MAX_OVERRIDE]                  = 0,

			[CONF_SG_BT_NFS_SAMPLE_INTERVAL]            = 400,

			[CONF_SG_BT_LOAD_RATIO]                     = 50,

			[CONF_SG_AUTO_PS_MODE]                      = 1,

			[CONF_SG_AUTO_SCAN_PROBE_REQ]               = 170,

			[CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3]   = 50,

			[CONF_SG_ANTENNA_CONFIGURATION]             = 0,

			[CONF_SG_BEACON_MISS_PERCENT]               = 60,

			[CONF_SG_RATE_ADAPT_THRESH]                 = 64,

			[CONF_SG_RATE_ADAPT_SNR]                    = 1,

			[CONF_SG_WLAN_PS_BT_ACL_MASTER_MIN_BR]      = 10,

			[CONF_SG_WLAN_PS_BT_ACL_MASTER_MAX_BR]      = 25,

			[CONF_SG_WLAN_PS_MAX_BT_ACL_MASTER_BR]      = 25,

			[CONF_SG_WLAN_PS_BT_ACL_SLAVE_MIN_BR]       = 20,

			[CONF_SG_WLAN_PS_BT_ACL_SLAVE_MAX_BR]       = 25,

			[CONF_SG_WLAN_PS_MAX_BT_ACL_SLAVE_BR]       = 25,

			[CONF_SG_WLAN_PS_BT_ACL_MASTER_MIN_EDR]     = 7,

			[CONF_SG_WLAN_PS_BT_ACL_MASTER_MAX_EDR]     = 25,

			[CONF_SG_WLAN_PS_MAX_BT_ACL_MASTER_EDR]     = 25,

			[CONF_SG_WLAN_PS_BT_ACL_SLAVE_MIN_EDR]      = 8,

			[CONF_SG_WLAN_PS_BT_ACL_SLAVE_MAX_EDR]      = 25,

			[CONF_SG_WLAN_PS_MAX_BT_ACL_SLAVE_EDR]      = 25,

			[CONF_SG_RXT]                               = 1200,

			[CONF_SG_TXT]                               = 1000,

			[CONF_SG_ADAPTIVE_RXT_TXT]                  = 1,

			[CONF_SG_PS_POLL_TIMEOUT]                   = 10,

			[CONF_SG_UPSD_TIMEOUT]                      = 10,

			[CONF_SG_WLAN_ACTIVE_BT_ACL_MASTER_MIN_EDR] = 7,

			[CONF_SG_WLAN_ACTIVE_BT_ACL_MASTER_MAX_EDR] = 15,

			[CONF_SG_WLAN_ACTIVE_MAX_BT_ACL_MASTER_EDR] = 15,

			[CONF_SG_WLAN_ACTIVE_BT_ACL_SLAVE_MIN_EDR]  = 8,

			[CONF_SG_WLAN_ACTIVE_BT_ACL_SLAVE_MAX_EDR]  = 20,

			[CONF_SG_WLAN_ACTIVE_MAX_BT_ACL_SLAVE_EDR]  = 15,

			[CONF_SG_WLAN_ACTIVE_BT_ACL_MIN_BR]         = 20,

			[CONF_SG_WLAN_ACTIVE_BT_ACL_MAX_BR]         = 50,

			[CONF_SG_WLAN_ACTIVE_MAX_BT_ACL_BR]         = 10,

			[CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3]  = 200,

			[CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP] = 800,

			[CONF_SG_PASSIVE_SCAN_A2DP_BT_TIME]         = 75,

			[CONF_SG_PASSIVE_SCAN_A2DP_WLAN_TIME]       = 15,

			[CONF_SG_HV3_MAX_SERVED]                    = 6,

			[CONF_SG_DHCP_TIME]                         = 5000,

			[CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP]  = 100,

			[CONF_SG_TEMP_PARAM_1]                      = 0,

			[CONF_SG_TEMP_PARAM_2]                      = 0,

			[CONF_SG_TEMP_PARAM_3]                      = 0,

			[CONF_SG_TEMP_PARAM_4]                      = 0,

			[CONF_SG_TEMP_PARAM_5]                      = 0,

			[CONF_SG_AP_BEACON_MISS_TX]                 = 3,

			[CONF_SG_RX_WINDOW_LENGTH]                  = 6,

			[CONF_SG_AP_CONNECTION_PROTECTION_TIME]     = 50,

			[CONF_SG_TEMP_PARAM_6]                      = 1,

		},

		.state = CONF_SG_PROTECTIVE,

	},

	.rx = {