Skip to content

Commit 1d9b9f6

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits) x86/PCI: use dev_printk when possible PCI: add D3 power state avoidance quirk PCI: fix bogus "'device' may be used uninitialized" warning in pci_slot PCI: add an option to allow ASPM enabled forcibly PCI: disable ASPM on pre-1.1 PCIe devices PCI: disable ASPM per ACPI FADT setting PCI MSI: Don't disable MSIs if the mask bit isn't supported PCI: handle 64-bit resources better on 32-bit machines PCI: rewrite PCI BAR reading code PCI: document pci_target_state PCI hotplug: fix typo in pcie hotplug output x86 gart: replace to_pages macro with iommu_num_pages x86, AMD IOMMU: replace to_pages macro with iommu_num_pages iommu: add iommu_num_pages helper function dma-coherent: add documentation to new interfaces Cris: convert to using generic dma-coherent mem allocator Sh: use generic per-device coherent dma allocator ARM: support generic per-device coherent dma mem Generic dma-coherent: fix DMA_MEMORY_EXCLUSIVE x86: use generic per-device dma coherent allocator ...
2 parents a3ad7f1 + 12c0b20 commit 1d9b9f6

File tree

36 files changed

+512
-568
lines changed

36 files changed

+512
-568
lines changed

‎arch/arm/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ config ARM
1717
select HAVE_KRETPROBES if (HAVE_KPROBES)
1818
select HAVE_FTRACE if (!XIP_KERNEL)
1919
select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)
20+
select HAVE_GENERIC_DMA_COHERENT
2021
help
2122
The ARM series is a line of low-power-consumption RISC chip designs
2223
licensed by ARM Ltd and targeted at embedded applications and

‎arch/arm/mm/consistent.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,11 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp,
274274
void *
275275
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)
276276
{
277+
void *memory;
278+
279+
if (dma_alloc_from_coherent(dev, size, handle, &memory))
280+
return memory;
281+
277282
if (arch_is_coherent()) {
278283
void *virt;
279284

@@ -362,6 +367,9 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr
362367

363368
WARN_ON(irqs_disabled());
364369

370+
if (dma_release_from_coherent(dev, get_order(size), cpu_addr))
371+
return;
372+
365373
if (arch_is_coherent()) {
366374
kfree(cpu_addr);
367375
return;

‎arch/cris/arch-v32/drivers/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,7 @@ config PCI
641641
bool
642642
depends on ETRAX_CARDBUS
643643
default y
644+
select HAVE_GENERIC_DMA_COHERENT
644645

645646
config ETRAX_IOP_FW_LOAD
646647
tristate "IO-processor hotplug firmware loading support"

‎arch/cris/arch-v32/drivers/pci/dma.c‎

Lines changed: 3 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,16 @@
1515
#include <linux/pci.h>
1616
#include <asm/io.h>
1717

18-
struct dma_coherent_mem {
19-
void *virt_base;
20-
u32 device_base;
21-
int size;
22-
int flags;
23-
unsigned long *bitmap;
24-
};
25-
2618
void *dma_alloc_coherent(struct device *dev, size_t size,
2719
dma_addr_t *dma_handle, gfp_t gfp)
2820
{
2921
void *ret;
30-
struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
3122
int order = get_order(size);
3223
/* ignore region specifiers */
3324
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
3425

35-
if (mem) {
36-
int page = bitmap_find_free_region(mem->bitmap, mem->size,
37-
order);
38-
if (page >= 0) {
39-
*dma_handle = mem->device_base + (page << PAGE_SHIFT);
40-
ret = mem->virt_base + (page << PAGE_SHIFT);
41-
memset(ret, 0, size);
42-
return ret;
43-
}
44-
if (mem->flags & DMA_MEMORY_EXCLUSIVE)
45-
return NULL;
46-
}
26+
if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
27+
return ret;
4728

4829
if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
4930
gfp |= GFP_DMA;
@@ -60,90 +41,9 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
6041
void dma_free_coherent(struct device *dev, size_t size,
6142
void *vaddr, dma_addr_t dma_handle)
6243
{
63-
struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
6444
int order = get_order(size);
6545

66-
if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {
67-
int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
68-
69-
bitmap_release_region(mem->bitmap, page, order);
70-
} else
46+
if (!dma_release_from_coherent(dev, order, vaddr))
7147
free_pages((unsigned long)vaddr, order);
7248
}
7349

74-
int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
75-
dma_addr_t device_addr, size_t size, int flags)
76-
{
77-
void __iomem *mem_base;
78-
int pages = size >> PAGE_SHIFT;
79-
int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);
80-
81-
if ((flags & (DMA_MEMORY_MAP | DMA_MEMORY_IO)) == 0)
82-
goto out;
83-
if (!size)
84-
goto out;
85-
if (dev->dma_mem)
86-
goto out;
87-
88-
/* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */
89-
90-
mem_base = ioremap(bus_addr, size);
91-
if (!mem_base)
92-
goto out;
93-
94-
dev->dma_mem = kzalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
95-
if (!dev->dma_mem)
96-
goto iounmap_out;
97-
dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
98-
if (!dev->dma_mem->bitmap)
99-
goto free1_out;
100-
101-
dev->dma_mem->virt_base = mem_base;
102-
dev->dma_mem->device_base = device_addr;
103-
dev->dma_mem->size = pages;
104-
dev->dma_mem->flags = flags;
105-
106-
if (flags & DMA_MEMORY_MAP)
107-
return DMA_MEMORY_MAP;
108-
109-
return DMA_MEMORY_IO;
110-
111-
free1_out:
112-
kfree(dev->dma_mem);
113-
iounmap_out:
114-
iounmap(mem_base);
115-
out:
116-
return 0;
117-
}
118-
EXPORT_SYMBOL(dma_declare_coherent_memory);
119-
120-
void dma_release_declared_memory(struct device *dev)
121-
{
122-
struct dma_coherent_mem *mem = dev->dma_mem;
123-
124-
if(!mem)
125-
return;
126-
dev->dma_mem = NULL;
127-
iounmap(mem->virt_base);
128-
kfree(mem->bitmap);
129-
kfree(mem);
130-
}
131-
EXPORT_SYMBOL(dma_release_declared_memory);
132-
133-
void *dma_mark_declared_memory_occupied(struct device *dev,
134-
dma_addr_t device_addr, size_t size)
135-
{
136-
struct dma_coherent_mem *mem = dev->dma_mem;
137-
int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1) >> PAGE_SHIFT;
138-
int pos, err;
139-
140-
if (!mem)
141-
return ERR_PTR(-EINVAL);
142-
143-
pos = (device_addr - mem->device_base) >> PAGE_SHIFT;
144-
err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));
145-
if (err != 0)
146-
return ERR_PTR(err);
147-
return mem->virt_base + (pos << PAGE_SHIFT);
148-
}
149-
EXPORT_SYMBOL(dma_mark_declared_memory_occupied);

‎arch/sh/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ config SUPERH
1111
select HAVE_CLK
1212
select HAVE_IDE
1313
select HAVE_OPROFILE
14+
select HAVE_GENERIC_DMA_COHERENT
1415
help
1516
The SuperH is a RISC processor targeted for use in embedded systems
1617
and consumer electronics; it was also used in the Sega Dreamcast

‎arch/sh/mm/consistent.c‎

Lines changed: 3 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,10 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
2828
dma_addr_t *dma_handle, gfp_t gfp)
2929
{
3030
void *ret, *ret_nocache;
31-
struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
3231
int order = get_order(size);
3332

34-
if (mem) {
35-
int page = bitmap_find_free_region(mem->bitmap, mem->size,
36-
order);
37-
if (page >= 0) {
38-
*dma_handle = mem->device_base + (page << PAGE_SHIFT);
39-
ret = mem->virt_base + (page << PAGE_SHIFT);
40-
memset(ret, 0, size);
41-
return ret;
42-
}
43-
if (mem->flags & DMA_MEMORY_EXCLUSIVE)
44-
return NULL;
45-
}
33+
if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
34+
return ret;
4635

4736
ret = (void *)__get_free_pages(gfp, order);
4837
if (!ret)
@@ -72,11 +61,7 @@ void dma_free_coherent(struct device *dev, size_t size,
7261
struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
7362
int order = get_order(size);
7463

75-
if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {
76-
int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
77-
78-
bitmap_release_region(mem->bitmap, page, order);
79-
} else {
64+
if (!dma_release_from_coherent(dev, order, vaddr)) {
8065
WARN_ON(irqs_disabled()); /* for portability */
8166
BUG_ON(mem && mem->flags & DMA_MEMORY_EXCLUSIVE);
8267
free_pages((unsigned long)phys_to_virt(dma_handle), order);
@@ -85,83 +70,6 @@ void dma_free_coherent(struct device *dev, size_t size,
8570
}
8671
EXPORT_SYMBOL(dma_free_coherent);
8772

88-
int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
89-
dma_addr_t device_addr, size_t size, int flags)
90-
{
91-
void __iomem *mem_base = NULL;
92-
int pages = size >> PAGE_SHIFT;
93-
int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);
94-
95-
if ((flags & (DMA_MEMORY_MAP | DMA_MEMORY_IO)) == 0)
96-
goto out;
97-
if (!size)
98-
goto out;
99-
if (dev->dma_mem)
100-
goto out;
101-
102-
/* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */
103-
104-
mem_base = ioremap_nocache(bus_addr, size);
105-
if (!mem_base)
106-
goto out;
107-
108-
dev->dma_mem = kmalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
109-
if (!dev->dma_mem)
110-
goto out;
111-
dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
112-
if (!dev->dma_mem->bitmap)
113-
goto free1_out;
114-
115-
dev->dma_mem->virt_base = mem_base;
116-
dev->dma_mem->device_base = device_addr;
117-
dev->dma_mem->size = pages;
118-
dev->dma_mem->flags = flags;
119-
120-
if (flags & DMA_MEMORY_MAP)
121-
return DMA_MEMORY_MAP;
122-
123-
return DMA_MEMORY_IO;
124-
125-
free1_out:
126-
kfree(dev->dma_mem);
127-
out:
128-
if (mem_base)
129-
iounmap(mem_base);
130-
return 0;
131-
}
132-
EXPORT_SYMBOL(dma_declare_coherent_memory);
133-
134-
void dma_release_declared_memory(struct device *dev)
135-
{
136-
struct dma_coherent_mem *mem = dev->dma_mem;
137-
138-
if (!mem)
139-
return;
140-
dev->dma_mem = NULL;
141-
iounmap(mem->virt_base);
142-
kfree(mem->bitmap);
143-
kfree(mem);
144-
}
145-
EXPORT_SYMBOL(dma_release_declared_memory);
146-
147-
void *dma_mark_declared_memory_occupied(struct device *dev,
148-
dma_addr_t device_addr, size_t size)
149-
{
150-
struct dma_coherent_mem *mem = dev->dma_mem;
151-
int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1) >> PAGE_SHIFT;
152-
int pos, err;
153-
154-
if (!mem)
155-
return ERR_PTR(-EINVAL);
156-
157-
pos = (device_addr - mem->device_base) >> PAGE_SHIFT;
158-
err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));
159-
if (err != 0)
160-
return ERR_PTR(err);
161-
return mem->virt_base + (pos << PAGE_SHIFT);
162-
}
163-
EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
164-
16573
void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
16674
enum dma_data_direction direction)
16775
{

‎arch/x86/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ config X86
3030
select HAVE_FTRACE
3131
select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
3232
select HAVE_ARCH_KGDB if !X86_VOYAGER
33+
select HAVE_GENERIC_DMA_COHERENT if X86_32
3334
select HAVE_EFFICIENT_UNALIGNED_ACCESS
3435

3536
config ARCH_DEFCONFIG

‎arch/x86/kernel/amd_iommu.c‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929

3030
#define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
3131

32-
#define to_pages(addr, size) \
33-
(round_up(((addr) & ~PAGE_MASK) + (size), PAGE_SIZE) >> PAGE_SHIFT)
34-
3532
#define EXIT_LOOP_COUNT 10000000
3633

3734
static DEFINE_RWLOCK(amd_iommu_devtable_lock);
@@ -185,7 +182,7 @@ static int iommu_flush_pages(struct amd_iommu *iommu, u16 domid,
185182
u64 address, size_t size)
186183
{
187184
int s = 0;
188-
unsigned pages = to_pages(address, size);
185+
unsigned pages = iommu_num_pages(address, size);
189186

190187
address &= PAGE_MASK;
191188

@@ -557,8 +554,8 @@ static struct dma_ops_domain *dma_ops_domain_alloc(struct amd_iommu *iommu,
557554
if (iommu->exclusion_start &&
558555
iommu->exclusion_start < dma_dom->aperture_size) {
559556
unsigned long startpage = iommu->exclusion_start >> PAGE_SHIFT;
560-
int pages = to_pages(iommu->exclusion_start,
561-
iommu->exclusion_length);
557+
int pages = iommu_num_pages(iommu->exclusion_start,
558+
iommu->exclusion_length);
562559
dma_ops_reserve_addresses(dma_dom, startpage, pages);
563560
}
564561

@@ -767,7 +764,7 @@ static dma_addr_t __map_single(struct device *dev,
767764
unsigned int pages;
768765
int i;
769766

770-
pages = to_pages(paddr, size);
767+
pages = iommu_num_pages(paddr, size);
771768
paddr &= PAGE_MASK;
772769

773770
address = dma_ops_alloc_addresses(dev, dma_dom, pages);
@@ -802,7 +799,7 @@ static void __unmap_single(struct amd_iommu *iommu,
802799
if ((dma_addr == 0) || (dma_addr + size > dma_dom->aperture_size))
803800
return;
804801

805-
pages = to_pages(dma_addr, size);
802+
pages = iommu_num_pages(dma_addr, size);
806803
dma_addr &= PAGE_MASK;
807804
start = dma_addr;
808805

0 commit comments

Comments
 (0)