Skip to contentSkip to conversation

fix missing asm/swiotlb.h in the ia64 build

PATCH Applied Alex Williamson 2 participants 2 messages Dec 20, 2006 – Dec 21, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix missing asm/swiotlb.h in the ia64 build

This patch is against the current staging tree for xen-unstable.hg.
The swiotlb changes in "[LINUX] dma: Use swiotlb mask for coherent mappings too" require us to have an asm/swiotlb.h. This patch copies the i386 swiotlb.h into the ia64 build. Thanks,

Alex

---

linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h new file +45 -0
diff -r f58b0c778b90 linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h
@@ -0,0 +1,45 @@
+#ifndef _ASM_SWIOTLB_H
+#define _ASM_SWIOTLB_H 1
+
+#include <linux/config.h>
+
+/* SWIOTLB interface */
+
+extern dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr, size_t size,
+				      int dir);
+extern void swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
+				  size_t size, int dir);
+extern void swiotlb_sync_single_for_cpu(struct device *hwdev,
+					 dma_addr_t dev_addr,
+					 size_t size, int dir);
+extern void swiotlb_sync_single_for_device(struct device *hwdev,
+					    dma_addr_t dev_addr,
+					    size_t size, int dir);
+extern void swiotlb_sync_sg_for_cpu(struct device *hwdev,
+				     struct scatterlist *sg, int nelems,
+				     int dir);
+extern void swiotlb_sync_sg_for_device(struct device *hwdev,
+					struct scatterlist *sg, int nelems,
+					int dir);
+extern int swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg,
+		      int nents, int direction);
+extern void swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg,
+			 int nents, int direction);
+extern int swiotlb_dma_mapping_error(dma_addr_t dma_addr);
+extern dma_addr_t swiotlb_map_page(struct device *hwdev, struct page *page,
+                                   unsigned long offset, size_t size,
+                                   enum dma_data_direction direction);
+extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dma_address,
+                               size_t size, enum dma_data_direction direction);
+extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);
+extern void swiotlb_init(void);
+
+extern unsigned int dma_bits;
+
+#ifdef CONFIG_SWIOTLB
+extern int swiotlb;
+#else
+#define swiotlb 0
+#endif
+
+#endif
Applied
#1 lore raw
Quoted 4 lines · Alex Williamson

This patch is against the current staging tree for xen-unstable.hg.
The swiotlb changes in "[LINUX] dma: Use swiotlb mask for coherent mappings too" require us to have an asm/swiotlb.h. This patch copies the i386 swiotlb.h into the ia64 build. Thanks,

Applied.

-- Keir