Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6
[linux-2.6.git] / drivers / net / wireless / wl12xx / acx.c
index 1cfd458..34f6ab5 100644 (file)
+/*
+ * This file is part of wl1271
+ *
+ * Copyright (C) 2008-2009 Nokia Corporation
+ *
+ * Contact: Luciano Coelho <luciano.coelho@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
 #include "acx.h"
 
 #include <linux/module.h>
-#include <linux/crc7.h>
+#include <linux/platform_device.h>
 #include <linux/spi/spi.h>
+#include <linux/slab.h>
 
 #include "wl12xx.h"
 #include "wl12xx_80211.h"
 #include "reg.h"
-#include "spi.h"
 #include "ps.h"
 
-int wl12xx_acx_frame_rates(struct wl12xx *wl, u8 ctrl_rate, u8 ctrl_mod,
-                          u8 mgt_rate, u8 mgt_mod)
+int wl1271_acx_wake_up_conditions(struct wl1271 *wl)
 {
+       struct acx_wake_up_condition *wake_up;
        int ret;
-       struct acx_fw_gen_frame_rates rates;
 
-       wl12xx_debug(DEBUG_ACX, "acx frame rates");
+       wl1271_debug(DEBUG_ACX, "acx wake up conditions");
 
-       rates.header.id = ACX_FW_GEN_FRAME_RATES;
-       rates.header.len = sizeof(struct acx_fw_gen_frame_rates) -
-               sizeof(struct acx_header);
+       wake_up = kzalloc(sizeof(*wake_up), GFP_KERNEL);
+       if (!wake_up) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       rates.tx_ctrl_frame_rate = ctrl_rate;
-       rates.tx_ctrl_frame_mod = ctrl_mod;
-       rates.tx_mgt_frame_rate = mgt_rate;
-       rates.tx_mgt_frame_mod = mgt_mod;
+       wake_up->wake_up_event = wl->conf.conn.wake_up_event;
+       wake_up->listen_interval = wl->conf.conn.listen_interval;
 
-       ret = wl12xx_cmd_configure(wl, &rates, sizeof(rates));
+       ret = wl1271_cmd_configure(wl, ACX_WAKE_UP_CONDITIONS,
+                                  wake_up, sizeof(*wake_up));
        if (ret < 0) {
-               wl12xx_error("Failed to set FW rates and modulation");
-               return ret;
+               wl1271_warning("could not set wake up conditions: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(wake_up);
+       return ret;
 }
 
+int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth)
+{
+       struct acx_sleep_auth *auth;
+       int ret;
+
+       wl1271_debug(DEBUG_ACX, "acx sleep auth");
+
+       auth = kzalloc(sizeof(*auth), GFP_KERNEL);
+       if (!auth) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       auth->sleep_auth = sleep_auth;
+
+       ret = wl1271_cmd_configure(wl, ACX_SLEEP_AUTH, auth, sizeof(*auth));
+
+out:
+       kfree(auth);
+       return ret;
+}
 
-int wl12xx_acx_station_id(struct wl12xx *wl)
+int wl1271_acx_tx_power(struct wl1271 *wl, int power)
 {
-       int ret, i;
-       struct dot11_station_id mac;
+       struct acx_current_tx_power *acx;
+       int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx dot11_station_id");
+       wl1271_debug(DEBUG_ACX, "acx dot11_cur_tx_pwr %d", power);
 
-       mac.header.id = DOT11_STATION_ID;
-       mac.header.len = sizeof(mac) - sizeof(struct acx_header);
+       if (power < 0 || power > 25)
+               return -EINVAL;
 
-       for (i = 0; i < ETH_ALEN; i++)
-               mac.mac[i] = wl->mac_addr[ETH_ALEN - 1 - i];
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->current_tx_power = power * 10;
+
+       ret = wl1271_cmd_configure(wl, DOT11_CUR_TX_PWR, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("configure of tx power failed: %d", ret);
+               goto out;
+       }
 
-       ret = wl12xx_cmd_configure(wl, &mac, sizeof(mac));
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_feature_cfg(struct wl1271 *wl)
+{
+       struct acx_feature_config *feature;
+       int ret;
+
+       wl1271_debug(DEBUG_ACX, "acx feature cfg");
+
+       feature = kzalloc(sizeof(*feature), GFP_KERNEL);
+       if (!feature) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       /* DF_ENCRYPTION_DISABLE and DF_SNIFF_MODE_ENABLE are disabled */
+       feature->data_flow_options = 0;
+       feature->options = 0;
+
+       ret = wl1271_cmd_configure(wl, ACX_FEATURE_CFG,
+                                  feature, sizeof(*feature));
+       if (ret < 0) {
+               wl1271_error("Couldnt set HW encryption");
+               goto out;
+       }
+
+out:
+       kfree(feature);
+       return ret;
+}
+
+int wl1271_acx_mem_map(struct wl1271 *wl, struct acx_header *mem_map,
+                      size_t len)
+{
+       int ret;
+
+       wl1271_debug(DEBUG_ACX, "acx mem map");
+
+       ret = wl1271_cmd_interrogate(wl, ACX_MEM_MAP, mem_map, len);
        if (ret < 0)
                return ret;
 
        return 0;
 }
 
-int wl12xx_acx_default_key(struct wl12xx *wl, u8 key_id)
+int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl)
+{
+       struct acx_rx_msdu_lifetime *acx;
+       int ret;
+
+       wl1271_debug(DEBUG_ACX, "acx rx msdu life time");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->lifetime = cpu_to_le32(wl->conf.rx.rx_msdu_life_time);
+       ret = wl1271_cmd_configure(wl, DOT11_RX_MSDU_LIFE_TIME,
+                                  acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("failed to set rx msdu life time: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_rx_config(struct wl1271 *wl, u32 config, u32 filter)
 {
-       struct acx_dot11_default_key default_key;
+       struct acx_rx_config *rx_config;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx dot11_default_key (%d)", key_id);
+       wl1271_debug(DEBUG_ACX, "acx rx config");
 
-       default_key.header.id = DOT11_DEFAULT_KEY;
-       default_key.header.len = sizeof(default_key) -
-               sizeof(struct acx_header);
+       rx_config = kzalloc(sizeof(*rx_config), GFP_KERNEL);
+       if (!rx_config) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       default_key.id = key_id;
+       rx_config->config_options = cpu_to_le32(config);
+       rx_config->filter_options = cpu_to_le32(filter);
 
-       ret = wl12xx_cmd_configure(wl, &default_key, sizeof(default_key));
+       ret = wl1271_cmd_configure(wl, ACX_RX_CFG,
+                                  rx_config, sizeof(*rx_config));
        if (ret < 0) {
-               wl12xx_error("Couldnt set default key");
-               return ret;
+               wl1271_warning("failed to set rx config: %d", ret);
+               goto out;
        }
 
-       wl->default_key = key_id;
+out:
+       kfree(rx_config);
+       return ret;
+}
 
-       return 0;
+int wl1271_acx_pd_threshold(struct wl1271 *wl)
+{
+       struct acx_packet_detection *pd;
+       int ret;
+
+       wl1271_debug(DEBUG_ACX, "acx data pd threshold");
+
+       pd = kzalloc(sizeof(*pd), GFP_KERNEL);
+       if (!pd) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       pd->threshold = cpu_to_le32(wl->conf.rx.packet_detection_threshold);
+
+       ret = wl1271_cmd_configure(wl, ACX_PD_THRESHOLD, pd, sizeof(*pd));
+       if (ret < 0) {
+               wl1271_warning("failed to set pd threshold: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(pd);
+       return ret;
 }
 
-int wl12xx_acx_wake_up_conditions(struct wl12xx *wl, u8 listen_interval)
+int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time)
 {
-       struct acx_wake_up_condition wake_up;
+       struct acx_slot *slot;
+       int ret;
+
+       wl1271_debug(DEBUG_ACX, "acx slot");
 
-       wl12xx_debug(DEBUG_ACX, "acx wake up conditions");
+       slot = kzalloc(sizeof(*slot), GFP_KERNEL);
+       if (!slot) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       wake_up.header.id = ACX_WAKE_UP_CONDITIONS;
-       wake_up.header.len = sizeof(wake_up) - sizeof(struct acx_header);
+       slot->wone_index = STATION_WONE_INDEX;
+       slot->slot_time = slot_time;
 
-       wake_up.wake_up_event = WAKE_UP_EVENT_DTIM_BITMAP;
-       wake_up.listen_interval = listen_interval;
+       ret = wl1271_cmd_configure(wl, ACX_SLOT, slot, sizeof(*slot));
+       if (ret < 0) {
+               wl1271_warning("failed to set slot time: %d", ret);
+               goto out;
+       }
 
-       return wl12xx_cmd_configure(wl, &wake_up, sizeof(wake_up));
+out:
+       kfree(slot);
+       return ret;
 }
 
-int wl12xx_acx_sleep_auth(struct wl12xx *wl, u8 sleep_auth)
+int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable,
+                                void *mc_list, u32 mc_list_len)
 {
+       struct acx_dot11_grp_addr_tbl *acx;
        int ret;
-       struct acx_sleep_auth auth;
 
-       wl12xx_debug(DEBUG_ACX, "acx sleep auth");
+       wl1271_debug(DEBUG_ACX, "acx group address tbl");
 
-       auth.header.id = ACX_SLEEP_AUTH;
-       auth.header.len = sizeof(auth) - sizeof(struct acx_header);
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       auth.sleep_auth = sleep_auth;
+       /* MAC filtering */
+       acx->enabled = enable;
+       acx->num_groups = mc_list_len;
+       memcpy(acx->mac_table, mc_list, mc_list_len * ETH_ALEN);
 
-       ret = wl12xx_cmd_configure(wl, &auth, sizeof(auth));
-       if (ret < 0)
-               return ret;
+       ret = wl1271_cmd_configure(wl, DOT11_GROUP_ADDRESS_TBL,
+                                  acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("failed to set group addr table: %d", ret);
+               goto out;
+       }
 
-       return 0;
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_fw_version(struct wl12xx *wl, char *buf, size_t len)
+int wl1271_acx_service_period_timeout(struct wl1271 *wl)
 {
-       struct wl12xx_command cmd;
-       struct acx_revision *rev;
+       struct acx_rx_timeout *rx_timeout;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx fw rev");
+       rx_timeout = kzalloc(sizeof(*rx_timeout), GFP_KERNEL);
+       if (!rx_timeout) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       wl1271_debug(DEBUG_ACX, "acx service period timeout");
 
-       memset(&cmd, 0, sizeof(cmd));
+       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);
 
-       ret = wl12xx_cmd_interrogate(wl, ACX_FW_REV, sizeof(*rev), &cmd);
+       ret = wl1271_cmd_configure(wl, ACX_SERVICE_PERIOD_TIMEOUT,
+                                  rx_timeout, sizeof(*rx_timeout));
        if (ret < 0) {
-               wl12xx_warning("ACX_FW_REV interrogate failed");
-               return ret;
+               wl1271_warning("failed to set service period timeout: %d",
+                              ret);
+               goto out;
        }
 
-       rev = (struct acx_revision *) &cmd.parameters;
+out:
+       kfree(rx_timeout);
+       return ret;
+}
 
-       /* be careful with the buffer sizes */
-       strncpy(buf, rev->fw_version, min(len, sizeof(rev->fw_version)));
+int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold)
+{
+       struct acx_rts_threshold *rts;
+       int ret;
 
        /*
-        * if the firmware version string is exactly
-        * sizeof(rev->fw_version) long or fw_len is less than
-        * sizeof(rev->fw_version) it won't be null terminated
+        * If the RTS threshold is not configured or out of range, use the
+        * default value.
         */
-       buf[min(len, sizeof(rev->fw_version)) - 1] = '\0';
+       if (rts_threshold > IEEE80211_MAX_RTS_THRESHOLD)
+               rts_threshold = wl->conf.rx.rts_threshold;
 
-       return 0;
+       wl1271_debug(DEBUG_ACX, "acx rts threshold: %d", rts_threshold);
+
+       rts = kzalloc(sizeof(*rts), GFP_KERNEL);
+       if (!rts) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       rts->threshold = cpu_to_le16((u16)rts_threshold);
+
+       ret = wl1271_cmd_configure(wl, DOT11_RTS_THRESHOLD, rts, sizeof(*rts));
+       if (ret < 0) {
+               wl1271_warning("failed to set rts threshold: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(rts);
+       return ret;
 }
 
-int wl12xx_acx_tx_power(struct wl12xx *wl, int power)
+int wl1271_acx_dco_itrim_params(struct wl1271 *wl)
 {
-       struct acx_current_tx_power ie;
+       struct acx_dco_itrim_params *dco;
+       struct conf_itrim_settings *c = &wl->conf.itrim;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx dot11_cur_tx_pwr");
+       wl1271_debug(DEBUG_ACX, "acx dco itrim parameters");
 
-       if (power < 0 || power > 25)
-               return -EINVAL;
+       dco = kzalloc(sizeof(*dco), GFP_KERNEL);
+       if (!dco) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       memset(&ie, 0, sizeof(ie));
+       dco->enable = c->enable;
+       dco->timeout = cpu_to_le32(c->timeout);
 
-       ie.header.id = DOT11_CUR_TX_PWR;
-       ie.header.len = sizeof(ie) - sizeof(struct acx_header);
-       ie.current_tx_power = power * 10;
+       ret = wl1271_cmd_configure(wl, ACX_SET_DCO_ITRIM_PARAMS,
+                                  dco, sizeof(*dco));
+       if (ret < 0) {
+               wl1271_warning("failed to set dco itrim parameters: %d", ret);
+               goto out;
+       }
 
-       ret = wl12xx_cmd_configure(wl, &ie, sizeof(ie));
+out:
+       kfree(dco);
+       return ret;
+}
+
+int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter)
+{
+       struct acx_beacon_filter_option *beacon_filter = NULL;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx beacon filter opt");
+
+       if (enable_filter &&
+           wl->conf.conn.bcn_filt_mode == CONF_BCN_FILT_MODE_DISABLED)
+               goto out;
+
+       beacon_filter = kzalloc(sizeof(*beacon_filter), GFP_KERNEL);
+       if (!beacon_filter) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       beacon_filter->enable = enable_filter;
+
+       /*
+        * When set to zero, and the filter is enabled, beacons
+        * without the unicast TIM bit set are dropped.
+        */
+       beacon_filter->max_num_beacons = 0;
+
+       ret = wl1271_cmd_configure(wl, ACX_BEACON_FILTER_OPT,
+                                  beacon_filter, sizeof(*beacon_filter));
        if (ret < 0) {
-               wl12xx_warning("configure of tx power failed: %d", ret);
-               return ret;
+               wl1271_warning("failed to set beacon filter opt: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(beacon_filter);
+       return ret;
 }
 
-int wl12xx_acx_feature_cfg(struct wl12xx *wl)
+int wl1271_acx_beacon_filter_table(struct wl1271 *wl)
 {
-       struct acx_feature_config feature;
+       struct acx_beacon_filter_ie_table *ie_table;
+       int i, idx = 0;
        int ret;
+       bool vendor_spec = false;
 
-       wl12xx_debug(DEBUG_ACX, "acx feature cfg");
-
-       memset(&feature, 0, sizeof(feature));
+       wl1271_debug(DEBUG_ACX, "acx beacon filter table");
 
-       feature.header.id = ACX_FEATURE_CFG;
-       feature.header.len = sizeof(feature) - sizeof(struct acx_header);
+       ie_table = kzalloc(sizeof(*ie_table), GFP_KERNEL);
+       if (!ie_table) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       /* DF_ENCRYPTION_DISABLE and DF_SNIFF_MODE_ENABLE are disabled */
-       feature.data_flow_options = 0;
-       feature.options = 0;
+       /* configure default beacon pass-through rules */
+       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]);
+               ie_table->table[idx++] = r->ie;
+               ie_table->table[idx++] = r->rule;
+
+               if (r->ie == WLAN_EID_VENDOR_SPECIFIC) {
+                       /* only one vendor specific ie allowed */
+                       if (vendor_spec)
+                               continue;
+
+                       /* for vendor specific rules configure the
+                          additional fields */
+                       memcpy(&(ie_table->table[idx]), r->oui,
+                              CONF_BCN_IE_OUI_LEN);
+                       idx += CONF_BCN_IE_OUI_LEN;
+                       ie_table->table[idx++] = r->type;
+                       memcpy(&(ie_table->table[idx]), r->version,
+                              CONF_BCN_IE_VER_LEN);
+                       idx += CONF_BCN_IE_VER_LEN;
+                       vendor_spec = true;
+               }
+
+               ie_table->num_ie++;
+       }
 
-       ret = wl12xx_cmd_configure(wl, &feature, sizeof(feature));
-       if (ret < 0)
-               wl12xx_error("Couldnt set HW encryption");
+       ret = wl1271_cmd_configure(wl, ACX_BEACON_FILTER_TABLE,
+                                  ie_table, sizeof(*ie_table));
+       if (ret < 0) {
+               wl1271_warning("failed to set beacon filter table: %d", ret);
+               goto out;
+       }
 
+out:
+       kfree(ie_table);
        return ret;
 }
 
-int wl12xx_acx_mem_map(struct wl12xx *wl, void *mem_map, size_t len)
+#define ACX_CONN_MONIT_DISABLE_VALUE  0xffffffff
+
+int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable)
 {
-       struct wl12xx_command cmd;
+       struct acx_conn_monit_params *acx;
+       u32 threshold = ACX_CONN_MONIT_DISABLE_VALUE;
+       u32 timeout = ACX_CONN_MONIT_DISABLE_VALUE;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx mem map");
+       wl1271_debug(DEBUG_ACX, "acx connection monitor parameters: %s",
+                    enable ? "enabled" : "disabled");
 
-       ret = wl12xx_cmd_interrogate(wl, ACX_MEM_MAP, len, &cmd);
-       if (ret < 0)
-               return ret;
-       else if (cmd.status != CMD_STATUS_SUCCESS)
-               return -EIO;
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       memcpy(mem_map, &cmd.parameters, len);
+       if (enable) {
+               threshold = wl->conf.conn.synch_fail_thold;
+               timeout = wl->conf.conn.bss_lose_timeout;
+       }
 
-       return 0;
+       acx->synch_fail_thold = cpu_to_le32(threshold);
+       acx->bss_lose_timeout = cpu_to_le32(timeout);
+
+       ret = wl1271_cmd_configure(wl, ACX_CONN_MONIT_PARAMS,
+                                  acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("failed to set connection monitor "
+                              "parameters: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_data_path_params(struct wl12xx *wl,
-                               struct acx_data_path_params_resp *data_path)
+
+int wl1271_acx_sg_enable(struct wl1271 *wl, bool enable)
 {
-       struct acx_data_path_params params;
-       struct wl12xx_command cmd;
+       struct acx_bt_wlan_coex *pta;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx data path params");
+       wl1271_debug(DEBUG_ACX, "acx sg enable");
+
+       pta = kzalloc(sizeof(*pta), GFP_KERNEL);
+       if (!pta) {
+               ret = -ENOMEM;
+               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) {
+               wl1271_warning("failed to set softgemini enable: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(pta);
+       return ret;
+}
 
-       params.rx_packet_ring_chunk_size = DP_RX_PACKET_RING_CHUNK_SIZE;
-       params.tx_packet_ring_chunk_size = DP_TX_PACKET_RING_CHUNK_SIZE;
+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;
 
-       params.rx_packet_ring_chunk_num = DP_RX_PACKET_RING_CHUNK_NUM;
-       params.tx_packet_ring_chunk_num = DP_TX_PACKET_RING_CHUNK_NUM;
+       wl1271_debug(DEBUG_ACX, "acx sg sta cfg");
 
-       params.tx_complete_threshold = 1;
+       param = kzalloc(sizeof(*param), GFP_KERNEL);
+       if (!param) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       params.tx_complete_ring_depth = FW_TX_CMPLT_BLOCK_SIZE;
+       /* 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;
 
-       params.tx_complete_timeout = DP_TX_COMPLETE_TIME_OUT;
+       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;
+}
 
-       params.header.id = ACX_DATA_PATH_PARAMS;
-       params.header.len = sizeof(params) - sizeof(struct acx_header);
+int wl1271_acx_ap_sg_cfg(struct wl1271 *wl)
+{
+       struct acx_ap_bt_wlan_coex_param *param;
+       struct conf_sg_settings *c = &wl->conf.sg;
+       int i, ret;
 
-       ret = wl12xx_cmd_configure(wl, &params, sizeof(params));
-       if (ret < 0)
-               return ret;
+       wl1271_debug(DEBUG_ACX, "acx sg ap cfg");
 
+       param = kzalloc(sizeof(*param), GFP_KERNEL);
+       if (!param) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       ret = wl12xx_cmd_interrogate(wl, ACX_DATA_PATH_PARAMS,
-                                    sizeof(struct acx_data_path_params_resp),
-                                    &cmd);
+       /* BT-WLAN coext parameters */
+       for (i = 0; i < CONF_SG_AP_PARAMS_MAX; i++)
+               param->params[i] = cpu_to_le32(c->ap_params[i]);
+       param->param_idx = CONF_SG_PARAMS_ALL;
 
+       ret = wl1271_cmd_configure(wl, ACX_SG_CFG, param, sizeof(*param));
        if (ret < 0) {
-               wl12xx_warning("failed to read data path parameters: %d", ret);
-               return ret;
-       } else if (cmd.status != CMD_STATUS_SUCCESS) {
-               wl12xx_warning("data path parameter acx status failed");
-               return -EIO;
+               wl1271_warning("failed to set sg config: %d", ret);
+               goto out;
        }
 
-       memcpy(data_path, &cmd.parameters, sizeof(*data_path));
+out:
+       kfree(param);
+       return ret;
+}
 
-       return 0;
+int wl1271_acx_cca_threshold(struct wl1271 *wl)
+{
+       struct acx_energy_detection *detection;
+       int ret;
+
+       wl1271_debug(DEBUG_ACX, "acx cca threshold");
+
+       detection = kzalloc(sizeof(*detection), GFP_KERNEL);
+       if (!detection) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       detection->rx_cca_threshold = cpu_to_le16(wl->conf.rx.rx_cca_threshold);
+       detection->tx_energy_detection = wl->conf.tx.tx_energy_detection;
+
+       ret = wl1271_cmd_configure(wl, ACX_CCA_THRESHOLD,
+                                  detection, sizeof(*detection));
+       if (ret < 0)
+               wl1271_warning("failed to set cca threshold: %d", ret);
+
+out:
+       kfree(detection);
+       return ret;
 }
 
-int wl12xx_acx_rx_msdu_life_time(struct wl12xx *wl, u32 life_time)
+int wl1271_acx_bcn_dtim_options(struct wl1271 *wl)
 {
-       struct rx_msdu_lifetime msdu_lifetime;
+       struct acx_beacon_broadcast *bb;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx rx msdu life time");
+       wl1271_debug(DEBUG_ACX, "acx bcn dtim options");
+
+       bb = kzalloc(sizeof(*bb), GFP_KERNEL);
+       if (!bb) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       msdu_lifetime.header.id = DOT11_RX_MSDU_LIFE_TIME;
-       msdu_lifetime.header.len = sizeof(msdu_lifetime) -
-               sizeof(struct acx_header);
-       msdu_lifetime.lifetime = life_time;
+       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;
+       bb->ps_poll_threshold = wl->conf.conn.ps_poll_threshold;
 
-       ret = wl12xx_cmd_configure(wl, &msdu_lifetime, sizeof(msdu_lifetime));
+       ret = wl1271_cmd_configure(wl, ACX_BCN_DTIM_OPTIONS, bb, sizeof(*bb));
        if (ret < 0) {
-               wl12xx_warning("failed to set rx msdu life time: %d", ret);
-               return ret;
+               wl1271_warning("failed to set rx config: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(bb);
+       return ret;
 }
 
-int wl12xx_acx_rx_config(struct wl12xx *wl, u32 config, u32 filter)
+int wl1271_acx_aid(struct wl1271 *wl, u16 aid)
 {
-       struct acx_rx_config rx_config;
+       struct acx_aid *acx_aid;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx rx config");
+       wl1271_debug(DEBUG_ACX, "acx aid");
 
-       rx_config.header.id = ACX_RX_CFG;
-       rx_config.header.len = sizeof(rx_config) - sizeof(struct acx_header);
-       rx_config.config_options = config;
-       rx_config.filter_options = filter;
+       acx_aid = kzalloc(sizeof(*acx_aid), GFP_KERNEL);
+       if (!acx_aid) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx_aid->aid = cpu_to_le16(aid);
 
-       ret = wl12xx_cmd_configure(wl, &rx_config, sizeof(rx_config));
+       ret = wl1271_cmd_configure(wl, ACX_AID, acx_aid, sizeof(*acx_aid));
        if (ret < 0) {
-               wl12xx_warning("failed to set rx config: %d", ret);
-               return ret;
+               wl1271_warning("failed to set aid: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(acx_aid);
+       return ret;
 }
 
-int wl12xx_acx_pd_threshold(struct wl12xx *wl)
+int wl1271_acx_event_mbox_mask(struct wl1271 *wl, u32 event_mask)
 {
-       struct acx_packet_detection packet_detection;
+       struct acx_event_mask *mask;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx data pd threshold");
+       wl1271_debug(DEBUG_ACX, "acx event mbox mask");
+
+       mask = kzalloc(sizeof(*mask), GFP_KERNEL);
+       if (!mask) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       /* FIXME: threshold value not set */
-       packet_detection.header.id = ACX_PD_THRESHOLD;
-       packet_detection.header.len = sizeof(packet_detection) -
-               sizeof(struct acx_header);
+       /* high event mask is unused */
+       mask->high_event_mask = cpu_to_le32(0xffffffff);
+       mask->event_mask = cpu_to_le32(event_mask);
 
-       ret = wl12xx_cmd_configure(wl, &packet_detection,
-                                  sizeof(packet_detection));
+       ret = wl1271_cmd_configure(wl, ACX_EVENT_MBOX_MASK,
+                                  mask, sizeof(*mask));
        if (ret < 0) {
-               wl12xx_warning("failed to set pd threshold: %d", ret);
-               return ret;
+               wl1271_warning("failed to set acx_event_mbox_mask: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(mask);
+       return ret;
 }
 
-int wl12xx_acx_slot(struct wl12xx *wl, enum acx_slot_type slot_time)
+int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble)
 {
-       struct acx_slot slot;
+       struct acx_preamble *acx;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx slot");
+       wl1271_debug(DEBUG_ACX, "acx_set_preamble");
 
-       slot.header.id = ACX_SLOT;
-       slot.header.len = sizeof(slot) - sizeof(struct acx_header);
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       slot.wone_index = STATION_WONE_INDEX;
-       slot.slot_time = slot_time;
+       acx->preamble = preamble;
 
-       ret = wl12xx_cmd_configure(wl, &slot, sizeof(slot));
+       ret = wl1271_cmd_configure(wl, ACX_PREAMBLE_TYPE, acx, sizeof(*acx));
        if (ret < 0) {
-               wl12xx_warning("failed to set slot time: %d", ret);
-               return ret;
+               wl1271_warning("Setting of preamble failed: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_group_address_tbl(struct wl12xx *wl)
+int wl1271_acx_cts_protect(struct wl1271 *wl,
+                          enum acx_ctsprotect_type ctsprotect)
 {
-       struct multicast_grp_addr_start multicast;
+       struct acx_ctsprotect *acx;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx group address tbl");
+       wl1271_debug(DEBUG_ACX, "acx_set_ctsprotect");
 
-       /* MAC filtering */
-       multicast.header.id = DOT11_GROUP_ADDRESS_TBL;
-       multicast.header.len = sizeof(multicast) - sizeof(struct acx_header);
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       multicast.enabled = 0;
-       multicast.num_groups = 0;
-       memset(multicast.mac_table, 0, ADDRESS_GROUP_MAX_LEN);
+       acx->ctsprotect = ctsprotect;
 
-       ret = wl12xx_cmd_configure(wl, &multicast, sizeof(multicast));
+       ret = wl1271_cmd_configure(wl, ACX_CTS_PROTECTION, acx, sizeof(*acx));
        if (ret < 0) {
-               wl12xx_warning("failed to set group addr table: %d", ret);
-               return ret;
+               wl1271_warning("Setting of ctsprotect failed: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_service_period_timeout(struct wl12xx *wl)
+int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats)
 {
-       struct acx_rx_timeout rx_timeout;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx service period timeout");
+       wl1271_debug(DEBUG_ACX, "acx statistics");
+
+       ret = wl1271_cmd_interrogate(wl, ACX_STATISTICS, stats,
+                                    sizeof(*stats));
+       if (ret < 0) {
+               wl1271_warning("acx statistics failed: %d", ret);
+               return -ENOMEM;
+       }
+
+       return 0;
+}
+
+int wl1271_acx_sta_rate_policies(struct wl1271 *wl)
+{
+       struct acx_sta_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");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       /* 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;
+
+       /* 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;
 
-       /* RX timeout */
-       rx_timeout.header.id = ACX_SERVICE_PERIOD_TIMEOUT;
-       rx_timeout.header.len = sizeof(rx_timeout) - sizeof(struct acx_header);
+       acx->rate_class_cnt = cpu_to_le32(ACX_TX_RATE_POLICY_CNT);
 
-       rx_timeout.ps_poll_timeout = RX_TIMEOUT_PS_POLL_DEF;
-       rx_timeout.upsd_timeout = RX_TIMEOUT_UPSD_DEF;
+       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 = wl12xx_cmd_configure(wl, &rx_timeout, sizeof(rx_timeout));
+       ret = wl1271_cmd_configure(wl, ACX_RATE_POLICY, acx, sizeof(*acx));
        if (ret < 0) {
-               wl12xx_warning("failed to set service period timeout: %d",
-                              ret);
-               return ret;
+               wl1271_warning("Setting of rate policies failed: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_rts_threshold(struct wl12xx *wl, u16 rts_threshold)
+int wl1271_acx_ap_rate_policy(struct wl1271 *wl, struct conf_tx_rate_class *c,
+                     u8 idx)
 {
-       struct acx_rts_threshold rts;
-       int ret;
+       struct acx_ap_rate_policy *acx;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx ap rate policy %d rates 0x%x",
+                    idx, c->enabled_rates);
 
-       wl12xx_debug(DEBUG_ACX, "acx rts threshold");
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       rts.header.id = DOT11_RTS_THRESHOLD;
-       rts.header.len = sizeof(rts) - sizeof(struct acx_header);
+       acx->rate_policy.enabled_rates = cpu_to_le32(c->enabled_rates);
+       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;
 
-       rts.threshold = rts_threshold;
+       acx->rate_policy_idx = cpu_to_le32(idx);
 
-       ret = wl12xx_cmd_configure(wl, &rts, sizeof(rts));
+       ret = wl1271_cmd_configure(wl, ACX_RATE_POLICY, acx, sizeof(*acx));
        if (ret < 0) {
-               wl12xx_warning("failed to set rts threshold: %d", ret);
-               return ret;
+               wl1271_warning("Setting of ap rate policy failed: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_beacon_filter_opt(struct wl12xx *wl)
+int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,
+                     u8 aifsn, u16 txop)
 {
-       struct acx_beacon_filter_option beacon_filter;
+       struct acx_ac_cfg *acx;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx ac cfg %d cw_ming %d cw_max %d "
+                    "aifs %d txop %d", ac, cw_min, cw_max, aifsn, txop);
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->ac = ac;
+       acx->cw_min = cw_min;
+       acx->cw_max = cpu_to_le16(cw_max);
+       acx->aifsn = aifsn;
+       acx->tx_op_limit = cpu_to_le16(txop);
+
+       ret = wl1271_cmd_configure(wl, ACX_AC_CFG, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("acx ac cfg failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,
+                      u8 tsid, u8 ps_scheme, u8 ack_policy,
+                      u32 apsd_conf0, u32 apsd_conf1)
+{
+       struct acx_tid_config *acx;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx tid config");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->queue_id = queue_id;
+       acx->channel_type = channel_type;
+       acx->tsid = tsid;
+       acx->ps_scheme = ps_scheme;
+       acx->ack_policy = ack_policy;
+       acx->apsd_conf[0] = cpu_to_le32(apsd_conf0);
+       acx->apsd_conf[1] = cpu_to_le32(apsd_conf1);
+
+       ret = wl1271_cmd_configure(wl, ACX_TID_CFG, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("Setting of tid config failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_frag_threshold(struct wl1271 *wl, u32 frag_threshold)
+{
+       struct acx_frag_threshold *acx;
+       int ret = 0;
+
+       /*
+        * If the fragmentation is not configured or out of range, use the
+        * default value.
+        */
+       if (frag_threshold > IEEE80211_MAX_FRAG_THRESHOLD)
+               frag_threshold = wl->conf.tx.frag_threshold;
+
+       wl1271_debug(DEBUG_ACX, "acx frag threshold: %d", frag_threshold);
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->frag_threshold = cpu_to_le16((u16)frag_threshold);
+       ret = wl1271_cmd_configure(wl, ACX_FRAG_CFG, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("Setting of frag threshold failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_tx_config_options(struct wl1271 *wl)
+{
+       struct acx_tx_config_options *acx;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx tx config options");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->tx_compl_timeout = cpu_to_le16(wl->conf.tx.tx_compl_timeout);
+       acx->tx_compl_threshold = cpu_to_le16(wl->conf.tx.tx_compl_threshold);
+       ret = wl1271_cmd_configure(wl, ACX_TX_CONFIG_OPT, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("Setting of tx options failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       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;
 
-       wl12xx_debug(DEBUG_ACX, "acx beacon filter opt");
+       wl1271_debug(DEBUG_ACX, "wl1271 mem cfg");
 
-       beacon_filter.header.id = ACX_BEACON_FILTER_OPT;
-       beacon_filter.header.len = sizeof(beacon_filter) -
-               sizeof(struct acx_header);
+       mem_conf = kzalloc(sizeof(*mem_conf), GFP_KERNEL);
+       if (!mem_conf) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       beacon_filter.enable = 0;
-       beacon_filter.max_num_beacons = 0;
+       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;
+}
 
-       ret = wl12xx_cmd_configure(wl, &beacon_filter, sizeof(beacon_filter));
+int wl1271_acx_sta_mem_cfg(struct wl1271 *wl)
+{
+       struct wl1271_acx_sta_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)
+               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);
+       mem_conf->dyn_mem_enable = mem->dynamic_memory;
+       mem_conf->tx_free_req = mem->min_req_tx_blocks;
+       mem_conf->rx_free_req = mem->min_req_rx_blocks;
+       mem_conf->tx_min = mem->tx_min;
+       mem_conf->fwlog_blocks = wl->conf.fwlog.mem_blocks;
+
+       ret = wl1271_cmd_configure(wl, ACX_MEM_CFG, mem_conf,
+                                  sizeof(*mem_conf));
        if (ret < 0) {
-               wl12xx_warning("failed to set beacon filter opt: %d", ret);
-               return ret;
+               wl1271_warning("wl1271 mem config failed: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(mem_conf);
+       return ret;
 }
 
-int wl12xx_acx_beacon_filter_table(struct wl12xx *wl)
+int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap)
 {
-       struct acx_beacon_filter_ie_table ie_table;
+       struct wl1271_acx_host_config_bitmap *bitmap_conf;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx beacon filter table");
+       bitmap_conf = kzalloc(sizeof(*bitmap_conf), GFP_KERNEL);
+       if (!bitmap_conf) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       ie_table.header.id = ACX_BEACON_FILTER_TABLE;
-       ie_table.header.len = sizeof(ie_table) - sizeof(struct acx_header);
+       bitmap_conf->host_cfg_bitmap = cpu_to_le32(host_cfg_bitmap);
 
-       ie_table.num_ie = 0;
-       memset(ie_table.table, 0, BEACON_FILTER_TABLE_MAX_SIZE);
+       ret = wl1271_cmd_configure(wl, ACX_HOST_IF_CFG_BITMAP,
+                                  bitmap_conf, sizeof(*bitmap_conf));
+       if (ret < 0) {
+               wl1271_warning("wl1271 bitmap config opt failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(bitmap_conf);
 
-       ret = wl12xx_cmd_configure(wl, &ie_table, sizeof(ie_table));
+       return ret;
+}
+
+int wl1271_acx_init_mem_config(struct wl1271 *wl)
+{
+       int ret;
+
+       wl->target_mem_map = kzalloc(sizeof(struct wl1271_acx_mem_map),
+                                    GFP_KERNEL);
+       if (!wl->target_mem_map) {
+               wl1271_error("couldn't allocate target memory map");
+               return -ENOMEM;
+       }
+
+       /* we now ask for the firmware built memory map */
+       ret = wl1271_acx_mem_map(wl, (void *)wl->target_mem_map,
+                                sizeof(struct wl1271_acx_mem_map));
        if (ret < 0) {
-               wl12xx_warning("failed to set beacon filter table: %d", ret);
+               wl1271_error("couldn't retrieve firmware memory map");
+               kfree(wl->target_mem_map);
+               wl->target_mem_map = NULL;
                return ret;
        }
 
+       /* initialize TX block book keeping */
+       wl->tx_blocks_available =
+               le32_to_cpu(wl->target_mem_map->num_tx_mem_blocks);
+       wl1271_debug(DEBUG_TX, "available tx blocks: %d",
+                    wl->tx_blocks_available);
+
        return 0;
 }
 
-int wl12xx_acx_sg_enable(struct wl12xx *wl)
+int wl1271_acx_init_rx_interrupt(struct wl1271 *wl)
 {
-       struct acx_bt_wlan_coex pta;
+       struct wl1271_acx_rx_config_opt *rx_conf;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx sg enable");
+       wl1271_debug(DEBUG_ACX, "wl1271 rx interrupt config");
 
-       pta.header.id = ACX_SG_ENABLE;
-       pta.header.len = sizeof(pta) - sizeof(struct acx_header);
+       rx_conf = kzalloc(sizeof(*rx_conf), GFP_KERNEL);
+       if (!rx_conf) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       pta.enable = SG_ENABLE;
+       rx_conf->threshold = cpu_to_le16(wl->conf.rx.irq_pkt_threshold);
+       rx_conf->timeout = cpu_to_le16(wl->conf.rx.irq_timeout);
+       rx_conf->mblk_threshold = cpu_to_le16(wl->conf.rx.irq_blk_threshold);
+       rx_conf->queue_type = wl->conf.rx.queue_type;
 
-       ret = wl12xx_cmd_configure(wl, &pta, sizeof(pta));
+       ret = wl1271_cmd_configure(wl, ACX_RX_CONFIG_OPT, rx_conf,
+                                  sizeof(*rx_conf));
        if (ret < 0) {
-               wl12xx_warning("failed to set softgemini enable: %d", ret);
-               return ret;
+               wl1271_warning("wl1271 rx config opt failed: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(rx_conf);
+       return ret;
+}
+
+int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable)
+{
+       struct wl1271_acx_bet_enable *acx = NULL;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx bet enable");
+
+       if (enable && wl->conf.conn.bet_enable == CONF_BET_MODE_DISABLE)
+               goto out;
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->enable = enable ? CONF_BET_MODE_ENABLE : CONF_BET_MODE_DISABLE;
+       acx->max_consecutive = wl->conf.conn.bet_max_consecutive;
+
+       ret = wl1271_cmd_configure(wl, ACX_BET_ENABLE, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("acx bet enable failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_sg_cfg(struct wl12xx *wl)
+int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address)
 {
-       struct acx_bt_wlan_coex_param param;
+       struct wl1271_acx_arp_filter *acx;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx sg cfg");
+       wl1271_debug(DEBUG_ACX, "acx arp ip filter, enable: %d", enable);
 
-       /* BT-WLAN coext parameters */
-       param.header.id = ACX_SG_CFG;
-       param.header.len = sizeof(param) - sizeof(struct acx_header);
-
-       param.min_rate = RATE_INDEX_24MBPS;
-       param.bt_hp_max_time = PTA_BT_HP_MAXTIME_DEF;
-       param.wlan_hp_max_time = PTA_WLAN_HP_MAX_TIME_DEF;
-       param.sense_disable_timer = PTA_SENSE_DISABLE_TIMER_DEF;
-       param.rx_time_bt_hp = PTA_PROTECTIVE_RX_TIME_DEF;
-       param.tx_time_bt_hp = PTA_PROTECTIVE_TX_TIME_DEF;
-       param.rx_time_bt_hp_fast = PTA_PROTECTIVE_RX_TIME_FAST_DEF;
-       param.tx_time_bt_hp_fast = PTA_PROTECTIVE_TX_TIME_FAST_DEF;
-       param.wlan_cycle_fast = PTA_CYCLE_TIME_FAST_DEF;
-       param.bt_anti_starvation_period = PTA_ANTI_STARVE_PERIOD_DEF;
-       param.next_bt_lp_packet = PTA_TIMEOUT_NEXT_BT_LP_PACKET_DEF;
-       param.wake_up_beacon = PTA_TIME_BEFORE_BEACON_DEF;
-       param.hp_dm_max_guard_time = PTA_HPDM_MAX_TIME_DEF;
-       param.next_wlan_packet = PTA_TIME_OUT_NEXT_WLAN_DEF;
-       param.antenna_type = PTA_ANTENNA_TYPE_DEF;
-       param.signal_type = PTA_SIGNALING_TYPE_DEF;
-       param.afh_leverage_on = PTA_AFH_LEVERAGE_ON_DEF;
-       param.quiet_cycle_num = PTA_NUMBER_QUIET_CYCLE_DEF;
-       param.max_cts = PTA_MAX_NUM_CTS_DEF;
-       param.wlan_packets_num = PTA_NUMBER_OF_WLAN_PACKETS_DEF;
-       param.bt_packets_num = PTA_NUMBER_OF_BT_PACKETS_DEF;
-       param.missed_rx_avalanche = PTA_RX_FOR_AVALANCHE_DEF;
-       param.wlan_elp_hp = PTA_ELP_HP_DEF;
-       param.bt_anti_starvation_cycles = PTA_ANTI_STARVE_NUM_CYCLE_DEF;
-       param.ack_mode_dual_ant = PTA_ACK_MODE_DEF;
-       param.pa_sd_enable = PTA_ALLOW_PA_SD_DEF;
-       param.pta_auto_mode_enable = PTA_AUTO_MODE_NO_CTS_DEF;
-       param.bt_hp_respected_num = PTA_BT_HP_RESPECTED_DEF;
-
-       ret = wl12xx_cmd_configure(wl, &param, sizeof(param));
-       if (ret < 0) {
-               wl12xx_warning("failed to set sg config: %d", ret);
-               return ret;
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
        }
 
-       return 0;
+       acx->version = ACX_IPV4_VERSION;
+       acx->enable = enable;
+
+       if (enable)
+               memcpy(acx->address, &address, ACX_IPV4_ADDR_SIZE);
+
+       ret = wl1271_cmd_configure(wl, ACX_ARP_IP_FILTER,
+                                  acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("failed to set arp ip filter: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_pm_config(struct wl1271 *wl)
+{
+       struct wl1271_acx_pm_config *acx = NULL;
+       struct  conf_pm_config_settings *c = &wl->conf.pm_config;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx pm config");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->host_clk_settling_time = cpu_to_le32(c->host_clk_settling_time);
+       acx->host_fast_wakeup_support = c->host_fast_wakeup_support;
+
+       ret = wl1271_cmd_configure(wl, ACX_PM_CONFIG, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("acx pm config failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable)
+{
+       struct wl1271_acx_keep_alive_mode *acx = NULL;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx keep alive mode: %d", enable);
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->enabled = enable;
+
+       ret = wl1271_cmd_configure(wl, ACX_KEEP_ALIVE_MODE, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("acx keep alive mode failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid)
+{
+       struct wl1271_acx_keep_alive_config *acx = NULL;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx keep alive config");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->period = cpu_to_le32(wl->conf.conn.keep_alive_interval);
+       acx->index = index;
+       acx->tpl_validation = tpl_valid;
+       acx->trigger = ACX_KEEP_ALIVE_NO_TX;
+
+       ret = wl1271_cmd_configure(wl, ACX_SET_KEEP_ALIVE_CONFIG,
+                                  acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("acx keep alive config failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable,
+                               s16 thold, u8 hyst)
+{
+       struct wl1271_acx_rssi_snr_trigger *acx = NULL;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx rssi snr trigger");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       wl->last_rssi_event = -1;
+
+       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;
+       if (enable)
+               acx->enable = WL1271_ACX_TRIG_ENABLE;
+       else
+               acx->enable = WL1271_ACX_TRIG_DISABLE;
+
+       acx->index = WL1271_ACX_TRIG_IDX_RSSI;
+       acx->dir = WL1271_ACX_TRIG_DIR_BIDIR;
+       acx->threshold = cpu_to_le16(thold);
+       acx->hysteresis = hyst;
+
+       ret = wl1271_cmd_configure(wl, ACX_RSSI_SNR_TRIGGER, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("acx rssi snr trigger setting failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl)
+{
+       struct wl1271_acx_rssi_snr_avg_weights *acx = NULL;
+       struct conf_roam_trigger_settings *c = &wl->conf.roam_trigger;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx rssi snr avg weights");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->rssi_beacon = c->avg_weight_rssi_beacon;
+       acx->rssi_data = c->avg_weight_rssi_data;
+       acx->snr_beacon = c->avg_weight_snr_beacon;
+       acx->snr_data = c->avg_weight_snr_data;
+
+       ret = wl1271_cmd_configure(wl, ACX_RSSI_SNR_WEIGHTS, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("acx rssi snr trigger weights failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_set_ht_capabilities(struct wl1271 *wl,
+                                   struct ieee80211_sta_ht_cap *ht_cap,
+                                   bool allow_ht_operation)
+{
+       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");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               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;
+
+               /* 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->ht_capabilites = cpu_to_le32(ht_capabilites);
+
+       ret = wl1271_cmd_configure(wl, ACX_PEER_HT_CAP, acx, sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("acx ht capabilities setting failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_set_ht_information(struct wl1271 *wl,
+                                  u16 ht_operation_mode)
+{
+       struct wl1271_acx_ht_information *acx;
+       int ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx ht information setting");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       acx->ht_protection =
+               (u8)(ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION);
+       acx->rifs_mode = 0;
+       acx->gf_protection =
+               !!(ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
+       acx->ht_tx_burst_limit = 0;
+       acx->dual_cts_protection = 0;
+
+       ret = wl1271_cmd_configure(wl, ACX_HT_BSS_OPERATION, acx, sizeof(*acx));
+
+       if (ret < 0) {
+               wl1271_warning("acx ht information setting failed: %d", ret);
+               goto out;
+       }
+
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_cca_threshold(struct wl12xx *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)
 {
-       struct acx_energy_detection detection;
+       struct wl1271_acx_ba_session_policy *acx;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx cca threshold");
+       wl1271_debug(DEBUG_ACX, "acx ba session setting");
 
-       detection.header.id = ACX_CCA_THRESHOLD;
-       detection.header.len = sizeof(detection) - sizeof(struct acx_header);
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       detection.rx_cca_threshold = CCA_THRSH_DISABLE_ENERGY_D;
-       detection.tx_energy_detection = 0;
+       /* ANY role */
+       acx->role_id = 0xff;
+       acx->tid = tid_index;
+       acx->enable = policy;
+       acx->ba_direction = direction;
+
+       switch (direction) {
+       case WLAN_BACK_INITIATOR:
+               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 = wl12xx_cmd_configure(wl, &detection, sizeof(detection));
+       ret = wl1271_cmd_configure(wl,
+                                  ACX_BA_SESSION_POLICY_CFG,
+                                  acx,
+                                  sizeof(*acx));
        if (ret < 0) {
-               wl12xx_warning("failed to set cca threshold: %d", ret);
-               return ret;
+               wl1271_warning("acx ba session setting failed: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_bcn_dtim_options(struct wl12xx *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)
 {
-       struct acx_beacon_broadcast bb;
+       struct wl1271_acx_ba_receiver_setup *acx;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx bcn dtim options");
+       wl1271_debug(DEBUG_ACX, "acx ba receiver session setting");
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       /* Single link for now */
+       acx->link_id = 1;
+       acx->tid = tid_index;
+       acx->enable = enable;
+       acx->win_size = 0;
+       acx->ssn = ssn;
 
-       bb.header.id = ACX_BCN_DTIM_OPTIONS;
-       bb.header.len = sizeof(bb) - sizeof(struct acx_header);
+       ret = wl1271_cmd_configure(wl, ACX_BA_SESSION_RX_SETUP, acx,
+                                  sizeof(*acx));
+       if (ret < 0) {
+               wl1271_warning("acx ba receiver session failed: %d", ret);
+               goto out;
+       }
 
-       bb.beacon_rx_timeout = BCN_RX_TIMEOUT_DEF_VALUE;
-       bb.broadcast_timeout = BROADCAST_RX_TIMEOUT_DEF_VALUE;
-       bb.rx_broadcast_in_ps = RX_BROADCAST_IN_PS_DEF_VALUE;
-       bb.ps_poll_threshold = CONSECUTIVE_PS_POLL_FAILURE_DEF;
+out:
+       kfree(acx);
+       return ret;
+}
+
+int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime)
+{
+       struct wl1271_acx_fw_tsf_information *tsf_info;
+       int ret;
 
-       ret = wl12xx_cmd_configure(wl, &bb, sizeof(bb));
+       tsf_info = kzalloc(sizeof(*tsf_info), GFP_KERNEL);
+       if (!tsf_info) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       ret = wl1271_cmd_interrogate(wl, ACX_TSF_INFO,
+                                    tsf_info, sizeof(*tsf_info));
        if (ret < 0) {
-               wl12xx_warning("failed to set rx config: %d", ret);
-               return ret;
+               wl1271_warning("acx tsf info interrogate failed");
+               goto out;
        }
 
-       return 0;
+       *mactime = le32_to_cpu(tsf_info->current_tsf_low) |
+               ((u64) le32_to_cpu(tsf_info->current_tsf_high) << 32);
+
+out:
+       kfree(tsf_info);
+       return ret;
 }
 
-int wl12xx_acx_aid(struct wl12xx *wl, u16 aid)
+int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable)
 {
-       struct acx_aid acx_aid;
+       struct wl1271_acx_ps_rx_streaming *rx_streaming;
+       u32 conf_queues, enable_queues;
+       int i, ret = 0;
+
+       wl1271_debug(DEBUG_ACX, "acx ps rx streaming");
+
+       rx_streaming = kzalloc(sizeof(*rx_streaming), GFP_KERNEL);
+       if (!rx_streaming) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       conf_queues = wl->conf.rx_streaming.queues;
+       if (enable)
+               enable_queues = conf_queues;
+       else
+               enable_queues = 0;
+
+       for (i = 0; i < 8; i++) {
+               /*
+                * Skip non-changed queues, to avoid redundant acxs.
+                * this check assumes conf.rx_streaming.queues can't
+                * be changed while rx_streaming is enabled.
+                */
+               if (!(conf_queues & BIT(i)))
+                       continue;
+
+               rx_streaming->tid = i;
+               rx_streaming->enable = enable_queues & BIT(i);
+               rx_streaming->period = wl->conf.rx_streaming.interval;
+               rx_streaming->timeout = wl->conf.rx_streaming.interval;
+
+               ret = wl1271_cmd_configure(wl, ACX_PS_RX_STREAMING,
+                                          rx_streaming,
+                                          sizeof(*rx_streaming));
+               if (ret < 0) {
+                       wl1271_warning("acx ps rx streaming failed: %d", ret);
+                       goto out;
+               }
+       }
+out:
+       kfree(rx_streaming);
+       return ret;
+}
+
+int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl)
+{
+       struct wl1271_acx_ap_max_tx_retry *acx = NULL;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx aid");
+       wl1271_debug(DEBUG_ACX, "acx ap max tx retry");
 
-       acx_aid.header.id = ACX_AID;
-       acx_aid.header.len = sizeof(acx_aid) - sizeof(struct acx_header);
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx)
+               return -ENOMEM;
 
-       acx_aid.aid = aid;
+       acx->max_tx_retry = cpu_to_le16(wl->conf.tx.max_tx_retries);
 
-       ret = wl12xx_cmd_configure(wl, &acx_aid, sizeof(acx_aid));
+       ret = wl1271_cmd_configure(wl, ACX_MAX_TX_FAILURE, acx, sizeof(*acx));
        if (ret < 0) {
-               wl12xx_warning("failed to set aid: %d", ret);
-               return ret;
+               wl1271_warning("acx ap max tx retry failed: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_event_mbox_mask(struct wl12xx *wl, u32 event_mask)
+int wl1271_acx_config_ps(struct wl1271 *wl)
 {
-       struct acx_event_mask mask;
+       struct wl1271_acx_config_ps *config_ps;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx event mbox mask");
+       wl1271_debug(DEBUG_ACX, "acx config ps");
 
-       mask.header.id = ACX_EVENT_MBOX_MASK;
-       mask.header.len = sizeof(mask) - sizeof(struct acx_header);
+       config_ps = kzalloc(sizeof(*config_ps), GFP_KERNEL);
+       if (!config_ps) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
-       /* high event mask is unused */
-       mask.high_event_mask = 0xffffffff;
+       config_ps->exit_retries = wl->conf.conn.psm_exit_retries;
+       config_ps->enter_retries = wl->conf.conn.psm_entry_retries;
+       config_ps->null_data_rate = cpu_to_le32(wl->basic_rate);
 
-       mask.event_mask = event_mask;
+       ret = wl1271_cmd_configure(wl, ACX_CONFIG_PS, config_ps,
+                                  sizeof(*config_ps));
 
-       ret = wl12xx_cmd_configure(wl, &mask, sizeof(mask));
        if (ret < 0) {
-               wl12xx_warning("failed to set aid: %d", ret);
-               return ret;
+               wl1271_warning("acx config ps failed: %d", ret);
+               goto out;
        }
 
-       return 0;
+out:
+       kfree(config_ps);
+       return ret;
 }
 
-int wl12xx_acx_set_preamble(struct wl12xx *wl, enum acx_preamble_type preamble)
+int wl1271_acx_set_inconnection_sta(struct wl1271 *wl, u8 *addr)
 {
-       struct acx_preamble ie;
+       struct wl1271_acx_inconnection_sta *acx = NULL;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx_set_preamble");
+       wl1271_debug(DEBUG_ACX, "acx set inconnaction sta %pM", addr);
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx)
+               return -ENOMEM;
 
-       memset(&ie, 0, sizeof(ie));
+       memcpy(acx->addr, addr, ETH_ALEN);
 
-       ie.header.id = ACX_PREAMBLE_TYPE;
-       ie.header.len = sizeof(ie) - sizeof(struct acx_header);
-       ie.preamble = preamble;
-       ret = wl12xx_cmd_configure(wl, &ie, sizeof(ie));
+       ret = wl1271_cmd_configure(wl, ACX_UPDATE_INCONNECTION_STA_LIST,
+                                  acx, sizeof(*acx));
        if (ret < 0) {
-               wl12xx_warning("Setting of preamble failed: %d", ret);
-               return ret;
+               wl1271_warning("acx set inconnaction sta failed: %d", ret);
+               goto out;
        }
-       return 0;
+
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_cts_protect(struct wl12xx *wl,
-                          enum acx_ctsprotect_type ctsprotect)
+int wl1271_acx_set_ap_beacon_filter(struct wl1271 *wl, bool enable)
 {
-       struct acx_ctsprotect ie;
+       struct acx_ap_beacon_filter *acx = NULL;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx_set_ctsprotect");
+       wl1271_debug(DEBUG_ACX, "acx set ap beacon filter: %d", enable);
+
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx)
+               return -ENOMEM;
 
-       memset(&ie, 0, sizeof(ie));
+       acx->enable = enable ? 1 : 0;
 
-       ie.header.id = ACX_CTS_PROTECTION;
-       ie.header.len = sizeof(ie) - sizeof(struct acx_header);
-       ie.ctsprotect = ctsprotect;
-       ret = wl12xx_cmd_configure(wl, &ie, sizeof(ie));
+       ret = wl1271_cmd_configure(wl, ACX_AP_BEACON_FILTER_OPT,
+                                  acx, sizeof(*acx));
        if (ret < 0) {
-               wl12xx_warning("Setting of ctsprotect failed: %d", ret);
-               return ret;
+               wl1271_warning("acx set ap beacon filter failed: %d", ret);
+               goto out;
        }
-       return 0;
+
+out:
+       kfree(acx);
+       return ret;
 }
 
-int wl12xx_acx_statistics(struct wl12xx *wl, struct acx_statistics *stats)
+int wl1271_acx_fm_coex(struct wl1271 *wl)
 {
-       struct wl12xx_command *answer;
+       struct wl1271_acx_fm_coex *acx;
        int ret;
 
-       wl12xx_debug(DEBUG_ACX, "acx statistics");
+       wl1271_debug(DEBUG_ACX, "acx fm coex setting");
 
-       answer = kmalloc(sizeof(*answer), GFP_KERNEL);
-       if (!answer) {
-               wl12xx_warning("could not allocate memory for acx statistics");
+       acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+       if (!acx) {
                ret = -ENOMEM;
                goto out;
        }
 
-       ret = wl12xx_cmd_interrogate(wl, ACX_STATISTICS, sizeof(*answer),
-                                    answer);
+       acx->enable = wl->conf.fm_coex.enable;
+       acx->swallow_period = wl->conf.fm_coex.swallow_period;
+       acx->n_divider_fref_set_1 = wl->conf.fm_coex.n_divider_fref_set_1;
+       acx->n_divider_fref_set_2 = wl->conf.fm_coex.n_divider_fref_set_2;
+       acx->m_divider_fref_set_1 =
+               cpu_to_le16(wl->conf.fm_coex.m_divider_fref_set_1);
+       acx->m_divider_fref_set_2 =
+               cpu_to_le16(wl->conf.fm_coex.m_divider_fref_set_2);
+       acx->coex_pll_stabilization_time =
+               cpu_to_le32(wl->conf.fm_coex.coex_pll_stabilization_time);
+       acx->ldo_stabilization_time =
+               cpu_to_le16(wl->conf.fm_coex.ldo_stabilization_time);
+       acx->fm_disturbed_band_margin =
+               wl->conf.fm_coex.fm_disturbed_band_margin;
+       acx->swallow_clk_diff = wl->conf.fm_coex.swallow_clk_diff;
+
+       ret = wl1271_cmd_configure(wl, ACX_FM_COEX_CFG, acx, sizeof(*acx));
        if (ret < 0) {
-               wl12xx_warning("acx statistics failed: %d", ret);
+               wl1271_warning("acx fm coex setting failed: %d", ret);
                goto out;
        }
 
-       memcpy(stats, answer->parameters, sizeof(*stats));
-
 out:
-       kfree(answer);
+       kfree(acx);
        return ret;
 }