提交 7fc3a864 编写于 作者: J Juuso Oikarinen 提交者: John W. Linville

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: NJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: NTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: NLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 a1dd8187
...@@ -484,6 +484,8 @@ struct wl1271 { ...@@ -484,6 +484,8 @@ struct wl1271 {
/* Current chipset configuration */ /* Current chipset configuration */
struct conf_drv_settings conf; struct conf_drv_settings conf;
bool sg_enabled;
struct list_head list; struct list_head list;
}; };
......
...@@ -534,7 +534,7 @@ int wl1271_acx_conn_monit_params(struct wl1271 *wl) ...@@ -534,7 +534,7 @@ 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)
{ {
struct acx_bt_wlan_coex *pta; struct acx_bt_wlan_coex *pta;
int ret; int ret;
...@@ -547,7 +547,10 @@ int wl1271_acx_sg_enable(struct wl1271 *wl) ...@@ -547,7 +547,10 @@ int wl1271_acx_sg_enable(struct wl1271 *wl)
goto out; goto out;
} }
pta->enable = wl->conf.sg.state; 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)); ret = wl1271_cmd_configure(wl, ACX_SG_ENABLE, pta, sizeof(*pta));
if (ret < 0) { if (ret < 0) {
......
...@@ -1005,7 +1005,7 @@ int wl1271_acx_dco_itrim_params(struct wl1271 *wl); ...@@ -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_opt(struct wl1271 *wl, bool enable_filter);
int wl1271_acx_beacon_filter_table(struct wl1271 *wl); int wl1271_acx_beacon_filter_table(struct wl1271 *wl);
int wl1271_acx_conn_monit_params(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_sg_cfg(struct wl1271 *wl);
int wl1271_acx_cca_threshold(struct wl1271 *wl); int wl1271_acx_cca_threshold(struct wl1271 *wl);
int wl1271_acx_bcn_dtim_options(struct wl1271 *wl); int wl1271_acx_bcn_dtim_options(struct wl1271 *wl);
......
...@@ -164,7 +164,7 @@ int wl1271_init_pta(struct wl1271 *wl) ...@@ -164,7 +164,7 @@ int wl1271_init_pta(struct wl1271 *wl)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = wl1271_acx_sg_enable(wl); ret = wl1271_acx_sg_enable(wl, wl->sg_enabled);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -1982,6 +1982,68 @@ static const struct ieee80211_ops wl1271_ops = { ...@@ -1982,6 +1982,68 @@ static const struct ieee80211_ops wl1271_ops = {
CFG80211_TESTMODE_CMD(wl1271_tm_cmd) 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 wl1271_register_hw(struct wl1271 *wl)
{ {
int ret; int ret;
...@@ -2073,6 +2135,7 @@ struct ieee80211_hw *wl1271_alloc_hw(void) ...@@ -2073,6 +2135,7 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
wl->band = IEEE80211_BAND_2GHZ; wl->band = IEEE80211_BAND_2GHZ;
wl->vif = NULL; wl->vif = NULL;
wl->flags = 0; wl->flags = 0;
wl->sg_enabled = true;
for (i = 0; i < ACX_TX_DESCRIPTORS; i++) for (i = 0; i < ACX_TX_DESCRIPTORS; i++)
wl->tx_frames[i] = NULL; wl->tx_frames[i] = NULL;
...@@ -2095,9 +2158,18 @@ struct ieee80211_hw *wl1271_alloc_hw(void) ...@@ -2095,9 +2158,18 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
} }
dev_set_drvdata(&wl1271_device.dev, wl); 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; return hw;
err_platform:
platform_device_unregister(&wl1271_device);
err_hw: err_hw:
ieee80211_unregister_hw(wl->hw); ieee80211_unregister_hw(wl->hw);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册