diff options
| author |   Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2015-04-24 10:16:40 +0100 |
|---|---|---|
| committer |   David Vrabel <david.vrabel@citrix.com> | 2015-05-06 15:02:58 +0100 |
| commit | 8746515d7f04c9ea94cf43e2db1fd2cfca93276d (patch) | |
| tree | d6770d527bfdffc9e9a4fe2f970304a547cde20d /drivers/xen | |
| parent | hypervisor/x86/xen: Unset X86_BUG_SYSRET_SS_ATTRS on Xen PV guests (diff) | |
| download | linux-dev-8746515d7f04c9ea94cf43e2db1fd2cfca93276d.tar.xz linux-dev-8746515d7f04c9ea94cf43e2db1fd2cfca93276d.zip | |
xen: Add __GFP_DMA flag when xen_swiotlb_init gets free pages on ARM
Make sure that xen_swiotlb_init allocates buffers that are DMA capable
when at least one memblock is available below 4G. Otherwise we assume
that all devices on the SoC can cope with >4G addresses. We do this on
ARM and ARM64, where dom0 is mapped 1:1, so pfn == mfn in this case.
No functional changes on x86.
From: Chen Baozi <baozich@gmail.com>
Signed-off-by: Chen Baozi <baozich@gmail.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Tested-by: Chen Baozi <baozich@gmail.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/swiotlb-xen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 810ad419e34c..4c549323c605 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -235,7 +235,7 @@ retry: #define SLABS_PER_PAGE (1 << (PAGE_SHIFT - IO_TLB_SHIFT)) #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT) while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) { - xen_io_tlb_start = (void *)__get_free_pages(__GFP_NOWARN, order); + xen_io_tlb_start = (void *)xen_get_swiotlb_free_pages(order); if (xen_io_tlb_start) break; order--; |