summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2008-12-16 21:17:37 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-17 18:58:21 +0100
commit1d32251e846ccbcf9d2da041dffd1199f94b2a3b (patch)
treea218c00d0776f11b8f7c8d7eb6eaca8598f6868e /arch
parentx86: unify pci iommu setup and allow swiotlb to compile for 32 bit (diff)
downloadlinux-1d32251e846ccbcf9d2da041dffd1199f94b2a3b.tar.xz
linux-1d32251e846ccbcf9d2da041dffd1199f94b2a3b.zip
x86/swiotlb: add default phys<->bus conversion
Xen will override these later on. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/pci-swiotlb_64.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c
index a991afea6700..93a8371f2c22 100644
--- a/arch/x86/kernel/pci-swiotlb_64.c
+++ b/arch/x86/kernel/pci-swiotlb_64.c
@@ -23,6 +23,16 @@ void *swiotlb_alloc(unsigned order, unsigned long nslabs)
return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
}
+dma_addr_t swiotlb_phys_to_bus(phys_addr_t paddr)
+{
+ return paddr;
+}
+
+phys_addr_t swiotlb_bus_to_phys(dma_addr_t baddr)
+{
+ return baddr;
+}
+
static dma_addr_t
swiotlb_map_single_phys(struct device *hwdev, phys_addr_t paddr, size_t size,
int direction)