[source] ath10k: fix DMA allocation issues

LEDE Commits lede-commits at lists.infradead.org
Tue Dec 13 03:45:01 PST 2016 

nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/66482e179bf463d286419319b33a46ad6a507453

commit 66482e179bf463d286419319b33a46ad6a507453
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Dec 13 12:44:52 2016 +0100

    ath10k: fix DMA allocation issues
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 ...-alloc-chunk-should-use-DMA_BIDIRECTIONAL.patch | 27 ++++++++
 ...k-free-host-mem-with-DMA_BIRECTIONAL-flag.patch | 81 ++++++++++++++++++++++
 2 files changed, 108 insertions(+)

diff --git a/package/kernel/mac80211/patches/330-ath10k-wmi-alloc-chunk-should-use-DMA_BIDIRECTIONAL.patch b/package/kernel/mac80211/patches/330-ath10k-wmi-alloc-chunk-should-use-DMA_BIDIRECTIONAL.patch
new file mode 100644
index 0000000..4ac9bcd
--- /dev/null
+++ b/package/kernel/mac80211/patches/330-ath10k-wmi-alloc-chunk-should-use-DMA_BIDIRECTIONAL.patch
@@ -0,0 +1,27 @@
+From: Ben Greear <greearb at candelatech.com>
+Date: Tue, 29 Nov 2016 14:00:28 -0800
+Subject: [PATCH] ath10k: wmi-alloc-chunk should use DMA_BIDIRECTIONAL.
+
+These memory chunks are often used as 'swap' by the NIC,
+so it will be both reading and writing to these areas.
+
+This seems to fix errors like this on my x86-64 machine:
+
+kernel: DMAR: DMAR:[DMA Write] Request device [05:00.0] fault addr ff5de000
+        DMAR:[fault reason 05] PTE Write access is not set
+
+Tested-by: Marek Behun <kabel at blackhole.sk>
+Signed-off-by: Ben Greear <greearb at candelatech.com>
+---
+
+--- a/drivers/net/wireless/ath/ath10k/wmi.c
++++ b/drivers/net/wireless/ath/ath10k/wmi.c
+@@ -4495,7 +4495,7 @@ static int ath10k_wmi_alloc_chunk(struct
+ 	if (!num_units)
+ 		return -ENOMEM;
+ 
+-	paddr = dma_map_single(ar->dev, vaddr, pool_size, DMA_TO_DEVICE);
++	paddr = dma_map_single(ar->dev, vaddr, pool_size, DMA_BIDIRECTIONAL);
+ 	if (dma_mapping_error(ar->dev, paddr)) {
+ 		kfree(vaddr);
+ 		return -ENOMEM;
diff --git a/package/kernel/mac80211/patches/331-ath10k-free-host-mem-with-DMA_BIRECTIONAL-flag.patch b/package/kernel/mac80211/patches/331-ath10k-free-host-mem-with-DMA_BIRECTIONAL-flag.patch
new file mode 100644
index 0000000..e203be0
--- /dev/null
+++ b/package/kernel/mac80211/patches/331-ath10k-free-host-mem-with-DMA_BIRECTIONAL-flag.patch
@@ -0,0 +1,81 @@
+From: Ben Greear <greearb at candelatech.com>
+Date: Mon, 5 Dec 2016 10:28:39 -0800
+Subject: [PATCH] ath10k: free host-mem with DMA_BIRECTIONAL flag.
+
+Hopefully this fixes the problem reported by Kalle:
+
+Noticed this in my log, but I don't have time to investigate this in
+detail right now:
+
+[  413.795346] IPv6: ADDRCONF(NETDEV_UP): wlan0: link is not ready
+[  414.158755] IPv6: ADDRCONF(NETDEV_CHANGE): wlan0: link becomes ready
+[  477.439659] ath10k_pci 0000:02:00.0: could not get mac80211 beacon
+[  481.666630] ------------[ cut here ]------------
+[  481.666669] WARNING: CPU: 0 PID: 1978 at lib/dma-debug.c:1155 check_unmap+0x320/0x8e0
+[  481.666688] ath10k_pci 0000:02:00.0: DMA-API: device driver frees DMA memory with different direction [device address=0x000000002d130000] [size=63800 bytes] [mapped with DMA_BIDIRECTIONAL] [unmapped with DMA_TO_DEVICE]
+[  481.666703] Modules linked in: ctr ccm ath10k_pci(E-) ath10k_core(E) ath(E) mac80211(E) cfg80211(E) snd_hda_codec_hdmi snd_hda_codec_idt snd_hda_codec_generic snd_hda_intel snd_hda_codec snd_hda_core snd_hwdep snd_pcm snd_seq_midi arc4 snd_rawmidi snd_seq_midi_event snd_seq btusb btintel snd_seq_device joydev coret
+[  481.671468] CPU: 0 PID: 1978 Comm: rmmod Tainted: G            E   4.9.0-rc7-wt+ #54
+[  481.671478] Hardware name: Hewlett-Packard HP ProBook 6540b/1722, BIOS 68CDD Ver. F.04 01/27/2010
+[  481.671489]  ef49dcec c842ee92 c8b5830e ef49dd34 ef49dd20 c80850f5 c8b5a13c ef49dd50
+[  481.671560]  000007ba c8b5830e 00000483 c8461830 c8461830 00000483 ef49ddcc f34e64b8
+[  481.671641]  c8b58360 ef49dd3c c80851bb 00000009 00000000 ef49dd34 c8b5a13c ef49dd50
+[  481.671716] Call Trace:
+[  481.671731]  [<c842ee92>] dump_stack+0x76/0xb4
+[  481.671745]  [<c80850f5>] __warn+0xe5/0x100
+[  481.671757]  [<c8461830>] ? check_unmap+0x320/0x8e0
+[  481.671769]  [<c8461830>] ? check_unmap+0x320/0x8e0
+[  481.671780]  [<c80851bb>] warn_slowpath_fmt+0x3b/0x40
+[  481.671791]  [<c8461830>] check_unmap+0x320/0x8e0
+[  481.671804]  [<c8462054>] debug_dma_unmap_page+0x84/0xa0
+[  481.671835]  [<f937cd7a>] ath10k_wmi_free_host_mem+0x9a/0xe0 [ath10k_core]
+[  481.671861]  [<f9363400>] ath10k_core_destroy+0x50/0x60 [ath10k_core]
+[  481.671875]  [<f8e13969>] ath10k_pci_remove+0x79/0xa0 [ath10k_pci]
+[  481.671889]  [<c848d8d8>] pci_device_remove+0x38/0xb0
+[  481.671901]  [<c859fe4b>] __device_release_driver+0x7b/0x110
+[  481.671913]  [<c85a00e7>] driver_detach+0x97/0xa0
+[  481.671923]  [<c859ef8b>] bus_remove_driver+0x4b/0xb0
+[  481.671934]  [<c85a0cda>] driver_unregister+0x2a/0x60
+[  481.671949]  [<c848c888>] pci_unregister_driver+0x18/0x70
+[  481.671965]  [<f8e14dae>] ath10k_pci_exit+0xd/0x25f [ath10k_pci]
+[  481.671979]  [<c812bb84>] SyS_delete_module+0xf4/0x180
+[  481.671995]  [<c81f801b>] ? __might_fault+0x8b/0xa0
+[  481.672009]  [<c80037d0>] do_fast_syscall_32+0xa0/0x1e0
+[  481.672025]  [<c88d4c88>] sysenter_past_esp+0x45/0x74
+[  481.672037] ---[ end trace 3fd23759e17e1622 ]---
+[  481.672049] Mapped at:
+[  481.672060]  [  481.672072] [<c846062c>] debug_dma_map_page.part.25+0x1c/0xf0
+[  481.672083]  [  481.672095] [<c8460799>] debug_dma_map_page+0x99/0xc0
+[  481.672106]  [  481.672132] [<f93745ec>] ath10k_wmi_alloc_chunk+0x12c/0x1f0 [ath10k_core]
+[  481.672142]  [  481.672168] [<f937d0c4>] ath10k_wmi_event_service_ready_work+0x304/0x540 [ath10k_core]
+[  481.672178]  [  481.672190] [<c80a3643>] process_one_work+0x1c3/0x670
+[  482.137134] ath10k_pci 0000:02:00.0: pci irq msi oper_irq_mode 2 irq_mode 0 reset_mode 0
+[  482.313144] ath10k_pci 0000:02:00.0: Direct firmware load for ath10k/pre-cal-pci-0000:02:00.0.bin failed with error -2
+[  482.313274] ath10k_pci 0000:02:00.0: Direct firmware load for ath10k/cal-pci-0000:02:00.0.bin failed with error -2
+[  482.313768] ath10k_pci 0000:02:00.0: qca988x hw2.0 target 0x4100016c chip_id 0x043202ff sub 0000:0000
+[  482.313777] ath10k_pci 0000:02:00.0: kconfig debug 1 debugfs 1 tracing 1 dfs 0 testmode 1
+[  482.313974] ath10k_pci 0000:02:00.0: firmware ver 10.2.4.70.59-2 api 5 features no-p2p,raw-mode,mfp,allows-mesh-bcast crc32 4159f498
+[  482.369858] ath10k_pci 0000:02:00.0: Direct firmware load for ath10k/QCA988X/hw2.0/board-2.bin failed with error -2
+[  482.370011] ath10k_pci 0000:02:00.0: board_file api 1 bmi_id N/A crc32 bebc7c08
+[  483.596770] ath10k_pci 0000:02:00.0: htt-ver 2.1 wmi-op 5 htt-op 2 cal otp max-sta 128 raw 0 hwcrypto 1
+[  483.701686] ath: EEPROM regdomain: 0x0
+[  483.701706] ath: EEPROM indicates default country code should be used
+[  483.701713] ath: doing EEPROM country->regdmn map search
+[  483.701721] ath: country maps to regdmn code: 0x3a
+[  483.701730] ath: Country alpha2 being used: US
+[  483.701737] ath: Regpair used: 0x3a
+
+Reported-by: Kalle Valo <kvalo at qca.qualcomm.com>
+Signed-off-by: Ben Greear <greearb at candelatech.com>
+---
+
+--- a/drivers/net/wireless/ath/ath10k/wmi.c
++++ b/drivers/net/wireless/ath/ath10k/wmi.c
+@@ -8227,7 +8227,7 @@ void ath10k_wmi_free_host_mem(struct ath
+ 		dma_unmap_single(ar->dev,
+ 				 ar->wmi.mem_chunks[i].paddr,
+ 				 ar->wmi.mem_chunks[i].len,
+-				 DMA_TO_DEVICE);
++				 DMA_BIDIRECTIONAL);
+ 		kfree(ar->wmi.mem_chunks[i].vaddr);
+ 	}
+

More information about the lede-commits mailing list