Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1565032
| From | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/3] ath10k: use dma_zalloc_coherent() |
| Date | 2017-01-23 16:10 +0100 |
| Message-ID | <t2OpR-812-51@gated-at.bofh.it> (permalink) |
| References | <t2OpQ-812-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
use dma_zalloc_coherent() instead of dma_alloc_coherent and memset(). Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- drivers/net/wireless/ath/ath10k/ce.c | 9 +-------- drivers/net/wireless/ath/ath10k/pci.c | 3 +-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c index 0b4d796..c2b388f 100644 --- a/drivers/net/wireless/ath/ath10k/ce.c +++ b/drivers/net/wireless/ath/ath10k/ce.c @@ -958,7 +958,7 @@ ath10k_ce_alloc_dest_ring(struct ath10k *ar, unsigned int ce_id, * coherent DMA are unsupported */ dest_ring->base_addr_owner_space_unaligned = - dma_alloc_coherent(ar->dev, + dma_zalloc_coherent(ar->dev, (nentries * sizeof(struct ce_desc) + CE_DESC_RING_ALIGN), &base_addr, GFP_KERNEL); @@ -969,13 +969,6 @@ ath10k_ce_alloc_dest_ring(struct ath10k *ar, unsigned int ce_id, dest_ring->base_addr_ce_space_unaligned = base_addr; - /* - * Correctly initialize memory to 0 to prevent garbage - * data crashing system when download firmware - */ - memset(dest_ring->base_addr_owner_space_unaligned, 0, - nentries * sizeof(struct ce_desc) + CE_DESC_RING_ALIGN); - dest_ring->base_addr_owner_space = PTR_ALIGN( dest_ring->base_addr_owner_space_unaligned, CE_DESC_RING_ALIGN); diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index b541a1c..855e3de 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -896,7 +896,7 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data, */ alloc_nbytes = min_t(unsigned int, nbytes, DIAG_TRANSFER_LIMIT); - data_buf = (unsigned char *)dma_alloc_coherent(ar->dev, + data_buf = (unsigned char *)dma_zalloc_coherent(ar->dev, alloc_nbytes, &ce_data_base, GFP_ATOMIC); @@ -905,7 +905,6 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data, ret = -ENOMEM; goto done; } - memset(data_buf, 0, alloc_nbytes); remaining_bytes = nbytes; ce_data = ce_data_base; -- 2.10.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 1/3] ath10k: remove multiple defines of DIAG_TRANSFER_LIMIT Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2017-01-23 16:10 +0100
[PATCH 3/3] ath10k: fix typo in addr calculation Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2017-01-23 16:10 +0100
[PATCH 2/3] ath10k: use dma_zalloc_coherent() Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2017-01-23 16:10 +0100
Re: [PATCH 2/3] ath10k: use dma_zalloc_coherent() Joe Perches <joe@perches.com> - 2017-01-24 00:20 +0100
Re: [PATCH 2/3] ath10k: use dma_zalloc_coherent() "Valo, Kalle" <kvalo@qca.qualcomm.com> - 2017-01-24 06:20 +0100
Re: [PATCH 2/3] ath10k: use dma_zalloc_coherent() Joe Perches <joe@perches.com> - 2017-01-24 06:30 +0100
Re: [PATCH 2/3] ath10k: use dma_zalloc_coherent() "Valo, Kalle" <kvalo@qca.qualcomm.com> - 2017-01-24 13:20 +0100
Re: [1/3] ath10k: remove multiple defines of DIAG_TRANSFER_LIMIT Kalle Valo <kvalo@qca.qualcomm.com> - 2017-01-27 19:20 +0100
csiph-web