From patchwork Mon Jan 23 15:04:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 718618 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3v6ZQL1hl3z9s2G for ; Tue, 24 Jan 2017 02:06:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="I7A3GSEl"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751130AbdAWPF2 (ORCPT ); Mon, 23 Jan 2017 10:05:28 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35093 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750738AbdAWPFX (ORCPT ); Mon, 23 Jan 2017 10:05:23 -0500 Received: by mail-wm0-f47.google.com with SMTP id r126so137250497wmr.0 for ; Mon, 23 Jan 2017 07:04:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Kg1hNeYt5uWFJSfip8Xf7pIjBFqePcSgSoCA97ItHjI=; b=I7A3GSElgkiksdZpLj8ASWFiipyZHbR6JFOekcXTKgb62peVjd2zHE3SJkfaS9wAf6 P+zBaAdpNMbgbHZPNs5yBNH6+l+cuGlZr5+VA0DKOPuqPBfUzVkSuor+TO54fv+Ruwjl JjDRqdf2WlOFUiXwvZKN0gLV6SH7v7T35HCG4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Kg1hNeYt5uWFJSfip8Xf7pIjBFqePcSgSoCA97ItHjI=; b=Ifc3+JhxlSCYLH65iMqZU656VBrcR2cVGSukPGyRUNygnWnV3RWgNzOO5J69DFZze+ wqwgmYUkv9tyKSUnMW4gpBUyHdeCBctpSbZJQh/eYbm7XD4Plmf/tkWL8RSYKNNVpMxs W66x1Lx7zjWVLO0P1QT5TdyKlwTdZ/VvXDCZaFmpMssf1fVUIeI+TbeemYHPdgI5FLWE r3+JVeCVgWvv1gqZsFRK7stgnmrqqWnllz2lPNQzgOYoUcRh4DL/t6fCFPP0qExyLQvS O3YSI+Ef5mFz4kraxrKmpSLEG3NL0d6dX4Xdch3PQd4x8SVR+auSHEBirTLW3XcLoWy+ OJAA== X-Gm-Message-State: AIkVDXJqYr+wd2f99u5agMpJclOWUky+wpK9Fyih4u+3UzGiD0w2incKYWhZkIGxqQFt8g42 X-Received: by 10.28.148.76 with SMTP id w73mr14534147wmd.74.1485183886152; Mon, 23 Jan 2017 07:04:46 -0800 (PST) Received: from localhost.localdomain (host-2-98-105-38.as13285.net. [2.98.105.38]) by smtp.gmail.com with ESMTPSA id k43sm15085354wrc.46.2017.01.23.07.04.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jan 2017 07:04:45 -0800 (PST) From: Srinivas Kandagatla To: Kalle Valo Cc: ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 2/3] ath10k: use dma_zalloc_coherent() Date: Mon, 23 Jan 2017 15:04:35 +0000 Message-Id: <1485183876-27080-2-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485183876-27080-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1485183876-27080-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use dma_zalloc_coherent() instead of dma_alloc_coherent and memset(). Signed-off-by: Srinivas Kandagatla --- 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;