From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750954AbcEHLKL (ORCPT ); Sun, 8 May 2016 07:10:11 -0400 Received: from smtp-3.sys.kth.se ([130.237.48.192]:37123 "EHLO smtp-3.sys.kth.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750783AbcEHLKJ (ORCPT ); Sun, 8 May 2016 07:10:09 -0400 X-Greylist: delayed 466 seconds by postgrey-1.27 at vger.kernel.org; Sun, 08 May 2016 07:10:08 EDT X-KTH-Auth: niso [89.233.230.99] X-KTH-mail-from: niklas.soderlund+renesas@ragnatech.se From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, dmaengine@vger.kernel.org Cc: will.deacon@arm.com, robin.murphy@arm.com, joro@8bytes.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH 1/2] dma-mapping: add __dma_sync_single_for_device() Date: Sun, 8 May 2016 12:59:55 +0200 Message-Id: <1462705196-10857-2-git-send-email-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1462705196-10857-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> References: <1462705196-10857-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some users of the DMA mapping API calls dma_sync_single_for_device() from the dma_map_single() call path. This will cause false warning printouts if CONFIG_DMA_API_DEBUG are enabled. The reason for the warning are that debug_dma_sync_single_for_device() will be called before debug_dma_map_page() so the new mapping can't be found and are believed to be invalid. Add __dma_sync_single_for_device() that don't call into debug_dma_sync_single_for_device() and can be used in these situations. Signed-off-by: Niklas Söderlund --- include/linux/dma-mapping.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 9ea9aba..0e4d3a6 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -224,7 +224,7 @@ static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr, debug_dma_sync_single_for_cpu(dev, addr, size, dir); } -static inline void dma_sync_single_for_device(struct device *dev, +static inline void __dma_sync_single_for_device(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) { @@ -233,6 +233,13 @@ static inline void dma_sync_single_for_device(struct device *dev, BUG_ON(!valid_dma_direction(dir)); if (ops->sync_single_for_device) ops->sync_single_for_device(dev, addr, size, dir); +} + +static inline void dma_sync_single_for_device(struct device *dev, + dma_addr_t addr, size_t size, + enum dma_data_direction dir) +{ + __dma_sync_single_for_device(dev, addr, size, dir); debug_dma_sync_single_for_device(dev, addr, size, dir); } -- 2.8.2