2 files changed, 118 insertions, 2 deletions

diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index be7129ba16ad..d50dfac91631 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -1378,7 +1378,7 @@ static u32 wl12xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data,
 
 static int wl12xx_tx_delayed_compl(struct wl1271 *wl)
 {
-        if (wl->fw_status_1->tx_results_counter ==
+        if (wl->fw_status->tx_results_counter ==
             (wl->tx_results_count & 0xff))
                 return 0;
 
@@ -1438,6 +1438,37 @@ out:
         return ret;
 }
 
+static void wl12xx_convert_fw_status(struct wl1271 *wl, void *raw_fw_status,
+                                     struct wl_fw_status *fw_status)
+{
+        struct wl12xx_fw_status *int_fw_status = raw_fw_status;
+
+        fw_status->intr = le32_to_cpu(int_fw_status->intr);
+        fw_status->fw_rx_counter = int_fw_status->fw_rx_counter;
+        fw_status->drv_rx_counter = int_fw_status->drv_rx_counter;
+        fw_status->tx_results_counter = int_fw_status->tx_results_counter;
+        fw_status->rx_pkt_descs = int_fw_status->rx_pkt_descs;
+
+        fw_status->fw_localtime = le32_to_cpu(int_fw_status->fw_localtime);
+        fw_status->link_ps_bitmap = le32_to_cpu(int_fw_status->link_ps_bitmap);
+        fw_status->link_fast_bitmap =
+                        le32_to_cpu(int_fw_status->link_fast_bitmap);
+        fw_status->total_released_blks =
+                        le32_to_cpu(int_fw_status->total_released_blks);
+        fw_status->tx_total = le32_to_cpu(int_fw_status->tx_total);
+
+        fw_status->counters.tx_released_pkts =
+                        int_fw_status->counters.tx_released_pkts;
+        fw_status->counters.tx_lnk_free_pkts =
+                        int_fw_status->counters.tx_lnk_free_pkts;
+        fw_status->counters.tx_voice_released_blks =
+                        int_fw_status->counters.tx_voice_released_blks;
+        fw_status->counters.tx_last_rate =
+                        int_fw_status->counters.tx_last_rate;
+
+        fw_status->log_start_addr = le32_to_cpu(int_fw_status->log_start_addr);
+}
+
 static u32 wl12xx_sta_get_ap_rate_mask(struct wl1271 *wl,
                                        struct wl12xx_vif *wlvif)
 {
@@ -1677,6 +1708,7 @@ static struct wlcore_ops wl12xx_ops = {
         .tx_delayed_compl       = wl12xx_tx_delayed_compl,
         .hw_init                = wl12xx_hw_init,
         .init_vif               = NULL,
+        .convert_fw_status      = wl12xx_convert_fw_status,
         .sta_get_ap_rate_mask   = wl12xx_sta_get_ap_rate_mask,
         .get_pg_ver             = wl12xx_get_pg_ver,
         .get_mac                = wl12xx_get_mac,
@@ -1711,22 +1743,53 @@ static struct ieee80211_sta_ht_cap wl12xx_ht_cap = {
                 },
 };
 
+static const struct ieee80211_iface_limit wl12xx_iface_limits[] = {
+        {
+                .max = 3,
+                .types = BIT(NL80211_IFTYPE_STATION),
+        },
+        {
+                .max = 1,
+                .types = BIT(NL80211_IFTYPE_AP) |
+                         BIT(NL80211_IFTYPE_P2P_GO) |
+                         BIT(NL80211_IFTYPE_P2P_CLIENT),
+        },
+};
+
+static const struct ieee80211_iface_combination
+wl12xx_iface_combinations[] = {
+        {
+                .max_interfaces = 3,
+                .limits = wl12xx_iface_limits,
+                .n_limits = ARRAY_SIZE(wl12xx_iface_limits),
+                .num_different_channels = 1,
+        },
+};
+
 static int wl12xx_setup(struct wl1271 *wl)
 {
         struct wl12xx_priv *priv = wl->priv;
         struct wlcore_platdev_data *pdev_data = dev_get_platdata(&wl->pdev->dev);
         struct wl12xx_platform_data *pdata = pdev_data->pdata;
 
+        BUILD_BUG_ON(WL12XX_MAX_LINKS > WLCORE_MAX_LINKS);
+        BUILD_BUG_ON(WL12XX_MAX_AP_STATIONS > WL12XX_MAX_LINKS);
+
         wl->rtable = wl12xx_rtable;
         wl->num_tx_desc = WL12XX_NUM_TX_DESCRIPTORS;
         wl->num_rx_desc = WL12XX_NUM_RX_DESCRIPTORS;
-        wl->num_channels = 1;
+        wl->num_links = WL12XX_MAX_LINKS;
+        wl->max_ap_stations = WL12XX_MAX_AP_STATIONS;
+        wl->iface_combinations = wl12xx_iface_combinations;
+        wl->n_iface_combinations = ARRAY_SIZE(wl12xx_iface_combinations);
         wl->num_mac_addr = WL12XX_NUM_MAC_ADDRESSES;
         wl->band_rate_to_idx = wl12xx_band_rate_to_idx;
         wl->hw_tx_rate_tbl_size = WL12XX_CONF_HW_RXTX_RATE_MAX;
         wl->hw_min_ht_rate = WL12XX_CONF_HW_RXTX_RATE_MCS0;
+        wl->fw_status_len = sizeof(struct wl12xx_fw_status);
         wl->fw_status_priv_len = 0;
         wl->stats.fw_stats_len = sizeof(struct wl12xx_acx_statistics);
+        wl->ofdm_only_ap = true;
         wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, &wl12xx_ht_cap);
         wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, &wl12xx_ht_cap);
         wl12xx_conf_init(wl);
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h
index 9e5484a73667..75c92658bfea 100644
--- a/drivers/net/wireless/ti/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h
@@ -65,6 +65,9 @@
 
 #define WL12XX_RX_BA_MAX_SESSIONS 3
 
+#define WL12XX_MAX_AP_STATIONS 8
+#define WL12XX_MAX_LINKS 12
+
 struct wl127x_rx_mem_pool_addr {
         u32 addr;
         u32 addr_extra;
@@ -79,4 +82,54 @@ struct wl12xx_priv {
         struct wl127x_rx_mem_pool_addr *rx_mem_addr;
 };
 
+struct wl12xx_fw_packet_counters {
+        /* Cumulative counter of released packets per AC */
+        u8 tx_released_pkts[NUM_TX_QUEUES];
+
+        /* Cumulative counter of freed packets per HLID */
+        u8 tx_lnk_free_pkts[WL12XX_MAX_LINKS];
+
+        /* Cumulative counter of released Voice memory blocks */
+        u8 tx_voice_released_blks;
+
+        /* Tx rate of the last transmitted packet */
+        u8 tx_last_rate;
+
+        u8 padding[2];
+} __packed;
+
+/* FW status registers */
+struct wl12xx_fw_status {
+        __le32 intr;
+        u8  fw_rx_counter;
+        u8  drv_rx_counter;
+        u8  reserved;
+        u8  tx_results_counter;
+        __le32 rx_pkt_descs[WL12XX_NUM_RX_DESCRIPTORS];
+
+        __le32 fw_localtime;
+
+        /*
+         * A bitmap (where each bit represents a single HLID)
+         * to indicate if the station is in PS mode.
+         */
+        __le32 link_ps_bitmap;
+
+        /*
+         * A bitmap (where each bit represents a single HLID) to indicate
+         * if the station is in Fast mode
+         */
+        __le32 link_fast_bitmap;
+
+        /* Cumulative counter of total released mem blocks since FW-reset */
+        __le32 total_released_blks;
+
+        /* Size (in Memory Blocks) of TX pool */
+        __le32 tx_total;
+
+        struct wl12xx_fw_packet_counters counters;
+
+        __le32 log_start_addr;
+} __packed;
+
 #endif /* __WL12XX_PRIV_H__ */