From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757941AbZE2Ip0 (ORCPT ); Fri, 29 May 2009 04:45:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757221AbZE2IoM (ORCPT ); Fri, 29 May 2009 04:44:12 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:41310 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756937AbZE2IoK (ORCPT ); Fri, 29 May 2009 04:44:10 -0400 X-IronPort-AV: E=Sophos;i="4.41,270,1241409600"; d="scan'208";a="53001168" From: Ian Campbell To: CC: Ian Campbell , FUJITA Tomonori , Jeremy Fitzhardinge , Subject: [PATCH 5/9] x86: use dma_map_range when allocating PCI GART memory Date: Fri, 29 May 2009 09:43:59 +0100 Message-ID: <1243586643-5554-6-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1243586643-5554-1-git-send-email-ian.campbell@citrix.com> References: <1243586643-5554-1-git-send-email-ian.campbell@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function is intended to replaces is_buffer_dma_capable with a more generic interface. Signed-off-by: Ian Campbell Cc: FUJITA Tomonori Cc: Jeremy Fitzhardinge Cc: x86@kernel.org --- arch/x86/kernel/pci-gart_64.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index 1e8920d..eb043bd 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c @@ -190,14 +190,16 @@ static void iommu_full(struct device *dev, size_t size, int dir) static inline int need_iommu(struct device *dev, unsigned long addr, size_t size) { + dma_addr_t dma_addr; return force_iommu || - !is_buffer_dma_capable(*dev->dma_mask, addr, size); + !dma_map_range(dev, *dev->dma_mask, addr, size, &dma_addr); } static inline int nonforced_iommu(struct device *dev, unsigned long addr, size_t size) { - return !is_buffer_dma_capable(*dev->dma_mask, addr, size); + dma_addr_t dma_addr; + return !dma_map_range(dev, *dev->dma_mask, addr, size, &dma_addr); } /* Map a single continuous physical area into the IOMMU. -- 1.5.6.5