lkml.org 
[lkml]   [2008]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] x86: gart alloc_coherent does virtual mapppings only when necessary
Looks good to me.

On Thu, Sep 11, 2008 at 11:08:48PM +0900, FUJITA Tomonori wrote:
> gart alloc_coherent need to do virtual mapppings only when an
> allocated buffer is not DMA-capable for a device.
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Cc: Joerg Roedel <joerg.roedel@amd.com>

Acked-by: Joerg Roedel <joerg.roedel@amd.com>

> ---
> arch/x86/kernel/pci-gart_64.c | 10 +++++++++-
> 1 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
> index 1b0c412..47abe43 100644
> --- a/arch/x86/kernel/pci-gart_64.c
> +++ b/arch/x86/kernel/pci-gart_64.c
> @@ -488,15 +488,23 @@ gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr,
> gfp_t flag)
> {
> void *vaddr;
> + dma_addr_t paddr;
> unsigned long align_mask;
> + u64 dma_mask = dma_alloc_coherent_mask(dev, flag);
>
> vaddr = (void *)__get_free_pages(flag | __GFP_ZERO, get_order(size));
> if (!vaddr)
> return NULL;
>
> + paddr = virt_to_phys(vaddr);
> + if (is_buffer_dma_capable(dma_mask, paddr, size)) {
> + *dma_addr = paddr;
> + return vaddr;
> + }
> +
> align_mask = (1UL << get_order(size)) - 1;
>
> - *dma_addr = dma_map_area(dev, __pa(vaddr), size, DMA_BIDIRECTIONAL,
> + *dma_addr = dma_map_area(dev, paddr, size, DMA_BIDIRECTIONAL,
> align_mask);
> flush_gart();
>
> --
> 1.5.4.2
>
>

--
| AMD Saxony Limited Liability Company & Co. KG
Operating | Wilschdorfer Landstr. 101, 01109 Dresden, Germany
System | Register Court Dresden: HRA 4896
Research | General Partner authorized to represent:
Center | AMD Saxony LLC (Wilmington, Delaware, US)
| General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy



\
 
 \ /
  Last update: 2008-09-11 16:19    [W:0.759 / U:0.520 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site