| Message ID | 20190715031941.7120-1-huangfq.daxian@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 52d4261862ec140cda09ec9cf4d6dc388fd83f59 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | None | expand |
Fuqian Huang <huangfq.daxian@gmail.com> writes: > In commit 518a2f1925c3 > ("dma-mapping: zero memory returned from dma_alloc_*"), > dma_alloc_coherent has already zeroed the memory. > So memset is not needed. > > Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> > --- > Changes in v3: > - Use actual commit rather than the merge commit in the commit message > > drivers/net/wireless/ath/ath10k/ce.c | 5 ----- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 -- > drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 2 -- > drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 2 -- > 4 files changed, 11 deletions(-) Via which tree is this supposed to go? Can I take this to wireless-drivers-next?
Fuqian Huang <huangfq.daxian@gmail.com> writes: > In commit 518a2f1925c3 > ("dma-mapping: zero memory returned from dma_alloc_*"), > dma_alloc_coherent has already zeroed the memory. > So memset is not needed. > > Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> > --- > Changes in v3: > - Use actual commit rather than the merge commit in the commit message > > drivers/net/wireless/ath/ath10k/ce.c | 5 ----- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 -- > drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 2 -- > drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 2 -- > 4 files changed, 11 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c > index eca87f7c5b6c..294fbc1e89ab 100644 > --- a/drivers/net/wireless/ath/ath10k/ce.c > +++ b/drivers/net/wireless/ath/ath10k/ce.c > @@ -1704,9 +1704,6 @@ ath10k_ce_alloc_dest_ring_64(struct ath10k *ar, unsigned int ce_id, > /* 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_64) + CE_DESC_RING_ALIGN); Shouldn't you also remove the comment?
(adding back linux-wireless, please don't drop CC) > Kalle Valo <kvalo@codeaurora.org> 於 2019年7月15日週一 下午5:07寫道： >> >> Fuqian Huang <huangfq.daxian@gmail.com> writes: >> >> > In commit 518a2f1925c3 >> > ("dma-mapping: zero memory returned from dma_alloc_*"), >> > dma_alloc_coherent has already zeroed the memory. >> > So memset is not needed. >> > >> > Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> >> > --- >> > Changes in v3: >> > - Use actual commit rather than the merge commit in the commit message >> > >> > drivers/net/wireless/ath/ath10k/ce.c | 5 ----- >> > drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 -- >> > drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 2 -- >> > drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 2 -- >> > 4 files changed, 11 deletions(-) >> >> Via which tree is this supposed to go? Can I take this to >> wireless-drivers-next? > > I think the wireless-drivers-next is fine. Good, I'll then take these to my queue. > The four file have similar changes. And they are both under wireless > subsystem. How should i indicate which tree the patch should go to? > Should I mark them in [patch v3 wireless] or after the Changes in v3? > I should avoid this mistake next time. As there's no dependency between patches to me the easiest is that you send the wireless patches separately, that way I can take them directly without asking anything, and not worry about dependencies or if someone else is going to apply them. For example Colin King does that his cleanup patches and I like it a lot. But if I see patch 20/24 (and only that, no cover letter or over patches) I have no clue what the plan is and need extra effort to understand what I should do.
Fuqian Huang <huangfq.daxian@gmail.com> wrote: > In commit 518a2f1925c3 > ("dma-mapping: zero memory returned from dma_alloc_*"), > dma_alloc_coherent has already zeroed the memory. > So memset is not needed. > > Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> Patch applied to wireless-drivers-next.git, thanks. 52d4261862ec wireless: Remove call to memset after dma_alloc_coherent
diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c index eca87f7c5b6c..294fbc1e89ab 100644 --- a/drivers/net/wireless/ath/ath10k/ce.c +++ b/drivers/net/wireless/ath/ath10k/ce.c @@ -1704,9 +1704,6 @@ ath10k_ce_alloc_dest_ring_64(struct ath10k *ar, unsigned int ce_id, /* 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_64) + CE_DESC_RING_ALIGN); - dest_ring->base_addr_owner_space = PTR_ALIGN(dest_ring->base_addr_owner_space_unaligned, CE_DESC_RING_ALIGN); @@ -2019,8 +2016,6 @@ void ath10k_ce_alloc_rri(struct ath10k *ar) value |= ar->hw_ce_regs->upd->mask; ath10k_ce_write32(ar, ce_base_addr + ctrl1_regs, value); } - - memset(ce->vaddr_rri, 0, CE_COUNT * sizeof(u32)); } EXPORT_SYMBOL(ath10k_ce_alloc_rri); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 4ea5401c4d6b..5f0437a3fd82 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -1023,8 +1023,6 @@ brcmf_pcie_init_dmabuffer_for_device(struct brcmf_pciedev_info *devinfo, address & 0xffffffff); brcmf_pcie_write_tcm32(devinfo, tcm_dma_phys_addr + 4, address >> 32); - memset(ring, 0, size); - return (ring); } diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c index 3aa3714d4dfd..5ec1c9bc1612 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c +++ b/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c @@ -244,8 +244,6 @@ static int pearl_alloc_bd_table(struct qtnf_pcie_pearl_state *ps) /* tx bd */ - memset(vaddr, 0, len); - ps->bd_table_vaddr = vaddr; ps->bd_table_paddr = paddr; ps->bd_table_len = len; diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c index 9a4380ed7f1b..1f91088e3dff 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c +++ b/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c @@ -199,8 +199,6 @@ static int topaz_alloc_bd_table(struct qtnf_pcie_topaz_state *ts, if (!vaddr) return -ENOMEM; - memset(vaddr, 0, len); - /* tx bd */ ts->tx_bd_vbase = vaddr;
In commit 518a2f1925c3 ("dma-mapping: zero memory returned from dma_alloc_*"), dma_alloc_coherent has already zeroed the memory. So memset is not needed. Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> --- Changes in v3: - Use actual commit rather than the merge commit in the commit message drivers/net/wireless/ath/ath10k/ce.c | 5 ----- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 -- drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 2 -- drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 2 -- 4 files changed, 11 deletions(-)