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

Commit 6d5a748d authored by Ram Amrani's avatar Ram Amrani Committed by Kalle Valo
Browse files

wlcore: add ability to reduce FW interrupts during suspend 



Add the ability to mask FW interrupts on RX BA activity, PSM
entry/exit and fast-link notifications. This is used when the host
is suspended in order to decrease redundant wake ups.

Signed-off-by: default avatarRam Amrani <ramrani@ti.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 7d3b29e5

drivers/net/wireless/ti/wl12xx/main.c

+3 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ static struct wlcore_conf wl12xx_conf = { 
		.keep_alive_interval         = 55000,

		.max_listen_interval         = 20,

		.sta_sleep_auth              = WL1271_PSM_ILLEGAL,

		.suspend_rx_ba_activity      = 0,

	},

	.itrim = {

		.enable = false,
@@ -1728,6 +1729,8 @@ static struct wlcore_ops wl12xx_ops = { 
	.convert_hwaddr		= wl12xx_convert_hwaddr,

	.lnk_high_prio		= wl12xx_lnk_high_prio,

	.lnk_low_prio		= wl12xx_lnk_low_prio,

	.interrupt_notify	= NULL,

	.rx_ba_filter		= NULL,

};



static struct ieee80211_sta_ht_cap wl12xx_ht_cap = {

drivers/net/wireless/ti/wl18xx/acx.c

+56 −0
Original line number Diff line number Diff line
@@ -194,3 +194,59 @@ int wl18xx_acx_set_peer_cap(struct wl1271 *wl, 
	kfree(acx);

	return ret;

}



/*

 * When the host is suspended, we don't want to get any fast-link/PSM

 * notifications

 */

int wl18xx_acx_interrupt_notify_config(struct wl1271 *wl,

				       bool action)

{

	struct wl18xx_acx_interrupt_notify *acx;

	int ret = 0;



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

	if (!acx) {

		ret = -ENOMEM;

		goto out;

	}



	acx->enable = action;

	ret = wl1271_cmd_configure(wl, ACX_INTERRUPT_NOTIFY, acx, sizeof(*acx));

	if (ret < 0) {

		wl1271_warning("acx interrupt notify setting failed: %d", ret);

		goto out;

	}



out:

	kfree(acx);

	return ret;

}



/*

 * When the host is suspended, we can configure the FW to disable RX BA

 * notifications.

 */

int wl18xx_acx_rx_ba_filter(struct wl1271 *wl, bool action)

{

	struct wl18xx_acx_rx_ba_filter *acx;

	int ret = 0;



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

	if (!acx) {

		ret = -ENOMEM;

		goto out;

	}



	acx->enable = (u32)action;

	ret = wl1271_cmd_configure(wl, ACX_RX_BA_FILTER, acx, sizeof(*acx));

	if (ret < 0) {

		wl1271_warning("acx rx ba activity filter setting failed: %d",

			       ret);

		goto out;

	}



out:

	kfree(acx);

	return ret;

}

drivers/net/wireless/ti/wl18xx/acx.h

+24 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ enum { 
	ACX_SIM_CONFIG			 = 0x0053,

	ACX_CLEAR_STATISTICS		 = 0x0054,

	ACX_AUTO_RX_STREAMING		 = 0x0055,

	ACX_PEER_CAP			 = 0x0056

	ACX_PEER_CAP			 = 0x0056,

	ACX_INTERRUPT_NOTIFY		 = 0x0057,

	ACX_RX_BA_FILTER		 = 0x0058



};



/* numbers of bits the length field takes (add 1 for the actual number) */
@@ -326,6 +329,24 @@ struct wlcore_acx_peer_cap { 
	u8 padding;

} __packed;



/*

 * ACX_INTERRUPT_NOTIFY

 * enable/disable fast-link/PSM notification from FW

 */

struct wl18xx_acx_interrupt_notify {

	struct acx_header header;

	u32 enable;

};



/*

 * ACX_RX_BA_FILTER

 * enable/disable RX BA filtering in FW

 */

struct wl18xx_acx_rx_ba_filter {

	struct acx_header header;

	u32 enable;

};



int wl18xx_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap,

				  u32 sdio_blk_size, u32 extra_mem_blks,

				  u32 len_field_size);
@@ -336,5 +357,7 @@ int wl18xx_acx_set_peer_cap(struct wl1271 *wl, 
			    struct ieee80211_sta_ht_cap *ht_cap,

			    bool allow_ht_operation,

			    u32 rate_set, u8 hlid);

int wl18xx_acx_interrupt_notify_config(struct wl1271 *wl, bool action);

int wl18xx_acx_rx_ba_filter(struct wl1271 *wl, bool action);



#endif /* __WL18XX_ACX_H__ */

drivers/net/wireless/ti/wl18xx/main.c

+3 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ static struct wlcore_conf wl18xx_conf = { 
		.keep_alive_interval         = 55000,

		.max_listen_interval         = 20,

		.sta_sleep_auth              = WL1271_PSM_ILLEGAL,

		.suspend_rx_ba_activity      = 0,

	},

	.itrim = {

		.enable = false,
@@ -1693,6 +1694,8 @@ static struct wlcore_ops wl18xx_ops = { 
	.smart_config_start = wl18xx_cmd_smart_config_start,

	.smart_config_stop  = wl18xx_cmd_smart_config_stop,

	.smart_config_set_group_key = wl18xx_cmd_smart_config_set_group_key,

	.interrupt_notify = wl18xx_acx_interrupt_notify_config,

	.rx_ba_filter	= wl18xx_acx_rx_ba_filter,

};



/* HT cap appropriate for wide channels in 2Ghz */

drivers/net/wireless/ti/wlcore/conf.h

+6 −1
Original line number Diff line number Diff line
@@ -997,6 +997,11 @@ struct conf_conn_settings { 
	 * whether we can go to ELP.

	 */

	u8 sta_sleep_auth;



	/*

	 * Default RX BA Activity filter configuration

	 */

	u8 suspend_rx_ba_activity;

} __packed;



enum {
@@ -1347,7 +1352,7 @@ struct conf_recovery_settings { 
 * version, the two LSB are the lower driver's private conf

 * version.

 */

#define WLCORE_CONF_VERSION	(0x0005 << 16)

#define WLCORE_CONF_VERSION	(0x0006 << 16)

#define WLCORE_CONF_MASK	0xffff0000

#define WLCORE_CONF_SIZE	(sizeof(struct wlcore_conf_header) +	\

				 sizeof(struct wlcore_conf))