wl12xx: use 2 spare TX blocks for GEM cipher

Add tx_spare_blocks member to the wl1271 struct
for more generic configuration of the amount
of spare TX blocks that should be used.
The default value is 1.
In case GEM cipher is used by the STA, we need
2 spare TX blocks instead of just 1.

Signed-off-by: Guy Eilam <guy@wizery.com>
Acked-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

4 files changed, 22 insertions, 3 deletions

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 82f4408e89ad..20e7bc78a7fe 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2064,6 +2064,7 @@ deinit:
         wl->session_counter = 0;
         wl->rate_set = CONF_TX_RATE_MASK_BASIC;
         wl->vif = NULL;
+        wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
         wl1271_free_ap_keys(wl);
         memset(wl->ap_hlid_map, 0, sizeof(wl->ap_hlid_map));
         wl->ap_fw_ps_map = 0;
@@ -2653,6 +2654,17 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
                         0xff, 0xff, 0xff, 0xff, 0xff, 0xff
                 };
 
+                /*
+                 * A STA set to GEM cipher requires 2 tx spare blocks.
+                 * Return to default value when GEM cipher key is removed
+                 */
+                if (key_type == KEY_GEM) {
+                        if (action == KEY_ADD_OR_REPLACE)
+                                wl->tx_spare_blocks = 2;
+                        else if (action == KEY_REMOVE)
+                                wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
+                }
+
                 addr = sta ? sta->addr : bcast_addr;
 
                 if (is_zero_ether_addr(addr)) {
@@ -4599,6 +4611,7 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
         wl->sched_scanning = false;
         wl->tx_security_seq = 0;
         wl->tx_security_last_seq_lsb = 0;
+        wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
         wl->role_id = WL12XX_INVALID_ROLE_ID;
         wl->system_hlid = WL12XX_SYSTEM_HLID;
         wl->sta_hlid = WL12XX_INVALID_LINK_ID;
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index 0f1578577b1a..08227e69616b 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -204,9 +204,7 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,
         u32 len;
         u32 total_blocks;
         int id, ret = -EBUSY, ac;
-
-        /* we use 1 spare block */
-        u32 spare_blocks = 1;
+        u32 spare_blocks = wl->tx_spare_blocks;
 
         if (buf_offset + total_len > WL1271_AGGR_BUFFER_SIZE)
                 return -EAGAIN;
@@ -220,6 +218,10 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,
            in the firmware */
         len = wl12xx_calc_packet_alignment(wl, total_len);
 
+        /* in case of a dummy packet, use default amount of spare mem blocks */
+        if (unlikely(wl12xx_is_dummy_packet(wl, skb)))
+                spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
+
         total_blocks = (len + TX_HW_BLOCK_SIZE - 1) / TX_HW_BLOCK_SIZE +
                 spare_blocks;
 
diff --git a/drivers/net/wireless/wl12xx/tx.h b/drivers/net/wireless/wl12xx/tx.h
index 7da35c0e411b..6519be4b2c38 100644
--- a/drivers/net/wireless/wl12xx/tx.h
+++ b/drivers/net/wireless/wl12xx/tx.h
@@ -25,6 +25,7 @@
 #ifndef __TX_H__
 #define __TX_H__
 
+#define TX_HW_BLOCK_SPARE_DEFAULT        1
 #define TX_HW_BLOCK_SIZE                 252
 
 #define TX_HW_MGMT_PKT_LIFETIME_TU       2000
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 61a7c2163ea2..fb2753c46300 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -425,6 +425,9 @@ struct wl1271 {
         u32 tx_allocated_blocks;
         u32 tx_results_count;
 
+        /* amount of spare TX blocks to use */
+        u32 tx_spare_blocks;
+
         /* Accounting for allocated / available Tx packets in HW */
         u32 tx_pkts_freed[NUM_TX_QUEUES];
         u32 tx_allocated_pkts[NUM_TX_QUEUES];