1 files changed, 34 insertions, 26 deletions

diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index c47c92165aba..f45eb29c2ede 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -65,18 +65,30 @@
  ***************************************************/
 static int iwl_queue_space(const struct iwl_queue *q)
 {
-        int s = q->read_ptr - q->write_ptr;
-
-        if (q->read_ptr > q->write_ptr)
-                s -= q->n_bd;
-
-        if (s <= 0)
-                s += q->n_window;
-        /* keep some reserve to not confuse empty and full situations */
-        s -= 2;
-        if (s < 0)
-                s = 0;
-        return s;
+        unsigned int max;
+        unsigned int used;
+
+        /*
+         * To avoid ambiguity between empty and completely full queues, there
+         * should always be less than q->n_bd elements in the queue.
+         * If q->n_window is smaller than q->n_bd, there is no need to reserve
+         * any queue entries for this purpose.
+         */
+        if (q->n_window < q->n_bd)
+                max = q->n_window;
+        else
+                max = q->n_bd - 1;
+
+        /*
+         * q->n_bd is a power of 2, so the following is equivalent to modulo by
+         * q->n_bd and is well defined for negative dividends.
+         */
+        used = (q->write_ptr - q->read_ptr) & (q->n_bd - 1);
+
+        if (WARN_ON(used > max))
+                return 0;
+
+        return max - used;
 }
 
 /*
@@ -451,13 +463,10 @@ static int iwl_pcie_txq_build_tfd(struct iwl_trans *trans, struct iwl_txq *txq,
                 return -EINVAL;
         }
 
-        if (WARN_ON(addr & ~DMA_BIT_MASK(36)))
+        if (WARN(addr & ~IWL_TX_DMA_MASK,
+                 "Unaligned address = %llx\n", (unsigned long long)addr))
                 return -EINVAL;
 
-        if (unlikely(addr & ~IWL_TX_DMA_MASK))
-                IWL_ERR(trans, "Unaligned address = %llx\n",
-                        (unsigned long long)addr);
-
         iwl_pcie_tfd_set_tb(tfd, num_tbs, addr, len);
 
         return 0;
@@ -829,7 +838,7 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans)
                                   sizeof(struct iwl_txq), GFP_KERNEL);
         if (!trans_pcie->txq) {
                 IWL_ERR(trans, "Not enough memory for txq\n");
-                ret = ENOMEM;
+                ret = -ENOMEM;
                 goto error;
         }
 
@@ -1153,10 +1162,10 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id)
 /*
  * iwl_pcie_enqueue_hcmd - enqueue a uCode command
  * @priv: device private data point
- * @cmd: a point to the ucode command structure
+ * @cmd: a pointer to the ucode command structure
  *
- * The function returns < 0 values to indicate the operation is
- * failed. On success, it turns the index (> 0) of command in the
+ * The function returns < 0 values to indicate the operation
+ * failed. On success, it returns the index (>= 0) of command in the
  * command queue.
  */
 static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,
@@ -1619,10 +1628,9 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
         txq = &trans_pcie->txq[txq_id];
         q = &txq->q;
 
-        if (unlikely(!test_bit(txq_id, trans_pcie->queue_used))) {
-                WARN_ON_ONCE(1);
+        if (WARN_ONCE(!test_bit(txq_id, trans_pcie->queue_used),
+                      "TX on unused queue %d\n", txq_id))
                 return -EINVAL;
-        }
 
         spin_lock(&txq->lock);
 
@@ -1632,7 +1640,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
          * Check here that the packets are in the right place on the ring.
          */
         wifi_seq = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
-        WARN_ONCE(trans_pcie->txq[txq_id].ampdu &&
+        WARN_ONCE(txq->ampdu &&
                   (wifi_seq & 0xff) != q->write_ptr,
                   "Q: %d WiFi Seq %d tfdNum %d",
                   txq_id, wifi_seq, q->write_ptr);
@@ -1664,7 +1672,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
          */
         len = sizeof(struct iwl_tx_cmd) + sizeof(struct iwl_cmd_header) +
               hdr_len - IWL_HCMD_SCRATCHBUF_SIZE;
-        tb1_len = (len + 3) & ~3;
+        tb1_len = ALIGN(len, 4);
 
         /* Tell NIC about any 2-byte padding after MAC header */
         if (tb1_len != len)