Commit e0a8c583 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

parents a508a6ea 04b4d69c

drivers/net/wireless/wl12xx/acx.c

+123 −199
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ int wl1271_acx_wake_up_conditions(struct wl1271 *wl) 
		goto out;

	}



	wake_up->role_id = wl->role_id;

	wake_up->wake_up_event = wl->conf.conn.wake_up_event;

	wake_up->listen_interval = wl->conf.conn.listen_interval;
@@ -101,6 +102,7 @@ int wl1271_acx_tx_power(struct wl1271 *wl, int power) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->current_tx_power = power * 10;



	ret = wl1271_cmd_configure(wl, DOT11_CUR_TX_PWR, acx, sizeof(*acx));
@@ -128,6 +130,7 @@ int wl1271_acx_feature_cfg(struct wl1271 *wl) 
	}



	/* DF_ENCRYPTION_DISABLE and DF_SNIFF_MODE_ENABLE are disabled */

	feature->role_id = wl->role_id;

	feature->data_flow_options = 0;

	feature->options = 0;
@@ -183,34 +186,6 @@ int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_rx_config(struct wl1271 *wl, u32 config, u32 filter)

{

	struct acx_rx_config *rx_config;

	int ret;



	wl1271_debug(DEBUG_ACX, "acx rx config");



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

	if (!rx_config) {

		ret = -ENOMEM;

		goto out;

	}



	rx_config->config_options = cpu_to_le32(config);

	rx_config->filter_options = cpu_to_le32(filter);



	ret = wl1271_cmd_configure(wl, ACX_RX_CFG,

				   rx_config, sizeof(*rx_config));

	if (ret < 0) {

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

		goto out;

	}



out:

	kfree(rx_config);

	return ret;

}



int wl1271_acx_pd_threshold(struct wl1271 *wl)

{

	struct acx_packet_detection *pd;
@@ -250,6 +225,7 @@ int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time) 
		goto out;

	}



	slot->role_id = wl->role_id;

	slot->wone_index = STATION_WONE_INDEX;

	slot->slot_time = slot_time;
@@ -279,6 +255,7 @@ int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable, 
	}



	/* MAC filtering */

	acx->role_id = wl->role_id;

	acx->enabled = enable;

	acx->num_groups = mc_list_len;

	memcpy(acx->mac_table, mc_list, mc_list_len * ETH_ALEN);
@@ -308,6 +285,7 @@ int wl1271_acx_service_period_timeout(struct wl1271 *wl) 


	wl1271_debug(DEBUG_ACX, "acx service period timeout");



	rx_timeout->role_id = wl->role_id;

	rx_timeout->ps_poll_timeout = cpu_to_le16(wl->conf.rx.ps_poll_timeout);

	rx_timeout->upsd_timeout = cpu_to_le16(wl->conf.rx.upsd_timeout);
@@ -344,6 +322,7 @@ int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold) 
		goto out;

	}



	rts->role_id = wl->role_id;

	rts->threshold = cpu_to_le16((u16)rts_threshold);



	ret = wl1271_cmd_configure(wl, DOT11_RTS_THRESHOLD, rts, sizeof(*rts));
@@ -403,6 +382,7 @@ int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter) 
		goto out;

	}



	beacon_filter->role_id = wl->role_id;

	beacon_filter->enable = enable_filter;



	/*
@@ -439,6 +419,7 @@ int wl1271_acx_beacon_filter_table(struct wl1271 *wl) 
	}



	/* configure default beacon pass-through rules */

	ie_table->role_id = wl->role_id;

	ie_table->num_ie = 0;

	for (i = 0; i < wl->conf.conn.bcn_filt_ie_count; i++) {

		struct conf_bcn_filt_rule *r = &(wl->conf.conn.bcn_filt_ie[i]);
@@ -500,6 +481,7 @@ int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable) 
		timeout = wl->conf.conn.bss_lose_timeout;

	}



	acx->role_id = wl->role_id;

	acx->synch_fail_thold = cpu_to_le32(threshold);

	acx->bss_lose_timeout = cpu_to_le32(timeout);
@@ -546,43 +528,13 @@ int wl1271_acx_sg_enable(struct wl1271 *wl, bool enable) 
	return ret;

}



int wl1271_acx_sta_sg_cfg(struct wl1271 *wl)

{

	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 sta cfg");



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

	if (!param) {

		ret = -ENOMEM;

		goto out;

	}



	/* BT-WLAN coext parameters */

	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)

int wl12xx_acx_sg_cfg(struct wl1271 *wl)

{

	struct acx_ap_bt_wlan_coex_param *param;

	struct acx_bt_wlan_coex_param *param;

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

	int i, ret;



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

	wl1271_debug(DEBUG_ACX, "acx sg cfg");



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

	if (!param) {
@@ -591,8 +543,8 @@ int wl1271_acx_ap_sg_cfg(struct wl1271 *wl) 
	}



	/* BT-WLAN coext parameters */

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

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

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

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

	param->param_idx = CONF_SG_PARAMS_ALL;



	ret = wl1271_cmd_configure(wl, ACX_SG_CFG, param, sizeof(*param));
@@ -647,6 +599,7 @@ int wl1271_acx_bcn_dtim_options(struct wl1271 *wl) 
		goto out;

	}



	bb->role_id = wl->role_id;

	bb->beacon_rx_timeout = cpu_to_le16(wl->conf.conn.beacon_rx_timeout);

	bb->broadcast_timeout = cpu_to_le16(wl->conf.conn.broadcast_timeout);

	bb->rx_broadcast_in_ps = wl->conf.conn.rx_broadcast_in_ps;
@@ -676,6 +629,7 @@ int wl1271_acx_aid(struct wl1271 *wl, u16 aid) 
		goto out;

	}



	acx_aid->role_id = wl->role_id;

	acx_aid->aid = cpu_to_le16(aid);



	ret = wl1271_cmd_configure(wl, ACX_AID, acx_aid, sizeof(*acx_aid));
@@ -731,6 +685,7 @@ int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->preamble = preamble;



	ret = wl1271_cmd_configure(wl, ACX_PREAMBLE_TYPE, acx, sizeof(*acx));
@@ -758,6 +713,7 @@ int wl1271_acx_cts_protect(struct wl1271 *wl, 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->ctsprotect = ctsprotect;



	ret = wl1271_cmd_configure(wl, ACX_CTS_PROTECTION, acx, sizeof(*acx));
@@ -789,9 +745,8 @@ int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats) 


int wl1271_acx_sta_rate_policies(struct wl1271 *wl)

{

	struct acx_sta_rate_policy *acx;

	struct acx_rate_policy *acx;

	struct conf_tx_rate_class *c = &wl->conf.tx.sta_rc_conf;

	int idx = 0;

	int ret = 0;



	wl1271_debug(DEBUG_ACX, "acx rate policies");
@@ -803,25 +758,30 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl) 
		goto out;

	}



	wl1271_debug(DEBUG_ACX, "basic_rate: 0x%x, full_rate: 0x%x",

		wl->basic_rate, wl->rate_set);



	/* configure one basic rate class */

	idx = ACX_TX_BASIC_RATE;

	acx->rate_class[idx].enabled_rates = cpu_to_le32(wl->basic_rate);

	acx->rate_class[idx].short_retry_limit = c->short_retry_limit;

	acx->rate_class[idx].long_retry_limit = c->long_retry_limit;

	acx->rate_class[idx].aflags = c->aflags;

	acx->rate_policy_idx = cpu_to_le32(ACX_TX_BASIC_RATE);

	acx->rate_policy.enabled_rates = cpu_to_le32(wl->basic_rate);

	acx->rate_policy.short_retry_limit = c->short_retry_limit;

	acx->rate_policy.long_retry_limit = c->long_retry_limit;

	acx->rate_policy.aflags = c->aflags;



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

	if (ret < 0) {

		wl1271_warning("Setting of rate policies failed: %d", ret);

		goto out;

	}



	/* configure one AP supported rate class */

	idx = ACX_TX_AP_FULL_RATE;

	acx->rate_class[idx].enabled_rates = cpu_to_le32(wl->rate_set);

	acx->rate_class[idx].short_retry_limit = c->short_retry_limit;

	acx->rate_class[idx].long_retry_limit = c->long_retry_limit;

	acx->rate_class[idx].aflags = c->aflags;

	acx->rate_policy_idx = cpu_to_le32(ACX_TX_AP_FULL_RATE);

	acx->rate_policy.enabled_rates = cpu_to_le32(wl->rate_set);

	acx->rate_policy.short_retry_limit = c->short_retry_limit;

	acx->rate_policy.long_retry_limit = c->long_retry_limit;

	acx->rate_policy.aflags = c->aflags;



	acx->rate_class_cnt = cpu_to_le32(ACX_TX_RATE_POLICY_CNT);



	wl1271_debug(DEBUG_ACX, "basic_rate: 0x%x, full_rate: 0x%x",

		acx->rate_class[ACX_TX_BASIC_RATE].enabled_rates,

		acx->rate_class[ACX_TX_AP_FULL_RATE].enabled_rates);



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

	if (ret < 0) {
@@ -837,7 +797,7 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl) 
int wl1271_acx_ap_rate_policy(struct wl1271 *wl, struct conf_tx_rate_class *c,

		      u8 idx)

{

	struct acx_ap_rate_policy *acx;

	struct acx_rate_policy *acx;

	int ret = 0;



	wl1271_debug(DEBUG_ACX, "acx ap rate policy %d rates 0x%x",
@@ -883,6 +843,7 @@ int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max, 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->ac = ac;

	acx->cw_min = cw_min;

	acx->cw_max = cpu_to_le16(cw_max);
@@ -916,6 +877,7 @@ int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type, 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->queue_id = queue_id;

	acx->channel_type = channel_type;

	acx->tsid = tsid;
@@ -995,52 +957,9 @@ int wl1271_acx_tx_config_options(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_ap_mem_cfg(struct wl1271 *wl)

{

	struct wl1271_acx_ap_config_memory *mem_conf;

	struct conf_memory_settings *mem;

	int ret;



	wl1271_debug(DEBUG_ACX, "wl1271 mem cfg");



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

	if (!mem_conf) {

		ret = -ENOMEM;

		goto out;

	}



	if (wl->chip.id == CHIP_ID_1283_PG20)

		/*

		 * FIXME: The 128x AP FW does not yet support dynamic memory.

		 * Use the base memory configuration for 128x for now. This

		 * should be fine tuned in the future.

		 */

		mem = &wl->conf.mem_wl128x;

	else

		mem = &wl->conf.mem_wl127x;



	/* memory config */

	mem_conf->num_stations = mem->num_stations;

	mem_conf->rx_mem_block_num = mem->rx_block_num;

	mem_conf->tx_min_mem_block_num = mem->tx_min_block_num;

	mem_conf->num_ssid_profiles = mem->ssid_profiles;

	mem_conf->total_tx_descriptors = cpu_to_le32(ACX_TX_DESCRIPTORS);



	ret = wl1271_cmd_configure(wl, ACX_MEM_CFG, mem_conf,

				   sizeof(*mem_conf));

	if (ret < 0) {

		wl1271_warning("wl1271 mem config failed: %d", ret);

		goto out;

	}



out:

	kfree(mem_conf);

	return ret;

}



int wl1271_acx_sta_mem_cfg(struct wl1271 *wl)

int wl12xx_acx_mem_cfg(struct wl1271 *wl)

{

	struct wl1271_acx_sta_config_memory *mem_conf;

	struct wl12xx_acx_config_memory *mem_conf;

	struct conf_memory_settings *mem;

	int ret;
@@ -1183,6 +1102,7 @@ int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->enable = enable ? CONF_BET_MODE_ENABLE : CONF_BET_MODE_DISABLE;

	acx->max_consecutive = wl->conf.conn.bet_max_consecutive;
@@ -1210,6 +1130,7 @@ int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->version = ACX_IPV4_VERSION;

	acx->enable = enable;
@@ -1269,6 +1190,7 @@ int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->enabled = enable;



	ret = wl1271_cmd_configure(wl, ACX_KEEP_ALIVE_MODE, acx, sizeof(*acx));
@@ -1295,6 +1217,7 @@ int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->period = cpu_to_le32(wl->conf.conn.keep_alive_interval);

	acx->index = index;

	acx->tpl_validation = tpl_valid;
@@ -1328,6 +1251,7 @@ int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable, 


	wl->last_rssi_event = -1;



	acx->role_id = wl->role_id;

	acx->pacing = cpu_to_le16(wl->conf.roam_trigger.trigger_pacing);

	acx->metric = WL1271_ACX_TRIG_METRIC_RSSI_BEACON;

	acx->type = WL1271_ACX_TRIG_TYPE_EDGE;
@@ -1366,6 +1290,7 @@ int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->rssi_beacon = c->avg_weight_rssi_beacon;

	acx->rssi_data = c->avg_weight_rssi_data;

	acx->snr_beacon = c->avg_weight_snr_beacon;
@@ -1384,14 +1309,15 @@ int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl) 


int wl1271_acx_set_ht_capabilities(struct wl1271 *wl,

				    struct ieee80211_sta_ht_cap *ht_cap,

				    bool allow_ht_operation)

				    bool allow_ht_operation, u8 hlid)

{

	struct wl1271_acx_ht_capabilities *acx;

	u8 mac_address[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

	int ret = 0;

	u32 ht_capabilites = 0;



	wl1271_debug(DEBUG_ACX, "acx ht capabilities setting");

	wl1271_debug(DEBUG_ACX, "acx ht capabilities setting "

		     "sta supp: %d sta cap: %d", ht_cap->ht_supported,

		     ht_cap->cap);



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

	if (!acx) {
@@ -1399,26 +1325,22 @@ int wl1271_acx_set_ht_capabilities(struct wl1271 *wl, 
		goto out;

	}



	/* Allow HT Operation ? */

	if (allow_ht_operation) {

		ht_capabilites =

			WL1271_ACX_FW_CAP_HT_OPERATION;

		if (ht_cap->cap & IEEE80211_HT_CAP_GRN_FLD)

			ht_capabilites |=

				WL1271_ACX_FW_CAP_GREENFIELD_FRAME_FORMAT;

		if (ht_cap->cap & IEEE80211_HT_CAP_SGI_20)

			ht_capabilites |=

				WL1271_ACX_FW_CAP_SHORT_GI_FOR_20MHZ_PACKETS;

		if (ht_cap->cap & IEEE80211_HT_CAP_LSIG_TXOP_PROT)

			ht_capabilites |=

				WL1271_ACX_FW_CAP_LSIG_TXOP_PROTECTION;

	if (allow_ht_operation && ht_cap->ht_supported) {

		/* no need to translate capabilities - use the spec values */

		ht_capabilites = ht_cap->cap;



		/*

		 * this bit is not employed by the spec but only by FW to

		 * indicate peer HT support

		 */

		ht_capabilites |= WL12XX_HT_CAP_HT_OPERATION;



		/* get data from A-MPDU parameters field */

		acx->ampdu_max_length = ht_cap->ampdu_factor;

		acx->ampdu_min_spacing = ht_cap->ampdu_density;

	}



	memcpy(acx->mac_address, mac_address, ETH_ALEN);

	acx->hlid = hlid;

	acx->ht_capabilites = cpu_to_le32(ht_capabilites);



	ret = wl1271_cmd_configure(wl, ACX_PEER_HT_CAP, acx, sizeof(*acx));
@@ -1446,6 +1368,7 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl, 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->ht_protection =

		(u8)(ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION);

	acx->rifs_mode = 0;
@@ -1467,14 +1390,12 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl, 
}



/* Configure BA session initiator/receiver parameters setting in the FW. */

int wl1271_acx_set_ba_session(struct wl1271 *wl,

			       enum ieee80211_back_parties direction,

			       u8 tid_index, u8 policy)

int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl)

{

	struct wl1271_acx_ba_session_policy *acx;

	struct wl1271_acx_ba_initiator_policy *acx;

	int ret;



	wl1271_debug(DEBUG_ACX, "acx ba session setting");

	wl1271_debug(DEBUG_ACX, "acx ba initiator policy");



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

	if (!acx) {
@@ -1482,33 +1403,18 @@ int wl1271_acx_set_ba_session(struct wl1271 *wl, 
		goto out;

	}



	/* ANY role */

	acx->role_id = 0xff;

	acx->tid = tid_index;

	acx->enable = policy;

	acx->ba_direction = direction;



	switch (direction) {

	case WLAN_BACK_INITIATOR:

	/* set for the current role */

	acx->role_id = wl->role_id;

	acx->tid_bitmap = wl->conf.ht.tx_ba_tid_bitmap;

	acx->win_size = wl->conf.ht.tx_ba_win_size;

	acx->inactivity_timeout = wl->conf.ht.inactivity_timeout;

		break;

	case WLAN_BACK_RECIPIENT:

		acx->win_size = RX_BA_WIN_SIZE;

		acx->inactivity_timeout = 0;

		break;

	default:

		wl1271_error("Incorrect acx command id=%x\n", direction);

		ret = -EINVAL;

		goto out;

	}



	ret = wl1271_cmd_configure(wl,

				   ACX_BA_SESSION_POLICY_CFG,

				   ACX_BA_SESSION_INIT_POLICY,

				   acx,

				   sizeof(*acx));

	if (ret < 0) {

		wl1271_warning("acx ba session setting failed: %d", ret);

		wl1271_warning("acx ba initiator policy failed: %d", ret);

		goto out;

	}
@@ -1518,8 +1424,8 @@ int wl1271_acx_set_ba_session(struct wl1271 *wl, 
}



/* setup BA session receiver setting in the FW. */

int wl1271_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, u16 ssn,

					bool enable)

int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index,

				       u16 ssn, bool enable, u8 peer_hlid)

{

	struct wl1271_acx_ba_receiver_setup *acx;

	int ret;
@@ -1532,11 +1438,10 @@ int wl1271_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, u16 ssn, 
		goto out;

	}



	/* Single link for now */

	acx->link_id = 1;

	acx->hlid = peer_hlid;

	acx->tid = tid_index;

	acx->enable = enable;

	acx->win_size = 0;

	acx->win_size = wl->conf.ht.rx_ba_win_size;

	acx->ssn = ssn;



	ret = wl1271_cmd_configure(wl, ACX_BA_SESSION_RX_SETUP, acx,
@@ -1606,6 +1511,7 @@ int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable) 
		if (!(conf_queues & BIT(i)))

			continue;



		rx_streaming->role_id = wl->role_id;

		rx_streaming->tid = i;

		rx_streaming->enable = enable_queues & BIT(i);

		rx_streaming->period = wl->conf.rx_streaming.interval;
@@ -1635,6 +1541,7 @@ int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl) 
	if (!acx)

		return -ENOMEM;



	acx->role_id = wl->role_id;

	acx->max_tx_retry = cpu_to_le16(wl->conf.tx.max_tx_retries);



	ret = wl1271_cmd_configure(wl, ACX_MAX_TX_FAILURE, acx, sizeof(*acx));
@@ -1703,31 +1610,6 @@ int wl1271_acx_set_inconnection_sta(struct wl1271 *wl, u8 *addr) 
	return ret;

}



int wl1271_acx_set_ap_beacon_filter(struct wl1271 *wl, bool enable)

{

	struct acx_ap_beacon_filter *acx = NULL;

	int ret;



	wl1271_debug(DEBUG_ACX, "acx set ap beacon filter: %d", enable);



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

	if (!acx)

		return -ENOMEM;



	acx->enable = enable ? 1 : 0;



	ret = wl1271_cmd_configure(wl, ACX_AP_BEACON_FILTER_OPT,

				   acx, sizeof(*acx));

	if (ret < 0) {

		wl1271_warning("acx set ap beacon filter failed: %d", ret);

		goto out;

	}



out:

	kfree(acx);

	return ret;

}



int wl1271_acx_fm_coex(struct wl1271 *wl)

{

	struct wl1271_acx_fm_coex *acx;
@@ -1767,3 +1649,45 @@ int wl1271_acx_fm_coex(struct wl1271 *wl) 
	kfree(acx);

	return ret;

}



int wl12xx_acx_set_rate_mgmt_params(struct wl1271 *wl)

{

	struct wl12xx_acx_set_rate_mgmt_params *acx = NULL;

	struct conf_rate_policy_settings *conf = &wl->conf.rate;

	int ret;



	wl1271_debug(DEBUG_ACX, "acx set rate mgmt params");



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

	if (!acx)

		return -ENOMEM;



	acx->index = ACX_RATE_MGMT_ALL_PARAMS;

	acx->rate_retry_score = cpu_to_le16(conf->rate_retry_score);

	acx->per_add = cpu_to_le16(conf->per_add);

	acx->per_th1 = cpu_to_le16(conf->per_th1);

	acx->per_th2 = cpu_to_le16(conf->per_th2);

	acx->max_per = cpu_to_le16(conf->max_per);

	acx->inverse_curiosity_factor = conf->inverse_curiosity_factor;

	acx->tx_fail_low_th = conf->tx_fail_low_th;

	acx->tx_fail_high_th = conf->tx_fail_high_th;

	acx->per_alpha_shift = conf->per_alpha_shift;

	acx->per_add_shift = conf->per_add_shift;

	acx->per_beta1_shift = conf->per_beta1_shift;

	acx->per_beta2_shift = conf->per_beta2_shift;

	acx->rate_check_up = conf->rate_check_up;

	acx->rate_check_down = conf->rate_check_down;

	memcpy(acx->rate_retry_policy, conf->rate_retry_policy,

	       sizeof(acx->rate_retry_policy));



	ret = wl1271_cmd_configure(wl, ACX_SET_RATE_MGMT_PARAMS,

				   acx, sizeof(*acx));

	if (ret < 0) {

		wl1271_warning("acx set rate mgmt params failed: %d", ret);

		goto out;

	}



out:

	kfree(acx);

	return ret;

}

drivers/net/wireless/wl12xx/acx.h

+135 −259

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/wl12xx/boot.c

+15 −28
Original line number Diff line number Diff line
@@ -107,16 +107,6 @@ static unsigned int wl12xx_get_fw_ver_quirks(struct wl1271 *wl) 
	unsigned int quirks = 0;

	unsigned int *fw_ver = wl->chip.fw_ver;



	/* Only for wl127x */

	if ((fw_ver[FW_VER_CHIP] == FW_VER_CHIP_WL127X) &&

	    /* Check STA version */

	    (((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&

	      (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_1_SPARE_STA_MIN)) ||

	     /* Check AP version */

	     ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_AP) &&

	      (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_1_SPARE_AP_MIN))))

		quirks |= WL12XX_QUIRK_USE_2_SPARE_BLOCKS;



	/* Only new station firmwares support routing fw logs to the host */

	if ((fw_ver[FW_VER_IF_TYPE] == FW_VER_IF_TYPE_STA) &&

	    (fw_ver[FW_VER_MINOR] < FW_VER_MINOR_FWLOG_STA_MIN))
@@ -504,21 +494,18 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl) 
	wl->event_mask = BSS_LOSE_EVENT_ID |

		SCAN_COMPLETE_EVENT_ID |

		PS_REPORT_EVENT_ID |

		JOIN_EVENT_COMPLETE_ID |

		DISCONNECT_EVENT_COMPLETE_ID |

		RSSI_SNR_TRIGGER_0_EVENT_ID |

		PSPOLL_DELIVERY_FAILURE_EVENT_ID |

		SOFT_GEMINI_SENSE_EVENT_ID |

		PERIODIC_SCAN_REPORT_EVENT_ID |

		PERIODIC_SCAN_COMPLETE_EVENT_ID;



	if (wl->bss_type == BSS_TYPE_AP_BSS)

		wl->event_mask |= STA_REMOVE_COMPLETE_EVENT_ID |

		PERIODIC_SCAN_COMPLETE_EVENT_ID |

		DUMMY_PACKET_EVENT_ID |

		PEER_REMOVE_COMPLETE_EVENT_ID |

		BA_SESSION_RX_CONSTRAINT_EVENT_ID |

		REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID |

		INACTIVE_STA_EVENT_ID |

		MAX_TX_RETRY_EVENT_ID;

	else

		wl->event_mask |= DUMMY_PACKET_EVENT_ID |

			BA_SESSION_RX_CONSTRAINT_EVENT_ID;



	ret = wl1271_event_unmask(wl);

	if (ret < 0) {
@@ -549,13 +536,13 @@ static void wl1271_boot_hw_version(struct wl1271 *wl) 
{

	u32 fuse;



	fuse = wl1271_top_reg_read(wl, REG_FUSE_DATA_2_1);

	if (wl->chip.id == CHIP_ID_1283_PG20)

		fuse = wl1271_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1);

	else

		fuse = wl1271_top_reg_read(wl, WL127X_REG_FUSE_DATA_2_1);

	fuse = (fuse & PG_VER_MASK) >> PG_VER_OFFSET;



	wl->hw_pg_ver = (s8)fuse;



	if (((wl->hw_pg_ver & PG_MAJOR_VER_MASK) >> PG_MAJOR_VER_OFFSET) < 3)

		wl->quirks |= WL12XX_QUIRK_END_OF_TRANSACTION;

}



static int wl128x_switch_tcxo_to_fref(struct wl1271 *wl)
@@ -696,7 +683,8 @@ static int wl127x_boot_clk(struct wl1271 *wl) 
	u32 pause;

	u32 clk;



	wl1271_boot_hw_version(wl);

	if (((wl->hw_pg_ver & PG_MAJOR_VER_MASK) >> PG_MAJOR_VER_OFFSET) < 3)

		wl->quirks |= WL12XX_QUIRK_END_OF_TRANSACTION;



	if (wl->ref_clock == CONF_REF_CLK_19_2_E ||

	    wl->ref_clock == CONF_REF_CLK_38_4_E ||
@@ -750,6 +738,8 @@ int wl1271_load_firmware(struct wl1271 *wl) 
	u32 tmp, clk;

	int selected_clock = -1;



	wl1271_boot_hw_version(wl);



	if (wl->chip.id == CHIP_ID_1283_PG20) {

		ret = wl128x_boot_clk(wl, &selected_clock);

		if (ret < 0)
@@ -852,9 +842,6 @@ int wl1271_boot(struct wl1271 *wl) 
	/* Enable firmware interrupts now */

	wl1271_boot_enable_interrupts(wl);



	/* set the wl1271 default filters */

	wl1271_set_default_filters(wl);



	wl1271_event_mbox_config(wl);



out:

drivers/net/wireless/wl12xx/boot.h

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ struct wl1271_static_data { 
#define OCP_REG_CLK_POLARITY 0x0cb2

#define OCP_REG_CLK_PULL     0x0cb4



#define REG_FUSE_DATA_2_1    0x050a

#define WL127X_REG_FUSE_DATA_2_1    0x050a

#define WL128X_REG_FUSE_DATA_2_1    0x2152

#define PG_VER_MASK          0x3c

#define PG_VER_OFFSET        2

drivers/net/wireless/wl12xx/cmd.c

+587 −206

File changed.

Preview size limit exceeded, changes collapsed.