Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
46483d10
Commit
46483d10
authored
Jan 05, 2009
by
Ingo Molnar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'core/iommu' into core/urgent
Conflicts: lib/swiotlb.c
parents
c59ab97e
874d6a95
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
105 additions
and
214 deletions
+105
-214
arch/ia64/include/asm/swiotlb.h
arch/ia64/include/asm/swiotlb.h
+1
-38
arch/x86/include/asm/swiotlb.h
arch/x86/include/asm/swiotlb.h
+1
-37
arch/x86/kernel/pci-swiotlb_64.c
arch/x86/kernel/pci-swiotlb_64.c
+1
-1
include/linux/swiotlb.h
include/linux/swiotlb.h
+2
-1
lib/swiotlb.c
lib/swiotlb.c
+100
-137
No files found.
arch/ia64/include/asm/swiotlb.h
View file @
46483d10
...
...
@@ -2,44 +2,7 @@
#define ASM_IA64__SWIOTLB_H
#include <linux/dma-mapping.h>
/* SWIOTLB interface */
extern
dma_addr_t
swiotlb_map_single
(
struct
device
*
hwdev
,
void
*
ptr
,
size_t
size
,
int
dir
);
extern
void
*
swiotlb_alloc_coherent
(
struct
device
*
hwdev
,
size_t
size
,
dma_addr_t
*
dma_handle
,
gfp_t
flags
);
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_single_range_for_cpu
(
struct
device
*
hwdev
,
dma_addr_t
dev_addr
,
unsigned
long
offset
,
size_t
size
,
int
dir
);
extern
void
swiotlb_sync_single_range_for_device
(
struct
device
*
hwdev
,
dma_addr_t
dev_addr
,
unsigned
long
offset
,
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
(
struct
device
*
hwdev
,
dma_addr_t
dma_addr
);
extern
void
swiotlb_free_coherent
(
struct
device
*
hwdev
,
size_t
size
,
void
*
vaddr
,
dma_addr_t
dma_handle
);
extern
int
swiotlb_dma_supported
(
struct
device
*
hwdev
,
u64
mask
);
extern
void
swiotlb_init
(
void
);
#include <linux/swiotlb.h>
extern
int
swiotlb_force
;
...
...
arch/x86/include/asm/swiotlb.h
View file @
46483d10
#ifndef _ASM_X86_SWIOTLB_H
#define _ASM_X86_SWIOTLB_H
#include <
asm/dma-mapping
.h>
#include <
linux/swiotlb
.h>
/* SWIOTLB interface */
extern
dma_addr_t
swiotlb_map_single
(
struct
device
*
hwdev
,
void
*
ptr
,
size_t
size
,
int
dir
);
extern
void
*
swiotlb_alloc_coherent
(
struct
device
*
hwdev
,
size_t
size
,
dma_addr_t
*
dma_handle
,
gfp_t
flags
);
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_single_range_for_cpu
(
struct
device
*
hwdev
,
dma_addr_t
dev_addr
,
unsigned
long
offset
,
size_t
size
,
int
dir
);
extern
void
swiotlb_sync_single_range_for_device
(
struct
device
*
hwdev
,
dma_addr_t
dev_addr
,
unsigned
long
offset
,
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
(
struct
device
*
hwdev
,
dma_addr_t
dma_addr
);
extern
void
swiotlb_free_coherent
(
struct
device
*
hwdev
,
size_t
size
,
void
*
vaddr
,
dma_addr_t
dma_handle
);
extern
int
swiotlb_dma_supported
(
struct
device
*
hwdev
,
u64
mask
);
extern
void
swiotlb_init
(
void
);
extern
int
swiotlb_force
;
#ifdef CONFIG_SWIOTLB
...
...
arch/x86/kernel/pci-swiotlb_64.c
View file @
46483d10
...
...
@@ -23,7 +23,7 @@ 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
)
dma_addr_t
swiotlb_phys_to_bus
(
struct
device
*
hwdev
,
phys_addr_t
paddr
)
{
return
paddr
;
}
...
...
include/linux/swiotlb.h
View file @
46483d10
...
...
@@ -27,7 +27,8 @@ swiotlb_init(void);
extern
void
*
swiotlb_alloc_boot
(
size_t
bytes
,
unsigned
long
nslabs
);
extern
void
*
swiotlb_alloc
(
unsigned
order
,
unsigned
long
nslabs
);
extern
dma_addr_t
swiotlb_phys_to_bus
(
phys_addr_t
address
);
extern
dma_addr_t
swiotlb_phys_to_bus
(
struct
device
*
hwdev
,
phys_addr_t
address
);
extern
phys_addr_t
swiotlb_bus_to_phys
(
dma_addr_t
address
);
extern
int
swiotlb_arch_range_needs_mapping
(
void
*
ptr
,
size_t
size
);
...
...
lib/swiotlb.c
View file @
46483d10
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment