This patch eliminates Xen's special version of the swiotlb code. Along with that it adds trivial forwarding of dma_{,un}map_page when not using highmem. Signed-off-by: Jan Beulich Index: sle10-sp1-2006-12-18/arch/i386/kernel/swiotlb.c =================================================================== --- sle10-sp1-2006-12-18.orig/arch/i386/kernel/swiotlb.c 2006-12-20 15:53:32.000000000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,682 +0,0 @@ -/* - * Dynamic DMA mapping support. - * - * This implementation is a fallback for platforms that do not support - * I/O TLBs (aka DMA address translation hardware). - * Copyright (C) 2000 Asit Mallick - * Copyright (C) 2000 Goutham Rao - * Copyright (C) 2000, 2003 Hewlett-Packard Co - * David Mosberger-Tang - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int swiotlb; -EXPORT_SYMBOL(swiotlb); - -#define OFFSET(val,align) ((unsigned long)((val) & ( (align) - 1))) - -#define SG_ENT_PHYS_ADDRESS(sg) (page_to_bus((sg)->page) + (sg)->offset) - -/* - * Maximum allowable number of contiguous slabs to map, - * must be a power of 2. What is the appropriate value ? - * The complexity of {map,unmap}_single is linearly dependent on this value. - */ -#define IO_TLB_SEGSIZE 128 - -/* - * log of the size of each IO TLB slab. The number of slabs is command line - * controllable. - */ -#define IO_TLB_SHIFT 11 - -/* Width of DMA addresses in the IO TLB. 30 bits is a b44 limitation. */ -#define DEFAULT_IO_TLB_DMA_BITS 30 - -static int swiotlb_force; -static char *iotlb_virt_start; -static unsigned long iotlb_nslabs; - -/* - * Used to do a quick range check in swiotlb_unmap_single and - * swiotlb_sync_single_*, to see if the memory was in fact allocated by this - * API. - */ -static unsigned long iotlb_pfn_start, iotlb_pfn_end; - -/* Does the given dma address reside within the swiotlb aperture? */ -static inline int in_swiotlb_aperture(dma_addr_t dev_addr) -{ - unsigned long pfn = mfn_to_local_pfn(dev_addr >> PAGE_SHIFT); - return (pfn_valid(pfn) - && (pfn >= iotlb_pfn_start) - && (pfn < iotlb_pfn_end)); -} - -/* - * When the IOMMU overflows we return a fallback buffer. This sets the size. - */ -static unsigned long io_tlb_overflow = 32*1024; - -void *io_tlb_overflow_buffer; - -/* - * This is a free list describing the number of free entries available from - * each index - */ -static unsigned int *io_tlb_list; -static unsigned int io_tlb_index; - -/* - * We need to save away the original address corresponding to a mapped entry - * for the sync operations. - */ -static struct phys_addr { - struct page *page; - unsigned int offset; -} *io_tlb_orig_addr; - -/* - * Protect the above data structures in the map and unmap calls - */ -static DEFINE_SPINLOCK(io_tlb_lock); - -static unsigned int io_tlb_dma_bits = DEFAULT_IO_TLB_DMA_BITS; -static int __init -setup_io_tlb_bits(char *str) -{ - io_tlb_dma_bits = simple_strtoul(str, NULL, 0); - return 0; -} -__setup("swiotlb_bits=", setup_io_tlb_bits); - -static int __init -setup_io_tlb_npages(char *str) -{ - /* Unlike ia64, the size is aperture in megabytes, not 'slabs'! */ - if (isdigit(*str)) { - iotlb_nslabs = simple_strtoul(str, &str, 0) << - (20 - IO_TLB_SHIFT); - iotlb_nslabs = ALIGN(iotlb_nslabs, IO_TLB_SEGSIZE); - /* Round up to power of two (xen_create_contiguous_region). */ - while (iotlb_nslabs & (iotlb_nslabs-1)) - iotlb_nslabs += iotlb_nslabs & ~(iotlb_nslabs-1); - } - if (*str == ',') - ++str; - /* - * NB. 'force' enables the swiotlb, but doesn't force its use for - * every DMA like it does on native Linux. 'off' forcibly disables - * use of the swiotlb. - */ - if (!strcmp(str, "force")) - swiotlb_force = 1; - else if (!strcmp(str, "off")) - swiotlb_force = -1; - return 1; -} -__setup("swiotlb=", setup_io_tlb_npages); -/* make io_tlb_overflow tunable too? */ - -/* - * Statically reserve bounce buffer space and initialize bounce buffer data - * structures for the software IO TLB used to implement the PCI DMA API. - */ -void -swiotlb_init_with_default_size (size_t default_size) -{ - unsigned long i, bytes; - - if (!iotlb_nslabs) { - iotlb_nslabs = (default_size >> IO_TLB_SHIFT); - iotlb_nslabs = ALIGN(iotlb_nslabs, IO_TLB_SEGSIZE); - /* Round up to power of two (xen_create_contiguous_region). */ - while (iotlb_nslabs & (iotlb_nslabs-1)) - iotlb_nslabs += iotlb_nslabs & ~(iotlb_nslabs-1); - } - - bytes = iotlb_nslabs * (1UL << IO_TLB_SHIFT); - - /* - * Get IO TLB memory from the low pages - */ - iotlb_virt_start = alloc_bootmem_low_pages(bytes); - if (!iotlb_virt_start) - panic("Cannot allocate SWIOTLB buffer!\n" - "Use dom0_mem Xen boot parameter to reserve\n" - "some DMA memory (e.g., dom0_mem=-128M).\n"); - - for (i = 0; i < iotlb_nslabs; i += IO_TLB_SEGSIZE) { - int rc = xen_create_contiguous_region( - (unsigned long)iotlb_virt_start + (i << IO_TLB_SHIFT), - get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT), - io_tlb_dma_bits); - BUG_ON(rc); - } - - /* - * Allocate and initialize the free list array. This array is used - * to find contiguous free memory regions of size up to IO_TLB_SEGSIZE. - */ - io_tlb_list = alloc_bootmem(iotlb_nslabs * sizeof(int)); - for (i = 0; i < iotlb_nslabs; i++) - io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE); - io_tlb_index = 0; - io_tlb_orig_addr = alloc_bootmem( - iotlb_nslabs * sizeof(*io_tlb_orig_addr)); - - /* - * Get the overflow emergency buffer - */ - io_tlb_overflow_buffer = alloc_bootmem_low(io_tlb_overflow); - - iotlb_pfn_start = __pa(iotlb_virt_start) >> PAGE_SHIFT; - iotlb_pfn_end = iotlb_pfn_start + (bytes >> PAGE_SHIFT); - - printk(KERN_INFO "Software IO TLB enabled: \n" - " Aperture: %lu megabytes\n" - " Kernel range: 0x%016lx - 0x%016lx\n" - " Address size: %u bits\n", - bytes >> 20, - (unsigned long)iotlb_virt_start, - (unsigned long)iotlb_virt_start + bytes, - io_tlb_dma_bits); -} - -void -swiotlb_init(void) -{ - long ram_end; - size_t defsz = 64 * (1 << 20); /* 64MB default size */ - - if (swiotlb_force == 1) { - swiotlb = 1; - } else if ((swiotlb_force != -1) && - is_running_on_xen() && - is_initial_xendomain()) { - /* Domain 0 always has a swiotlb. */ - ram_end = HYPERVISOR_memory_op(XENMEM_maximum_ram_page, NULL); - if (ram_end <= 0x7ffff) - defsz = 2 * (1 << 20); /* 2MB on <2GB on systems. */ - swiotlb = 1; - } - - if (swiotlb) - swiotlb_init_with_default_size(defsz); - else - printk(KERN_INFO "Software IO TLB disabled\n"); -} - -/* - * We use __copy_to_user_inatomic to transfer to the host buffer because the - * buffer may be mapped read-only (e.g, in blkback driver) but lower-level - * drivers map the buffer for DMA_BIDIRECTIONAL access. This causes an - * unnecessary copy from the aperture to the host buffer, and a page fault. - */ -static void -__sync_single(struct phys_addr buffer, char *dma_addr, size_t size, int dir) -{ - if (PageHighMem(buffer.page)) { - size_t len, bytes; - char *dev, *host, *kmp; - len = size; - while (len != 0) { - if (((bytes = len) + buffer.offset) > PAGE_SIZE) - bytes = PAGE_SIZE - buffer.offset; - kmp = kmap_atomic(buffer.page, KM_SWIOTLB); - dev = dma_addr + size - len; - host = kmp + buffer.offset; - if (dir == DMA_FROM_DEVICE) { - if (__copy_to_user_inatomic(host, dev, bytes)) - /* inaccessible */; - } else - memcpy(dev, host, bytes); - kunmap_atomic(kmp, KM_SWIOTLB); - len -= bytes; - buffer.page++; - buffer.offset = 0; - } - } else { - char *host = (char *)phys_to_virt( - page_to_pseudophys(buffer.page)) + buffer.offset; - if (dir == DMA_FROM_DEVICE) { - if (__copy_to_user_inatomic(host, dma_addr, size)) - /* inaccessible */; - } else if (dir == DMA_TO_DEVICE) - memcpy(dma_addr, host, size); - } -} - -/* - * Allocates bounce buffer and returns its kernel virtual address. - */ -static void * -map_single(struct device *hwdev, struct phys_addr buffer, size_t size, int dir) -{ - unsigned long flags; - char *dma_addr; - unsigned int nslots, stride, index, wrap; - int i; - - /* - * For mappings greater than a page, we limit the stride (and - * hence alignment) to a page size. - */ - nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT; - if (size > PAGE_SIZE) - stride = (1 << (PAGE_SHIFT - IO_TLB_SHIFT)); - else - stride = 1; - - BUG_ON(!nslots); - - /* - * Find suitable number of IO TLB entries size that will fit this - * request and allocate a buffer from that IO TLB pool. - */ - spin_lock_irqsave(&io_tlb_lock, flags); - { - wrap = index = ALIGN(io_tlb_index, stride); - - if (index >= iotlb_nslabs) - wrap = index = 0; - - do { - /* - * If we find a slot that indicates we have 'nslots' - * number of contiguous buffers, we allocate the - * buffers from that slot and mark the entries as '0' - * indicating unavailable. - */ - if (io_tlb_list[index] >= nslots) { - int count = 0; - - for (i = index; i < (int)(index + nslots); i++) - io_tlb_list[i] = 0; - for (i = index - 1; - (OFFSET(i, IO_TLB_SEGSIZE) != - IO_TLB_SEGSIZE -1) && io_tlb_list[i]; - i--) - io_tlb_list[i] = ++count; - dma_addr = iotlb_virt_start + - (index << IO_TLB_SHIFT); - - /* - * Update the indices to avoid searching in - * the next round. - */ - io_tlb_index = - ((index + nslots) < iotlb_nslabs - ? (index + nslots) : 0); - - goto found; - } - index += stride; - if (index >= iotlb_nslabs) - index = 0; - } while (index != wrap); - - spin_unlock_irqrestore(&io_tlb_lock, flags); - return NULL; - } - found: - spin_unlock_irqrestore(&io_tlb_lock, flags); - - /* - * Save away the mapping from the original address to the DMA address. - * This is needed when we sync the memory. Then we sync the buffer if - * needed. - */ - io_tlb_orig_addr[index] = buffer; - if ((dir == DMA_TO_DEVICE) || (dir == DMA_BIDIRECTIONAL)) - __sync_single(buffer, dma_addr, size, DMA_TO_DEVICE); - - return dma_addr; -} - -/* - * dma_addr is the kernel virtual address of the bounce buffer to unmap. - */ -static void -unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir) -{ - unsigned long flags; - int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT; - int index = (dma_addr - iotlb_virt_start) >> IO_TLB_SHIFT; - struct phys_addr buffer = io_tlb_orig_addr[index]; - - /* - * First, sync the memory before unmapping the entry - */ - if ((dir == DMA_FROM_DEVICE) || (dir == DMA_BIDIRECTIONAL)) - __sync_single(buffer, dma_addr, size, DMA_FROM_DEVICE); - - /* - * Return the buffer to the free list by setting the corresponding - * entries to indicate the number of contigous entries available. - * While returning the entries to the free list, we merge the entries - * with slots below and above the pool being returned. - */ - spin_lock_irqsave(&io_tlb_lock, flags); - { - count = ((index + nslots) < ALIGN(index + 1, IO_TLB_SEGSIZE) ? - io_tlb_list[index + nslots] : 0); - /* - * Step 1: return the slots to the free list, merging the - * slots with superceeding slots - */ - for (i = index + nslots - 1; i >= index; i--) - io_tlb_list[i] = ++count; - /* - * Step 2: merge the returned slots with the preceding slots, - * if available (non zero) - */ - for (i = index - 1; - (OFFSET(i, IO_TLB_SEGSIZE) != - IO_TLB_SEGSIZE -1) && io_tlb_list[i]; - i--) - io_tlb_list[i] = ++count; - } - spin_unlock_irqrestore(&io_tlb_lock, flags); -} - -static void -sync_single(struct device *hwdev, char *dma_addr, size_t size, int dir) -{ - int index = (dma_addr - iotlb_virt_start) >> IO_TLB_SHIFT; - struct phys_addr buffer = io_tlb_orig_addr[index]; - BUG_ON((dir != DMA_FROM_DEVICE) && (dir != DMA_TO_DEVICE)); - __sync_single(buffer, dma_addr, size, dir); -} - -static void -swiotlb_full(struct device *dev, size_t size, int dir, int do_panic) -{ - /* - * Ran out of IOMMU space for this operation. This is very bad. - * Unfortunately the drivers cannot handle this operation properly. - * unless they check for pci_dma_mapping_error (most don't) - * When the mapping is small enough return a static buffer to limit - * the damage, or panic when the transfer is too big. - */ - printk(KERN_ERR "PCI-DMA: Out of SW-IOMMU space for %lu bytes at " - "device %s\n", (unsigned long)size, dev ? dev->bus_id : "?"); - - if (size > io_tlb_overflow && do_panic) { - if (dir == PCI_DMA_FROMDEVICE || dir == PCI_DMA_BIDIRECTIONAL) - panic("PCI-DMA: Memory would be corrupted\n"); - if (dir == PCI_DMA_TODEVICE || dir == PCI_DMA_BIDIRECTIONAL) - panic("PCI-DMA: Random memory would be DMAed\n"); - } -} - -/* - * Map a single buffer of the indicated size for DMA in streaming mode. The - * PCI address to use is returned. - * - * Once the device is given the dma address, the device owns this memory until - * either swiotlb_unmap_single or swiotlb_dma_sync_single is performed. - */ -dma_addr_t -swiotlb_map_single(struct device *hwdev, void *ptr, size_t size, int dir) -{ - dma_addr_t dev_addr = virt_to_bus(ptr); - void *map; - struct phys_addr buffer; - - BUG_ON(dir == DMA_NONE); - - /* - * If the pointer passed in happens to be in the device's DMA window, - * we can safely return the device addr and not worry about bounce - * buffering it. - */ - if (!range_straddles_page_boundary(ptr, size) && - !address_needs_mapping(hwdev, dev_addr)) - return dev_addr; - - /* - * Oh well, have to allocate and map a bounce buffer. - */ - buffer.page = virt_to_page(ptr); - buffer.offset = (unsigned long)ptr & ~PAGE_MASK; - map = map_single(hwdev, buffer, size, dir); - if (!map) { - swiotlb_full(hwdev, size, dir, 1); - map = io_tlb_overflow_buffer; - } - - dev_addr = virt_to_bus(map); - return dev_addr; -} - -/* - * Unmap a single streaming mode DMA translation. The dma_addr and size must - * match what was provided for in a previous swiotlb_map_single call. All - * other usages are undefined. - * - * After this call, reads by the cpu to the buffer are guaranteed to see - * whatever the device wrote there. - */ -void -swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr, size_t size, - int dir) -{ - BUG_ON(dir == DMA_NONE); - if (in_swiotlb_aperture(dev_addr)) - unmap_single(hwdev, bus_to_virt(dev_addr), size, dir); -} - -/* - * Make physical memory consistent for a single streaming mode DMA translation - * after a transfer. - * - * If you perform a swiotlb_map_single() but wish to interrogate the buffer - * using the cpu, yet do not wish to teardown the PCI dma mapping, you must - * call this function before doing so. At the next point you give the PCI dma - * address back to the card, you must first perform a - * swiotlb_dma_sync_for_device, and then the device again owns the buffer - */ -void -swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr, - size_t size, int dir) -{ - BUG_ON(dir == DMA_NONE); - if (in_swiotlb_aperture(dev_addr)) - sync_single(hwdev, bus_to_virt(dev_addr), size, dir); -} - -void -swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr, - size_t size, int dir) -{ - BUG_ON(dir == DMA_NONE); - if (in_swiotlb_aperture(dev_addr)) - sync_single(hwdev, bus_to_virt(dev_addr), size, dir); -} - -/* - * Map a set of buffers described by scatterlist in streaming mode for DMA. - * This is the scatter-gather version of the above swiotlb_map_single - * interface. Here the scatter gather list elements are each tagged with the - * appropriate dma address and length. They are obtained via - * sg_dma_{address,length}(SG). - * - * NOTE: An implementation may be able to use a smaller number of - * DMA address/length pairs than there are SG table elements. - * (for example via virtual mapping capabilities) - * The routine returns the number of addr/length pairs actually - * used, at most nents. - * - * Device ownership issues as mentioned above for swiotlb_map_single are the - * same here. - */ -int -swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nelems, - int dir) -{ - struct phys_addr buffer; - dma_addr_t dev_addr; - char *map; - int i; - - BUG_ON(dir == DMA_NONE); - - for (i = 0; i < nelems; i++, sg++) { - dev_addr = SG_ENT_PHYS_ADDRESS(sg); - if (address_needs_mapping(hwdev, dev_addr)) { - buffer.page = sg->page; - buffer.offset = sg->offset; - map = map_single(hwdev, buffer, sg->length, dir); - if (!map) { - /* Don't panic here, we expect map_sg users - to do proper error handling. */ - swiotlb_full(hwdev, sg->length, dir, 0); - swiotlb_unmap_sg(hwdev, sg - i, i, dir); - sg[0].dma_length = 0; - return 0; - } - sg->dma_address = (dma_addr_t)virt_to_bus(map); - } else - sg->dma_address = dev_addr; - sg->dma_length = sg->length; - } - return nelems; -} - -/* - * Unmap a set of streaming mode DMA translations. Again, cpu read rules - * concerning calls here are the same as for swiotlb_unmap_single() above. - */ -void -swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nelems, - int dir) -{ - int i; - - BUG_ON(dir == DMA_NONE); - - for (i = 0; i < nelems; i++, sg++) - if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg)) - unmap_single(hwdev, - (void *)bus_to_virt(sg->dma_address), - sg->dma_length, dir); -} - -/* - * Make physical memory consistent for a set of streaming mode DMA translations - * after a transfer. - * - * The same as swiotlb_sync_single_* but for a scatter-gather list, same rules - * and usage. - */ -void -swiotlb_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg, - int nelems, int dir) -{ - int i; - - BUG_ON(dir == DMA_NONE); - - for (i = 0; i < nelems; i++, sg++) - if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg)) - sync_single(hwdev, - (void *)bus_to_virt(sg->dma_address), - sg->dma_length, dir); -} - -void -swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg, - int nelems, int dir) -{ - int i; - - BUG_ON(dir == DMA_NONE); - - for (i = 0; i < nelems; i++, sg++) - if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg)) - sync_single(hwdev, - (void *)bus_to_virt(sg->dma_address), - sg->dma_length, dir); -} - -dma_addr_t -swiotlb_map_page(struct device *hwdev, struct page *page, - unsigned long offset, size_t size, - enum dma_data_direction direction) -{ - struct phys_addr buffer; - dma_addr_t dev_addr; - char *map; - - dev_addr = page_to_bus(page) + offset; - if (address_needs_mapping(hwdev, dev_addr)) { - buffer.page = page; - buffer.offset = offset; - map = map_single(hwdev, buffer, size, direction); - if (!map) { - swiotlb_full(hwdev, size, direction, 1); - map = io_tlb_overflow_buffer; - } - dev_addr = (dma_addr_t)virt_to_bus(map); - } - - return dev_addr; -} - -void -swiotlb_unmap_page(struct device *hwdev, dma_addr_t dma_address, - size_t size, enum dma_data_direction direction) -{ - BUG_ON(direction == DMA_NONE); - if (in_swiotlb_aperture(dma_address)) - unmap_single(hwdev, bus_to_virt(dma_address), size, direction); -} - -int -swiotlb_dma_mapping_error(dma_addr_t dma_addr) -{ - return (dma_addr == virt_to_bus(io_tlb_overflow_buffer)); -} - -/* - * Return whether the given PCI device DMA address mask can be supported - * properly. For example, if your device can only drive the low 24-bits - * during PCI bus mastering, then you would pass 0x00ffffff as the mask to - * this function. - */ -int -swiotlb_dma_supported (struct device *hwdev, u64 mask) -{ - return (mask >= ((1UL << io_tlb_dma_bits) - 1)); -} - -EXPORT_SYMBOL(swiotlb_init); -EXPORT_SYMBOL(swiotlb_map_single); -EXPORT_SYMBOL(swiotlb_unmap_single); -EXPORT_SYMBOL(swiotlb_map_sg); -EXPORT_SYMBOL(swiotlb_unmap_sg); -EXPORT_SYMBOL(swiotlb_sync_single_for_cpu); -EXPORT_SYMBOL(swiotlb_sync_single_for_device); -EXPORT_SYMBOL(swiotlb_sync_sg_for_cpu); -EXPORT_SYMBOL(swiotlb_sync_sg_for_device); -EXPORT_SYMBOL(swiotlb_map_page); -EXPORT_SYMBOL(swiotlb_unmap_page); -EXPORT_SYMBOL(swiotlb_dma_mapping_error); -EXPORT_SYMBOL(swiotlb_dma_supported); Index: sle10-sp1-2006-12-18/arch/i386/kernel/pci-dma-xen.c =================================================================== --- sle10-sp1-2006-12-18.orig/arch/i386/kernel/pci-dma-xen.c 2006-12-20 15:53:32.000000000 +0100 +++ sle10-sp1-2006-12-18/arch/i386/kernel/pci-dma-xen.c 2006-12-20 14:06:09.000000000 +0100 @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #ifdef __x86_64__ @@ -93,13 +93,7 @@ dma_unmap_sg(struct device *hwdev, struc } EXPORT_SYMBOL(dma_unmap_sg); -/* - * XXX This file is also used by xenLinux/ia64. - * "defined(__i386__) || defined (__x86_64__)" means "!defined(__ia64__)". - * This #if work around should be removed once this file is merbed back into - * i386' pci-dma or is moved to drivers/xen/core. - */ -#if defined(__i386__) || defined(__x86_64__) +#ifdef CONFIG_HIGHMEM dma_addr_t dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction direction) @@ -129,7 +123,7 @@ dma_unmap_page(struct device *dev, dma_a swiotlb_unmap_page(dev, dma_address, size, direction); } EXPORT_SYMBOL(dma_unmap_page); -#endif /* defined(__i386__) || defined(__x86_64__) */ +#endif /* CONFIG_HIGHMEM */ int dma_mapping_error(dma_addr_t dma_addr) Index: sle10-sp1-2006-12-18/include/asm-i386/mach-xen/asm/dma-mapping.h =================================================================== --- sle10-sp1-2006-12-18.orig/include/asm-i386/mach-xen/asm/dma-mapping.h 2006-12-20 15:53:32.000000000 +0100 +++ sle10-sp1-2006-12-18/include/asm-i386/mach-xen/asm/dma-mapping.h 2006-12-20 14:06:09.000000000 +0100 @@ -24,7 +24,7 @@ address_needs_mapping(struct device *hwd } static inline int -range_straddles_page_boundary(void *p, size_t size) +range_straddles_page_boundary(const void *p, size_t size) { extern unsigned long *contiguous_bitmap; return (((((unsigned long)p & ~PAGE_MASK) + size) > PAGE_SIZE) && @@ -53,6 +53,7 @@ extern int dma_map_sg(struct device *hwd extern void dma_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents, enum dma_data_direction direction); +#ifdef CONFIG_HIGHMEM extern dma_addr_t dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction direction); @@ -60,6 +61,11 @@ dma_map_page(struct device *dev, struct extern void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, enum dma_data_direction direction); +#else +#define dma_map_page(dev, page, offset, size, dir) \ + dma_map_single(dev, page_address(page) + (offset), (size), (dir)) +#define dma_unmap_page dma_unmap_single +#endif extern void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size, Index: sle10-sp1-2006-12-18/include/asm-i386/mach-xen/asm/swiotlb.h =================================================================== --- sle10-sp1-2006-12-18.orig/include/asm-i386/mach-xen/asm/swiotlb.h 2006-12-20 15:53:32.000000000 +0100 +++ sle10-sp1-2006-12-18/include/asm-i386/mach-xen/asm/swiotlb.h 2006-12-20 14:04:33.000000000 +0100 @@ -1,43 +1,18 @@ -#ifndef _ASM_SWIOTLB_H -#define _ASM_SWIOTLB_H 1 +#ifndef _ASM_XEN_SWIOTLB_H +#define _ASM_XEN_SWIOTLB_H 1 -#include +#include -/* SWIOTLB interface */ +#ifdef CONFIG_HIGHMEM + +#define SG_ENT_PHYS_ADDRESS(sg) (page_to_bus((sg)->page) + (sg)->offset) -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); -#ifdef CONFIG_SWIOTLB -extern int swiotlb; -#else -#define swiotlb 0 #endif #endif Index: sle10-sp1-2006-12-18/include/asm-ia64/swiotlb.h =================================================================== --- sle10-sp1-2006-12-18.orig/include/asm-ia64/swiotlb.h 2006-12-20 15:54:48.000000000 +0100 +++ sle10-sp1-2006-12-18/include/asm-ia64/swiotlb.h 2006-12-20 16:07:27.000000000 +0100 @@ -1,8 +1,16 @@ #ifndef _ASM_SWIOTLB_H #define _ASM_SWIOTLB_H 1 +#include + +#ifndef CONFIG_XEN + #include #define SWIOTLB_ARCH_WANT_LATE_INIT +#else +#include +#endif + #endif /* _ASM_SWIOTLB_H */ Index: sle10-sp1-2006-12-18/include/asm-x86_64/mach-xen/asm/swiotlb.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ sle10-sp1-2006-12-18/include/asm-x86_64/mach-xen/asm/swiotlb.h 2006-12-20 16:07:36.000000000 +0100 @@ -0,0 +1 @@ +#include Index: sle10-sp1-2006-12-18/include/asm-x86_64/swiotlb.h =================================================================== --- sle10-sp1-2006-12-18.orig/include/asm-x86_64/swiotlb.h 2006-12-20 15:53:57.000000000 +0100 +++ sle10-sp1-2006-12-18/include/asm-x86_64/swiotlb.h 2006-12-20 15:55:44.000000000 +0100 @@ -43,14 +43,6 @@ extern void swiotlb_free_coherent (struc extern int swiotlb_dma_supported(struct device *hwdev, u64 mask); extern void swiotlb_init(void); -#ifdef CONFIG_XEN -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); -#endif - #ifdef CONFIG_SWIOTLB extern int swiotlb; #else Index: sle10-sp1-2006-12-18/include/xen/swiotlb.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ sle10-sp1-2006-12-18/include/xen/swiotlb.h 2006-12-20 15:37:50.000000000 +0100 @@ -0,0 +1,169 @@ +/* + * Copyright (C) 2005 Keir Fraser + */ + +#ifndef _XEN_SWIOTLB_H +#define _XEN_SWIOTLB_H 1 + +#include +#include +#include +#include + +/* Width of DMA addresses in the IO TLB. 30 bits is a b44 limitation. */ +#define DEFAULT_IO_TLB_DMA_BITS 30 + +#define SWIOTLB_EXTRA_VARIABLES \ +int swiotlb; \ +static unsigned int io_tlb_dma_bits = DEFAULT_IO_TLB_DMA_BITS; \ +static int __init setup_io_tlb_bits(char *str) \ +{ \ + io_tlb_dma_bits = simple_strtoul(str, NULL, 0); \ + return 0; \ +} \ +__setup("swiotlb_bits=", setup_io_tlb_bits); \ +static int __init setup_io_tlb_npages(char *str) \ +{ \ + if (isdigit(*str)) { \ + io_tlb_nslabs = simple_strtoul(str, &str, 0); \ + /* Unlike ia64, the size is aperture in megabytes, not 'slabs'! */ \ + io_tlb_nslabs <<= (20 - IO_TLB_SHIFT); \ + /* avoid tail segment of size < IO_TLB_SEGSIZE */ \ + io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE); \ + } \ + if (*str == ',') \ + ++str; \ + /* \ + * NB. 'force' enables the swiotlb, but doesn't force its use for \ + * every DMA like it does on native Linux. 'off' forcibly disables \ + * use of the swiotlb. \ + */ \ + if (!strcmp(str, "force")) \ + swiotlb_force = 1; \ + else if (!strcmp(str, "off")) \ + swiotlb_force = -1; \ + return 1; \ +} \ +/* \ + * We use __copy_to_user_inatomic to transfer to the host buffer because the \ + * buffer may be mapped read-only (e.g, in blkback driver) but lower-level \ + * drivers map the buffer for DMA_BIDIRECTIONAL access. This causes an \ + * unnecessary copy from the aperture to the host buffer, and a page fault. \ + */ \ +static inline void \ +__swiotlb_arch_sync_single(io_tlb_addr_t buffer, char *dma_addr, size_t size, int dir) \ +{ \ + if (PageHighMem(buffer.page)) { \ + size_t len, bytes; \ + char *dev, *host, *kmp; \ + len = size; \ + while (len != 0) { \ + if (((bytes = len) + buffer.offset) > PAGE_SIZE) \ + bytes = PAGE_SIZE - buffer.offset; \ + kmp = kmap_atomic(buffer.page, KM_SWIOTLB); \ + dev = dma_addr + size - len; \ + host = kmp + buffer.offset; \ + if (dir == DMA_FROM_DEVICE) { \ + if (__copy_to_user_inatomic(host, dev, bytes)) \ + /* inaccessible */; \ + } else \ + memcpy(dev, host, bytes); \ + kunmap_atomic(kmp, KM_SWIOTLB); \ + len -= bytes; \ + buffer.page++; \ + buffer.offset = 0; \ + } \ + } else { \ + char *host = (char *)phys_to_virt( \ + page_to_pseudophys(buffer.page)) + buffer.offset; \ + if (dir == DMA_FROM_DEVICE) { \ + if (__copy_to_user_inatomic(host, dma_addr, size)) \ + /* inaccessible */; \ + } else if (dir == DMA_TO_DEVICE) \ + memcpy(dma_addr, host, size); \ + } \ +} \ +EXPORT_SYMBOL(swiotlb) +#define SWIOTLB_ARCH_HAS_SETUP_IO_TLB_NPAGES +#define SWIOTLB_ARCH_HAS_SYNC_SINGLE + +#define swiotlb_adjust_size(size) do { \ + /* Round up to power of two (xen_create_contiguous_region). */ \ + while (size & (size - 1)) \ + size += size & ~(size - 1); \ +} while (0) + +#define swiotlb_adjust_seg(start, size) do { \ + int rc = xen_create_contiguous_region( \ + (unsigned long)(start), \ + get_order(size), \ + io_tlb_dma_bits); \ + BUG_ON(rc); \ +} while (0) + +#define swiotlb_print_info(bytes) \ + printk(KERN_INFO "Software IO TLB enabled: \n" \ + " Aperture: %lu megabytes\n" \ + " Kernel range: 0x%016lx - 0x%016lx\n" \ + " Address size: %u bits\n", \ + bytes >> 20, \ + (unsigned long)io_tlb_start, \ + (unsigned long)io_tlb_end, \ + io_tlb_dma_bits) + +typedef struct { + struct page *page; + unsigned int offset; +} io_tlb_addr_t; +#define SWIOTLB_ARCH_HAS_IO_TLB_ADDR_T +#define swiotlb_orig_addr_null(buffer) (!(buffer).page) +#define ptr_to_io_tlb_addr(ptr) ({ \ + io_tlb_addr_t __buf; \ + if (ptr) \ + __buf.page = virt_to_page(ptr); \ + else \ + __buf.page = NULL; \ + __buf.offset = (unsigned long)(ptr) & ~PAGE_MASK; \ + __buf; \ +}) +#define page_to_io_tlb_addr(pg, off) ({ \ + io_tlb_addr_t __buf; \ + __buf.page = pg; \ + __buf.offset = off; \ + __buf; \ +}) +#define sg_to_io_tlb_addr(sg) ({ \ + io_tlb_addr_t __buf; \ + __buf.page = (sg)->page; \ + __buf.offset = (sg)->offset; \ + __buf; \ +}) + +#define __swiotlb_init_with_default_size(defsz) do { \ + size_t size = (defsz); \ + if (swiotlb_force == 1) { \ + swiotlb = 1; \ + } else if ((swiotlb_force != -1) && \ + is_running_on_xen() && \ + is_initial_xendomain()) { \ + /* Domain 0 always has a swiotlb. */ \ + long ram_end = HYPERVISOR_memory_op(XENMEM_maximum_ram_page, NULL); \ + if (ram_end <= 0x7ffff) \ + size = 2 * (1 << 20); /* 2MB on <2GB on systems. */ \ + swiotlb = 1; \ + } \ + if (swiotlb) \ + swiotlb_init_with_default_size(size); \ + else \ + printk(KERN_INFO "Software IO TLB disabled\n"); \ +} while(0) + +#define range_needs_mapping range_straddles_page_boundary +#define order_needs_mapping(order) ((order) != 0) +#define SWIOTLB_ARCH_HAS_NEEDS_MAPPING + +#define SWIOTLB_ARCH_NEED_MAP_PAGE + +#define __swiotlb_dma_supported(hwdev, mask) ((mask) >= ((1UL << io_tlb_dma_bits) - 1)) + +#endif /* _XEN_SWTIOLB_H */ Index: sle10-sp1-2006-12-18/lib/Makefile =================================================================== --- sle10-sp1-2006-12-18.orig/lib/Makefile 2006-12-20 15:53:32.000000000 +0100 +++ sle10-sp1-2006-12-18/lib/Makefile 2006-12-20 15:45:20.000000000 +0100 @@ -49,7 +49,6 @@ obj-$(CONFIG_SGRB) += sgrb.o obj-$(CONFIG_STATISTICS) += statistic.o obj-$(CONFIG_SWIOTLB) += swiotlb.o -swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o hostprogs-y := gen_crc32table clean-files := crc32table.h