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

Commit 7fc3a864 authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Add sysfs file to control BT co-ex state 



Add a sysfs file to control the state of the BT co-ex (enable or disable it.)
By default, the BT co-ex is enabled.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a1dd8187

drivers/net/wireless/wl12xx/wl1271.h

+2 −0
Original line number Diff line number Diff line
@@ -484,6 +484,8 @@ struct wl1271 { 
	/* Current chipset configuration */

	struct conf_drv_settings conf;



	bool sg_enabled;



	struct list_head list;

};

drivers/net/wireless/wl12xx/wl1271_acx.c

+5 −2
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ out: 
}





int wl1271_acx_sg_enable(struct wl1271 *wl)

int wl1271_acx_sg_enable(struct wl1271 *wl, bool enable)

{

	struct acx_bt_wlan_coex *pta;

	int ret;
@@ -547,7 +547,10 @@ int wl1271_acx_sg_enable(struct wl1271 *wl) 
		goto out;

	}



	if (enable)

		pta->enable = wl->conf.sg.state;

	else

		pta->enable = CONF_SG_DISABLE;



	ret = wl1271_cmd_configure(wl, ACX_SG_ENABLE, pta, sizeof(*pta));

	if (ret < 0) {

drivers/net/wireless/wl12xx/wl1271_acx.h

+1 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ int wl1271_acx_dco_itrim_params(struct wl1271 *wl); 
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);

int wl1271_acx_sg_enable(struct wl1271 *wl);

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

int wl1271_acx_sg_cfg(struct wl1271 *wl);

int wl1271_acx_cca_threshold(struct wl1271 *wl);

int wl1271_acx_bcn_dtim_options(struct wl1271 *wl);

drivers/net/wireless/wl12xx/wl1271_init.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ int wl1271_init_pta(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	ret = wl1271_acx_sg_enable(wl);

	ret = wl1271_acx_sg_enable(wl, wl->sg_enabled);

	if (ret < 0)

		return ret;

drivers/net/wireless/wl12xx/wl1271_main.c

+72 −0
Original line number Diff line number Diff line
@@ -1982,6 +1982,68 @@ static const struct ieee80211_ops wl1271_ops = { 
	CFG80211_TESTMODE_CMD(wl1271_tm_cmd)

};



static ssize_t wl1271_sysfs_show_bt_coex_state(struct device *dev,

					       struct device_attribute *attr,

					       char *buf)

{

	struct wl1271 *wl = dev_get_drvdata(dev);

	ssize_t len;



	/* FIXME: what's the maximum length of buf? page size?*/

	len = 500;



	mutex_lock(&wl->mutex);

	len = snprintf(buf, len, "%d\n\n0 - off\n1 - on\n",

		       wl->sg_enabled);

	mutex_unlock(&wl->mutex);



	return len;



}



static ssize_t wl1271_sysfs_store_bt_coex_state(struct device *dev,

						struct device_attribute *attr,

						const char *buf, size_t count)

{

	struct wl1271 *wl = dev_get_drvdata(dev);

	unsigned long res;

	int ret;



	ret = strict_strtoul(buf, 10, &res);



	if (ret < 0) {

		wl1271_warning("incorrect value written to bt_coex_mode");

		return count;

	}



	mutex_lock(&wl->mutex);



	res = !!res;



	if (res == wl->sg_enabled)

		goto out;



	wl->sg_enabled = res;



	if (wl->state == WL1271_STATE_OFF)

		goto out;



	ret = wl1271_ps_elp_wakeup(wl, false);

	if (ret < 0)

		goto out;



	wl1271_acx_sg_enable(wl, wl->sg_enabled);

	wl1271_ps_elp_sleep(wl);



 out:

	mutex_unlock(&wl->mutex);

	return count;

}



static DEVICE_ATTR(bt_coex_state, S_IRUGO | S_IWUSR,

		   wl1271_sysfs_show_bt_coex_state,

		   wl1271_sysfs_store_bt_coex_state);



int wl1271_register_hw(struct wl1271 *wl)

{

	int ret;
@@ -2073,6 +2135,7 @@ struct ieee80211_hw *wl1271_alloc_hw(void) 
	wl->band = IEEE80211_BAND_2GHZ;

	wl->vif = NULL;

	wl->flags = 0;

	wl->sg_enabled = true;



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

		wl->tx_frames[i] = NULL;
@@ -2095,9 +2158,18 @@ struct ieee80211_hw *wl1271_alloc_hw(void) 
	}

	dev_set_drvdata(&wl1271_device.dev, wl);



	/* Create sysfs file to control bt coex state */

	ret = device_create_file(&wl1271_device.dev, &dev_attr_bt_coex_state);

	if (ret < 0) {

		wl1271_error("failed to create sysfs file bt_coex_state");

		goto err_platform;

	}



	return hw;



err_platform:

	platform_device_unregister(&wl1271_device);



err_hw:

	ieee80211_unregister_hw(wl->hw);