|
|
@@ -193,10 +193,34 @@ void iwl_cmd_queue_free(struct iwl_priv *priv)
|
|
|
struct iwl_queue *q = &txq->q;
|
|
|
struct device *dev = &priv->pci_dev->dev;
|
|
|
int i;
|
|
|
+ bool huge = false;
|
|
|
|
|
|
if (q->n_bd == 0)
|
|
|
return;
|
|
|
|
|
|
+ for (; q->read_ptr != q->write_ptr;
|
|
|
+ q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
|
|
|
+ /* we have no way to tell if it is a huge cmd ATM */
|
|
|
+ i = get_cmd_index(q, q->read_ptr, 0);
|
|
|
+
|
|
|
+ if (txq->meta[i].flags & CMD_SIZE_HUGE) {
|
|
|
+ huge = true;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
+ pci_unmap_single(priv->pci_dev,
|
|
|
+ pci_unmap_addr(&txq->meta[i], mapping),
|
|
|
+ pci_unmap_len(&txq->meta[i], len),
|
|
|
+ PCI_DMA_BIDIRECTIONAL);
|
|
|
+ }
|
|
|
+ if (huge) {
|
|
|
+ i = q->n_window;
|
|
|
+ pci_unmap_single(priv->pci_dev,
|
|
|
+ pci_unmap_addr(&txq->meta[i], mapping),
|
|
|
+ pci_unmap_len(&txq->meta[i], len),
|
|
|
+ PCI_DMA_BIDIRECTIONAL);
|
|
|
+ }
|
|
|
+
|
|
|
/* De-alloc array of command/tx buffers */
|
|
|
for (i = 0; i <= TFD_CMD_SLOTS; i++)
|
|
|
kfree(txq->cmd[i]);
|
|
|
@@ -1049,6 +1073,14 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
|
|
|
|
|
|
spin_lock_irqsave(&priv->hcmd_lock, flags);
|
|
|
|
|
|
+ /* If this is a huge cmd, mark the huge flag also on the meta.flags
|
|
|
+ * of the _original_ cmd. This is used for DMA mapping clean up.
|
|
|
+ */
|
|
|
+ if (cmd->flags & CMD_SIZE_HUGE) {
|
|
|
+ idx = get_cmd_index(q, q->write_ptr, 0);
|
|
|
+ txq->meta[idx].flags = CMD_SIZE_HUGE;
|
|
|
+ }
|
|
|
+
|
|
|
idx = get_cmd_index(q, q->write_ptr, cmd->flags & CMD_SIZE_HUGE);
|
|
|
out_cmd = txq->cmd[idx];
|
|
|
out_meta = &txq->meta[idx];
|
|
|
@@ -1226,6 +1258,7 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
|
|
|
bool huge = !!(pkt->hdr.sequence & SEQ_HUGE_FRAME);
|
|
|
struct iwl_device_cmd *cmd;
|
|
|
struct iwl_cmd_meta *meta;
|
|
|
+ struct iwl_tx_queue *txq = &priv->txq[IWL_CMD_QUEUE_NUM];
|
|
|
|
|
|
/* If a Tx command is being handled and it isn't in the actual
|
|
|
* command queue then there a command routing bug has been introduced
|
|
|
@@ -1239,9 +1272,17 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- cmd_index = get_cmd_index(&priv->txq[IWL_CMD_QUEUE_NUM].q, index, huge);
|
|
|
- cmd = priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_index];
|
|
|
- meta = &priv->txq[IWL_CMD_QUEUE_NUM].meta[cmd_index];
|
|
|
+ /* If this is a huge cmd, clear the huge flag on the meta.flags
|
|
|
+ * of the _original_ cmd. So that iwl_cmd_queue_free won't unmap
|
|
|
+ * the DMA buffer for the scan (huge) command.
|
|
|
+ */
|
|
|
+ if (huge) {
|
|
|
+ cmd_index = get_cmd_index(&txq->q, index, 0);
|
|
|
+ txq->meta[cmd_index].flags = 0;
|
|
|
+ }
|
|
|
+ cmd_index = get_cmd_index(&txq->q, index, huge);
|
|
|
+ cmd = txq->cmd[cmd_index];
|
|
|
+ meta = &txq->meta[cmd_index];
|
|
|
|
|
|
pci_unmap_single(priv->pci_dev,
|
|
|
pci_unmap_addr(meta, mapping),
|
|
|
@@ -1263,6 +1304,7 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
|
|
|
get_cmd_string(cmd->hdr.cmd));
|
|
|
wake_up_interruptible(&priv->wait_command_queue);
|
|
|
}
|
|
|
+ meta->flags = 0;
|
|
|
}
|
|
|
EXPORT_SYMBOL(iwl_tx_cmd_complete);
|
|
|
|
Zhu Yi