From 6e8a8991e2103dcb6a9cff28f460390e8e360848 Mon Sep 17 00:00:00 2001

From: Rakesh Pillai <pillair@codeaurora.org>

Date: Fri, 25 Jan 2019 09:51:06 +0530

Subject: [PATCH] ath10k: fix dma unmap direction for management frames

Git-commit: 6e8a8991e2103dcb6a9cff28f460390e8e360848

Patch-mainline: v5.1-rc1

References: bsc#1111666

The management frames transmitted are dma mapped with

direction TO_DEVICE, but incorrectly mapped with

direction FROM_DEVICE during tx complete and error cases.

Fix the direction of dma during dma unmap of the

transmitted management frames.

Tested HW: WCN3990

Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1

Fixes: 38a1390e02b7 ("ath10k: dma unmap mgmt tx buffer if wmi cmd send fails")

Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/net/wireless/ath/ath10k/mac.c | 4 ++--

 drivers/net/wireless/ath/ath10k/wmi.c | 4 ++--

 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c

index e49b36752ba2..8c6c5152d416 100644

--- a/drivers/net/wireless/ath/ath10k/mac.c

+++ b/drivers/net/wireless/ath/ath10k/mac.c

@@ -1,7 +1,7 @@

 /*

  * Copyright (c) 2005-2011 Atheros Communications Inc.

  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

- * Copyright (c) 2018, The Linux Foundation. All rights reserved.

+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

  *

  * Permission to use, copy, modify, and/or distribute this software for any

  * purpose with or without fee is hereby granted, provided that the above

@@ -3863,7 +3863,7 @@ void ath10k_mgmt_over_wmi_tx_work(struct work_struct *work)

 				ath10k_warn(ar, "failed to transmit management frame by ref via WMI: %d\n",

 					    ret);

 				dma_unmap_single(ar->dev, paddr, skb->len,

-						 DMA_FROM_DEVICE);

+						 DMA_TO_DEVICE);

 				ieee80211_free_txskb(ar->hw, skb);

 			}

 		} else {

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c

index 971ff364d8b1..6509febc07cd 100644

--- a/drivers/net/wireless/ath/ath10k/wmi.c

+++ b/drivers/net/wireless/ath/ath10k/wmi.c

@@ -1,7 +1,7 @@

 /*

  * Copyright (c) 2005-2011 Atheros Communications Inc.

  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

- * Copyright (c) 2018, The Linux Foundation. All rights reserved.

+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

  *

  * Permission to use, copy, modify, and/or distribute this software for any

  * purpose with or without fee is hereby granted, provided that the above

@@ -2346,7 +2346,7 @@ static int wmi_process_mgmt_tx_comp(struct ath10k *ar, u32 desc_id,

 	msdu = pkt_addr->vaddr;

 	dma_unmap_single(ar->dev, pkt_addr->paddr,

-			 msdu->len, DMA_FROM_DEVICE);

+			 msdu->len, DMA_TO_DEVICE);

 	info = IEEE80211_SKB_CB(msdu);

 	if (status)

-- 

2.16.4