From patchwork Fri Nov 23 21:33:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 201415 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 458B42C0783 for ; Sat, 24 Nov 2012 08:43:24 +1100 (EST) Received: from g1t0027.austin.hp.com (g1t0027.austin.hp.com [15.216.28.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "smtp.hp.com", Issuer "VeriSign Class 3 Secure Server CA - G3" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 79B062C0156 for ; Sat, 24 Nov 2012 08:43:00 +1100 (EST) Received: from g1t0039.austin.hp.com (g1t0039.austin.hp.com [16.236.32.45]) by g1t0027.austin.hp.com (Postfix) with ESMTP id 4F2DB381B4; Fri, 23 Nov 2012 21:33:47 +0000 (UTC) Received: from [10.152.0.6] (swa01cs005-da01.atlanta.hp.com [16.114.29.155]) by g1t0039.austin.hp.com (Postfix) with ESMTP id 7D95E342C2; Fri, 23 Nov 2012 21:33:43 +0000 (UTC) Message-ID: <1353706422.5270.99.camel@lorien2> Subject: [PATCH 4/9] microblaze: dma-mapping: support debug_dma_mapping_error From: Shuah Khan To: Joerg Roedel , a-jacquiot@ti.com, fenghua.yu@intel.com, catalin.marinas@arm.com, lethal@linux-sh.org, benh@kernel.crashing.org, ralf@linux-mips.org, tony.luck@intel.com, davem@davemloft.net, m.szyprowski@samsung.com, msalter@redhat.com, monstr@monstr.eu, Ming Lei Date: Fri, 23 Nov 2012 14:33:42 -0700 Organization: ISS-Linux X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, linux-c6x-dev@linux-c6x.org, linux-sh@vger.kernel.org, microblaze-uclinux@itee.uq.edu.au, LKML , shuahkhan@gmail.com, sparclinux@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: shuah.khan@hp.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add support for debug_dma_mapping_error() call to avoid warning from debug_dma_unmap() interface when it checks for mapping error checked status. Without this patch, device driver failed to check map error warning is generated. Signed-off-by: Shuah Khan Acked-by: Michal Simek --- This patch is already in linux-next. Including it in this series for completeness. linux-next commit f229605441030bcd315c21d97b25889d63ed0130 -- shuah --- arch/microblaze/include/asm/dma-mapping.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h index 01d2282..46460f1 100644 --- a/arch/microblaze/include/asm/dma-mapping.h +++ b/arch/microblaze/include/asm/dma-mapping.h @@ -114,6 +114,8 @@ static inline void __dma_sync(unsigned long paddr, static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { struct dma_map_ops *ops = get_dma_ops(dev); + + debug_dma_mapping_error(dev, dma_addr); if (ops->mapping_error) return ops->mapping_error(dev, dma_addr);