From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757690AbZE2IpF (ORCPT ); Fri, 29 May 2009 04:45:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757181AbZE2IoL (ORCPT ); Fri, 29 May 2009 04:44:11 -0400 Received: from smtp.citrix.com ([66.165.176.89]:56015 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756830AbZE2IoJ (ORCPT ); Fri, 29 May 2009 04:44:09 -0400 X-IronPort-AV: E=Sophos;i="4.41,270,1241409600"; d="scan'208";a="4461767" From: Ian Campbell To: CC: Ian Campbell , FUJITA Tomonori , Jeremy Fitzhardinge , Subject: [PATCH 4/9] x86: use dma_map_range when allocating PCI DMA memory with no IOMMU Date: Fri, 29 May 2009 09:43:58 +0100 Message-ID: <1243586643-5554-5-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 Replaces use of is_buffer_dma_capable which is going away. Signed-off-by: Ian Campbell Cc: FUJITA Tomonori Cc: Jeremy Fitzhardinge Cc: x86@kernel.org --- arch/x86/kernel/pci-nommu.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c index 71d412a..a3a61dd 100644 --- a/arch/x86/kernel/pci-nommu.c +++ b/arch/x86/kernel/pci-nommu.c @@ -12,13 +12,14 @@ #include static int -check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size) +check_addr(char *name, struct device *hwdev, phys_addr_t phys, size_t size, dma_addr_t *bus) { - if (hwdev && !is_buffer_dma_capable(*hwdev->dma_mask, bus, size)) { + if (hwdev && + !dma_map_range(hwdev, *hwdev->dma_mask, phys, size, bus)) { if (*hwdev->dma_mask >= DMA_BIT_MASK(32)) printk(KERN_ERR "nommu_%s: overflow %Lx+%zu of device mask %Lx\n", - name, (long long)bus, size, + name, (long long)phys, size, (long long)*hwdev->dma_mask); return 0; } @@ -30,9 +31,10 @@ static dma_addr_t nommu_map_page(struct device *dev, struct page *page, enum dma_data_direction dir, struct dma_attrs *attrs) { - dma_addr_t bus = page_to_phys(page) + offset; + phys_addr_t phys = page_to_phys(page) + offset; + dma_addr_t bus; WARN_ON(size == 0); - if (!check_addr("map_single", dev, bus, size)) + if (!check_addr("map_single", dev, phys, size, &bus)) return bad_dma_address; flush_write_buffers(); return bus; @@ -64,8 +66,7 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg, for_each_sg(sg, s, nents, i) { BUG_ON(!sg_page(s)); - s->dma_address = sg_phys(s); - if (!check_addr("map_sg", hwdev, s->dma_address, s->length)) + if (!check_addr("map_sg", hwdev, sg_phys(s), s->length, &s->dma_address)) return 0; s->dma_length = s->length; } -- 1.5.6.5