Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Documentation: move DMA-mapping.txt to Doc/PCI/

Move DMA-mapping.txt to Documentation/PCI/.

DMA-mapping.txt was supposed to be moved from Documentation/ to
Documentation/PCI/. The 00-INDEX files in those two directories
were updated, along with a few other text files, but the file
itself somehow escaped being moved, so move it and update more
text files and source files with its new location.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Randy Dunlap and committed by
Linus Torvalds
5872fb94 ca493d17

+35 -33
+1 -1
Documentation/DMA-API.txt
··· 5 5 6 6 This document describes the DMA API. For a more gentle introduction 7 7 phrased in terms of the pci_ equivalents (and actual examples) see 8 - DMA-mapping.txt 8 + Documentation/PCI/PCI-DMA-mapping.txt. 9 9 10 10 This API is split into two pieces. Part I describes the API and the 11 11 corresponding pci_ API. Part II describes the extensions to the API
+2 -2
Documentation/IO-mapping.txt
··· 1 1 [ NOTE: The virt_to_bus() and bus_to_virt() functions have been 2 - superseded by the functionality provided by the PCI DMA 3 - interface (see Documentation/DMA-mapping.txt). They continue 2 + superseded by the functionality provided by the PCI DMA interface 3 + (see Documentation/PCI/PCI-DMA-mapping.txt). They continue 4 4 to be documented below for historical purposes, but new code 5 5 must not use them. --davidm 00/12/12 ] 6 6
+3 -2
Documentation/block/biodoc.txt
··· 186 186 do not have a corresponding kernel virtual address space mapping) and 187 187 low-memory pages. 188 188 189 - Note: Please refer to DMA-mapping.txt for a discussion on PCI high mem DMA 190 - aspects and mapping of scatter gather lists, and support for 64 bit PCI. 189 + Note: Please refer to Documentation/PCI/PCI-DMA-mapping.txt for a discussion 190 + on PCI high mem DMA aspects and mapping of scatter gather lists, and support 191 + for 64 bit PCI. 191 192 192 193 Special handling is required only for cases where i/o needs to happen on 193 194 pages at physical memory addresses beyond what the device can support. In these
+6 -5
Documentation/usb/dma.txt
··· 6 6 API OVERVIEW 7 7 8 8 The big picture is that USB drivers can continue to ignore most DMA issues, 9 - though they still must provide DMA-ready buffers (see DMA-mapping.txt). 10 - That's how they've worked through the 2.4 (and earlier) kernels. 9 + though they still must provide DMA-ready buffers (see 10 + Documentation/PCI/PCI-DMA-mapping.txt). That's how they've worked through 11 + the 2.4 (and earlier) kernels. 11 12 12 13 OR: they can now be DMA-aware. 13 14 ··· 63 62 force a consistent memory access ordering by using memory barriers. It's 64 63 not using a streaming DMA mapping, so it's good for small transfers on 65 64 systems where the I/O would otherwise thrash an IOMMU mapping. (See 66 - Documentation/DMA-mapping.txt for definitions of "coherent" and "streaming" 67 - DMA mappings.) 65 + Documentation/PCI/PCI-DMA-mapping.txt for definitions of "coherent" and 66 + "streaming" DMA mappings.) 68 67 69 68 Asking for 1/Nth of a page (as well as asking for N pages) is reasonably 70 69 space-efficient. ··· 94 93 Existing buffers aren't usable for DMA without first being mapped into the 95 94 DMA address space of the device. However, most buffers passed to your 96 95 driver can safely be used with such DMA mapping. (See the first section 97 - of DMA-mapping.txt, titled "What memory is DMA-able?") 96 + of Documentation/PCI/PCI-DMA-mapping.txt, titled "What memory is DMA-able?") 98 97 99 98 - When you're using scatterlists, you can map everything at once. On some 100 99 systems, this kicks in an IOMMU and turns the scatterlists into single
+6 -6
arch/ia64/hp/common/sba_iommu.c
··· 906 906 * @dir: R/W or both. 907 907 * @attrs: optional dma attributes 908 908 * 909 - * See Documentation/DMA-mapping.txt 909 + * See Documentation/PCI/PCI-DMA-mapping.txt 910 910 */ 911 911 dma_addr_t 912 912 sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir, ··· 1024 1024 * @dir: R/W or both. 1025 1025 * @attrs: optional dma attributes 1026 1026 * 1027 - * See Documentation/DMA-mapping.txt 1027 + * See Documentation/PCI/PCI-DMA-mapping.txt 1028 1028 */ 1029 1029 void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size, 1030 1030 int dir, struct dma_attrs *attrs) ··· 1102 1102 * @size: number of bytes mapped in driver buffer. 1103 1103 * @dma_handle: IOVA of new buffer. 1104 1104 * 1105 - * See Documentation/DMA-mapping.txt 1105 + * See Documentation/PCI/PCI-DMA-mapping.txt 1106 1106 */ 1107 1107 void * 1108 1108 sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) ··· 1165 1165 * @vaddr: virtual address IOVA of "consistent" buffer. 1166 1166 * @dma_handler: IO virtual address of "consistent" buffer. 1167 1167 * 1168 - * See Documentation/DMA-mapping.txt 1168 + * See Documentation/PCI/PCI-DMA-mapping.txt 1169 1169 */ 1170 1170 void sba_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) 1171 1171 { ··· 1420 1420 * @dir: R/W or both. 1421 1421 * @attrs: optional dma attributes 1422 1422 * 1423 - * See Documentation/DMA-mapping.txt 1423 + * See Documentation/PCI/PCI-DMA-mapping.txt 1424 1424 */ 1425 1425 int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents, 1426 1426 int dir, struct dma_attrs *attrs) ··· 1512 1512 * @dir: R/W or both. 1513 1513 * @attrs: optional dma attributes 1514 1514 * 1515 - * See Documentation/DMA-mapping.txt 1515 + * See Documentation/PCI/PCI-DMA-mapping.txt 1516 1516 */ 1517 1517 void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist, 1518 1518 int nents, int dir, struct dma_attrs *attrs)
+1 -1
arch/parisc/include/asm/dma-mapping.h
··· 5 5 #include <asm/cacheflush.h> 6 6 #include <asm/scatterlist.h> 7 7 8 - /* See Documentation/DMA-mapping.txt */ 8 + /* See Documentation/PCI/PCI-DMA-mapping.txt */ 9 9 struct hppa_dma_ops { 10 10 int (*dma_supported)(struct device *dev, u64 mask); 11 11 void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *iova, gfp_t flag);
+1 -1
arch/parisc/kernel/pci-dma.c
··· 2 2 ** PARISC 1.1 Dynamic DMA mapping support. 3 3 ** This implementation is for PA-RISC platforms that do not support 4 4 ** I/O TLBs (aka DMA address translation hardware). 5 - ** See Documentation/DMA-mapping.txt for interface definitions. 5 + ** See Documentation/PCI/PCI-DMA-mapping.txt for interface definitions. 6 6 ** 7 7 ** (c) Copyright 1999,2000 Hewlett-Packard Company 8 8 ** (c) Copyright 2000 Grant Grundler
+2 -2
arch/x86/include/asm/dma-mapping.h
··· 2 2 #define _ASM_X86_DMA_MAPPING_H 3 3 4 4 /* 5 - * IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for 6 - * documentation. 5 + * IOMMU interface. See Documentation/PCI/PCI-DMA-mapping.txt and 6 + * Documentation/DMA-API.txt for documentation. 7 7 */ 8 8 9 9 #include <linux/scatterlist.h>
+1 -1
arch/x86/kernel/pci-gart_64.c
··· 5 5 * This allows to use PCI devices that only support 32bit addresses on systems 6 6 * with more than 4GB. 7 7 * 8 - * See Documentation/DMA-mapping.txt for the interface specification. 8 + * See Documentation/PCI/PCI-DMA-mapping.txt for the interface specification. 9 9 * 10 10 * Copyright 2002 Andi Kleen, SuSE Labs. 11 11 * Subject to the GNU General Public License v2 only.
+9 -9
drivers/parisc/sba_iommu.c
··· 668 668 * @dev: instance of PCI owned by the driver that's asking 669 669 * @mask: number of address bits this PCI device can handle 670 670 * 671 - * See Documentation/DMA-mapping.txt 671 + * See Documentation/PCI/PCI-DMA-mapping.txt 672 672 */ 673 673 static int sba_dma_supported( struct device *dev, u64 mask) 674 674 { ··· 680 680 return(0); 681 681 } 682 682 683 - /* Documentation/DMA-mapping.txt tells drivers to try 64-bit first, 684 - * then fall back to 32-bit if that fails. 683 + /* Documentation/PCI/PCI-DMA-mapping.txt tells drivers to try 64-bit 684 + * first, then fall back to 32-bit if that fails. 685 685 * We are just "encouraging" 32-bit DMA masks here since we can 686 686 * never allow IOMMU bypass unless we add special support for ZX1. 687 687 */ ··· 706 706 * @size: number of bytes to map in driver buffer. 707 707 * @direction: R/W or both. 708 708 * 709 - * See Documentation/DMA-mapping.txt 709 + * See Documentation/PCI/PCI-DMA-mapping.txt 710 710 */ 711 711 static dma_addr_t 712 712 sba_map_single(struct device *dev, void *addr, size_t size, ··· 785 785 * @size: number of bytes mapped in driver buffer. 786 786 * @direction: R/W or both. 787 787 * 788 - * See Documentation/DMA-mapping.txt 788 + * See Documentation/PCI/PCI-DMA-mapping.txt 789 789 */ 790 790 static void 791 791 sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, ··· 861 861 * @size: number of bytes mapped in driver buffer. 862 862 * @dma_handle: IOVA of new buffer. 863 863 * 864 - * See Documentation/DMA-mapping.txt 864 + * See Documentation/PCI/PCI-DMA-mapping.txt 865 865 */ 866 866 static void *sba_alloc_consistent(struct device *hwdev, size_t size, 867 867 dma_addr_t *dma_handle, gfp_t gfp) ··· 892 892 * @vaddr: virtual address IOVA of "consistent" buffer. 893 893 * @dma_handler: IO virtual address of "consistent" buffer. 894 894 * 895 - * See Documentation/DMA-mapping.txt 895 + * See Documentation/PCI/PCI-DMA-mapping.txt 896 896 */ 897 897 static void 898 898 sba_free_consistent(struct device *hwdev, size_t size, void *vaddr, ··· 927 927 * @nents: number of entries in list 928 928 * @direction: R/W or both. 929 929 * 930 - * See Documentation/DMA-mapping.txt 930 + * See Documentation/PCI/PCI-DMA-mapping.txt 931 931 */ 932 932 static int 933 933 sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, ··· 1011 1011 * @nents: number of entries in list 1012 1012 * @direction: R/W or both. 1013 1013 * 1014 - * See Documentation/DMA-mapping.txt 1014 + * See Documentation/PCI/PCI-DMA-mapping.txt 1015 1015 */ 1016 1016 static void 1017 1017 sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
+2 -2
drivers/staging/altpciechdma/altpciechdma.c
··· 531 531 goto fail; 532 532 533 533 /* allocate and map coherently-cached memory for a DMA-able buffer */ 534 - /* @see 2.6.26.2/Documentation/DMA-mapping.txt line 318 */ 534 + /* @see Documentation/PCI/PCI-DMA-mapping.txt, near line 318 */ 535 535 buffer_virt = (u8 *)pci_alloc_consistent(dev, PAGE_SIZE * 4, &buffer_bus); 536 536 if (!buffer_virt) { 537 537 printk(KERN_DEBUG "Could not allocate coherent DMA buffer.\n"); ··· 846 846 847 847 #if 1 // @todo For now, disable 64-bit, because I do not understand the implications (DAC!) 848 848 /* query for DMA transfer */ 849 - /* @see Documentation/DMA-mapping.txt */ 849 + /* @see Documentation/PCI/PCI-DMA-mapping.txt */ 850 850 if (!pci_set_dma_mask(dev, DMA_64BIT_MASK)) { 851 851 pci_set_consistent_dma_mask(dev, DMA_64BIT_MASK); 852 852 /* use 64-bit DMA */
+1 -1
include/media/videobuf-dma-sg.h
··· 49 49 * does memory allocation too using vmalloc_32(). 50 50 * 51 51 * videobuf_dma_*() 52 - * see Documentation/DMA-mapping.txt, these functions to 52 + * see Documentation/PCI/PCI-DMA-mapping.txt, these functions to 53 53 * basically the same. The map function does also build a 54 54 * scatterlist for the buffer (and unmap frees it ...) 55 55 *