Commit fa444bf8 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: add set_cqm_rssi_config handler support 



In this handler LOW_RSSI and HIGH_RSSI events are subscribed
to FW using provided threshold value so that FW will monitor
connection quality and trigger any of these events.

Driver will notify cfg80211 about connection quality based on
inputs from FW and provided hysteresis.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7013d3e2

drivers/net/wireless/mwifiex/cfg80211.c

+40 −0
Original line number Diff line number Diff line
@@ -765,6 +765,45 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy, 
	return 0;

}



/*

 * CFG802.11 operation handler for connection quality monitoring.

 *

 * This function subscribes/unsubscribes HIGH_RSSI and LOW_RSSI

 * events to FW.

 */

static int mwifiex_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy,

						struct net_device *dev,

						s32 rssi_thold, u32 rssi_hyst)

{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	struct mwifiex_ds_misc_subsc_evt subsc_evt;



	priv->cqm_rssi_thold = rssi_thold;

	priv->cqm_rssi_hyst = rssi_hyst;



	memset(&subsc_evt, 0x00, sizeof(struct mwifiex_ds_misc_subsc_evt));

	subsc_evt.events = BITMASK_BCN_RSSI_LOW | BITMASK_BCN_RSSI_HIGH;



	/* Subscribe/unsubscribe low and high rssi events */

	if (rssi_thold && rssi_hyst) {

		subsc_evt.action = HostCmd_ACT_BITWISE_SET;

		subsc_evt.bcn_l_rssi_cfg.abs_value = abs(rssi_thold);

		subsc_evt.bcn_h_rssi_cfg.abs_value = abs(rssi_thold);

		subsc_evt.bcn_l_rssi_cfg.evt_freq = 1;

		subsc_evt.bcn_h_rssi_cfg.evt_freq = 1;

		return mwifiex_send_cmd_sync(priv,

					     HostCmd_CMD_802_11_SUBSCRIBE_EVENT,

					     0, 0, &subsc_evt);

	} else {

		subsc_evt.action = HostCmd_ACT_BITWISE_CLR;

		return mwifiex_send_cmd_sync(priv,

					     HostCmd_CMD_802_11_SUBSCRIBE_EVENT,

					     0, 0, &subsc_evt);

	}



	return 0;

}



/*

 * CFG802.11 operation handler for disconnection request.

 *
@@ -1367,6 +1406,7 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = { 
	.set_power_mgmt = mwifiex_cfg80211_set_power_mgmt,

	.set_tx_power = mwifiex_cfg80211_set_tx_power,

	.set_bitrate_mask = mwifiex_cfg80211_set_bitrate_mask,

	.set_cqm_rssi_config = mwifiex_cfg80211_set_cqm_rssi_config,

};



/*

drivers/net/wireless/mwifiex/fw.h

+17 −0
Original line number Diff line number Diff line
@@ -92,10 +92,12 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define TLV_TYPE_KEY_MATERIAL       (PROPRIETARY_TLV_BASE_ID + 0)

#define TLV_TYPE_CHANLIST           (PROPRIETARY_TLV_BASE_ID + 1)

#define TLV_TYPE_NUMPROBES          (PROPRIETARY_TLV_BASE_ID + 2)

#define TLV_TYPE_RSSI_LOW           (PROPRIETARY_TLV_BASE_ID + 4)

#define TLV_TYPE_PASSTHROUGH        (PROPRIETARY_TLV_BASE_ID + 10)

#define TLV_TYPE_WMMQSTATUS         (PROPRIETARY_TLV_BASE_ID + 16)

#define TLV_TYPE_WILDCARDSSID       (PROPRIETARY_TLV_BASE_ID + 18)

#define TLV_TYPE_TSFTIMESTAMP       (PROPRIETARY_TLV_BASE_ID + 19)

#define TLV_TYPE_RSSI_HIGH          (PROPRIETARY_TLV_BASE_ID + 22)

#define TLV_TYPE_AUTH_TYPE          (PROPRIETARY_TLV_BASE_ID + 31)

#define TLV_TYPE_CHANNELBANDLIST    (PROPRIETARY_TLV_BASE_ID + 42)

#define TLV_TYPE_RATE_DROP_CONTROL  (PROPRIETARY_TLV_BASE_ID + 82)
@@ -194,6 +196,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { 
#define HostCmd_CMD_802_11_KEY_MATERIAL               0x005e

#define HostCmd_CMD_802_11_BG_SCAN_QUERY              0x006c

#define HostCmd_CMD_WMM_GET_STATUS                    0x0071

#define HostCmd_CMD_802_11_SUBSCRIBE_EVENT            0x0075

#define HostCmd_CMD_802_11_TX_RATE_QUERY              0x007f

#define HostCmd_CMD_802_11_IBSS_COALESCING_STATUS     0x0083

#define HostCmd_CMD_VERSION_EXT                       0x0097
@@ -228,6 +231,8 @@ enum ENH_PS_MODES { 
#define HostCmd_RET_BIT                       0x8000

#define HostCmd_ACT_GEN_GET                   0x0000

#define HostCmd_ACT_GEN_SET                   0x0001

#define HostCmd_ACT_BITWISE_SET               0x0002

#define HostCmd_ACT_BITWISE_CLR               0x0003

#define HostCmd_RESULT_OK                     0x0000



#define HostCmd_ACT_MAC_RX_ON                 0x0001
@@ -1146,6 +1151,17 @@ struct host_cmd_ds_pcie_details { 
	u32 sleep_cookie_addr_hi;

} __packed;



struct mwifiex_ie_types_rssi_threshold {

	struct mwifiex_ie_types_header header;

	u8 abs_value;

	u8 evt_freq;

} __packed;



struct host_cmd_ds_802_11_subsc_evt {

	__le16 action;

	__le16 events;

} __packed;



struct host_cmd_ds_command {

	__le16 command;

	__le16 size;
@@ -1195,6 +1211,7 @@ struct host_cmd_ds_command { 
		struct host_cmd_ds_set_bss_mode bss_mode;

		struct host_cmd_ds_pcie_details pcie_host_spec;

		struct host_cmd_ds_802_11_eeprom_access eeprom;

		struct host_cmd_ds_802_11_subsc_evt subsc_evt;

	} params;

} __packed;

drivers/net/wireless/mwifiex/ioctl.h

+21 −0
Original line number Diff line number Diff line
@@ -280,6 +280,27 @@ struct mwifiex_ds_misc_cmd { 
	u8 cmd[MWIFIEX_SIZE_OF_CMD_BUFFER];

};



#define BITMASK_BCN_RSSI_LOW	BIT(0)

#define BITMASK_BCN_RSSI_HIGH	BIT(4)



enum subsc_evt_rssi_state {

	EVENT_HANDLED,

	RSSI_LOW_RECVD,

	RSSI_HIGH_RECVD

};



struct subsc_evt_cfg {

	u8 abs_value;

	u8 evt_freq;

};



struct mwifiex_ds_misc_subsc_evt {

	u16 action;

	u16 events;

	struct subsc_evt_cfg bcn_l_rssi_cfg;

	struct subsc_evt_cfg bcn_h_rssi_cfg;

};



#define MWIFIEX_MAX_VSIE_LEN       (256)

#define MWIFIEX_MAX_VSIE_NUM       (8)

#define MWIFIEX_VSIE_MASK_SCAN     0x01

drivers/net/wireless/mwifiex/main.h

+3 −0
Original line number Diff line number Diff line
@@ -458,6 +458,9 @@ struct mwifiex_private { 
	u8 country_code[IEEE80211_COUNTRY_STRING_LEN];

	struct wps wps;

	u8 scan_block;

	s32 cqm_rssi_thold;

	u32 cqm_rssi_hyst;

	u8 subsc_evt_rssi_state;

};



enum mwifiex_ba_status {

drivers/net/wireless/mwifiex/sta_cmd.c

+98 −0
Original line number Diff line number Diff line
@@ -906,6 +906,101 @@ mwifiex_cmd_pcie_host_spec(struct mwifiex_private *priv, 
	return 0;

}



/*

 * This function prepares command for event subscription, configuration

 * and query. Events can be subscribed or unsubscribed. Current subscribed

 * events can be queried. Also, current subscribed events are reported in

 * every FW response.

 */

static int

mwifiex_cmd_802_11_subsc_evt(struct mwifiex_private *priv,

			     struct host_cmd_ds_command *cmd,

			     struct mwifiex_ds_misc_subsc_evt *subsc_evt_cfg)

{

	struct host_cmd_ds_802_11_subsc_evt *subsc_evt = &cmd->params.subsc_evt;

	struct mwifiex_ie_types_rssi_threshold *rssi_tlv;

	u16 event_bitmap;

	u8 *pos;



	cmd->command = cpu_to_le16(HostCmd_CMD_802_11_SUBSCRIBE_EVENT);

	cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_subsc_evt) +

				S_DS_GEN);



	subsc_evt->action = cpu_to_le16(subsc_evt_cfg->action);

	dev_dbg(priv->adapter->dev, "cmd: action: %d\n", subsc_evt_cfg->action);



	/*For query requests, no configuration TLV structures are to be added.*/

	if (subsc_evt_cfg->action == HostCmd_ACT_GEN_GET)

		return 0;



	subsc_evt->events = cpu_to_le16(subsc_evt_cfg->events);



	event_bitmap = subsc_evt_cfg->events;

	dev_dbg(priv->adapter->dev, "cmd: event bitmap : %16x\n",

		event_bitmap);



	if (((subsc_evt_cfg->action == HostCmd_ACT_BITWISE_CLR) ||

	     (subsc_evt_cfg->action == HostCmd_ACT_BITWISE_SET)) &&

	    (event_bitmap == 0)) {

		dev_dbg(priv->adapter->dev, "Error: No event specified "

			"for bitwise action type\n");

		return -EINVAL;

	}



	/*

	 * Append TLV structures for each of the specified events for

	 * subscribing or re-configuring. This is not required for

	 * bitwise unsubscribing request.

	 */

	if (subsc_evt_cfg->action == HostCmd_ACT_BITWISE_CLR)

		return 0;



	pos = ((u8 *)subsc_evt) +

			sizeof(struct host_cmd_ds_802_11_subsc_evt);



	if (event_bitmap & BITMASK_BCN_RSSI_LOW) {

		rssi_tlv = (struct mwifiex_ie_types_rssi_threshold *) pos;



		rssi_tlv->header.type = cpu_to_le16(TLV_TYPE_RSSI_LOW);

		rssi_tlv->header.len =

		    cpu_to_le16(sizeof(struct mwifiex_ie_types_rssi_threshold) -

				sizeof(struct mwifiex_ie_types_header));

		rssi_tlv->abs_value = subsc_evt_cfg->bcn_l_rssi_cfg.abs_value;

		rssi_tlv->evt_freq = subsc_evt_cfg->bcn_l_rssi_cfg.evt_freq;



		dev_dbg(priv->adapter->dev, "Cfg Beacon Low Rssi event, "

			"RSSI:-%d dBm, Freq:%d\n",

			subsc_evt_cfg->bcn_l_rssi_cfg.abs_value,

			subsc_evt_cfg->bcn_l_rssi_cfg.evt_freq);



		pos += sizeof(struct mwifiex_ie_types_rssi_threshold);

		le16_add_cpu(&cmd->size,

			     sizeof(struct mwifiex_ie_types_rssi_threshold));

	}



	if (event_bitmap & BITMASK_BCN_RSSI_HIGH) {

		rssi_tlv = (struct mwifiex_ie_types_rssi_threshold *) pos;



		rssi_tlv->header.type = cpu_to_le16(TLV_TYPE_RSSI_HIGH);

		rssi_tlv->header.len =

		    cpu_to_le16(sizeof(struct mwifiex_ie_types_rssi_threshold) -

				sizeof(struct mwifiex_ie_types_header));

		rssi_tlv->abs_value = subsc_evt_cfg->bcn_h_rssi_cfg.abs_value;

		rssi_tlv->evt_freq = subsc_evt_cfg->bcn_h_rssi_cfg.evt_freq;



		dev_dbg(priv->adapter->dev, "Cfg Beacon Low Rssi event, "

			"RSSI:-%d dBm, Freq:%d\n",

			subsc_evt_cfg->bcn_h_rssi_cfg.abs_value,

			subsc_evt_cfg->bcn_h_rssi_cfg.evt_freq);



		pos += sizeof(struct mwifiex_ie_types_rssi_threshold);

		le16_add_cpu(&cmd->size,

			     sizeof(struct mwifiex_ie_types_rssi_threshold));

	}



	return 0;

}



/*

 * This function prepares the commands before sending them to the firmware.

 *
@@ -1086,6 +1181,9 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no, 
	case HostCmd_CMD_PCIE_DESC_DETAILS:

		ret = mwifiex_cmd_pcie_host_spec(priv, cmd_ptr, cmd_action);

		break;

	case HostCmd_CMD_802_11_SUBSCRIBE_EVENT:

		ret = mwifiex_cmd_802_11_subsc_evt(priv, cmd_ptr, data_buf);

		break;

	default:

		dev_err(priv->adapter->dev,

			"PREP_CMD: unknown cmd- %#x\n", cmd_no);

CRA Git | Maintained and supported by SUSTech CRA and CCSE