diff options
| author | Konrad Rzeszutek Wilk <[email protected]> | 2010-08-26 13:58:00 -0400 |
|---|---|---|
| committer | H. Peter Anvin <[email protected]> | 2010-08-26 15:13:37 -0700 |
| commit | c116c5457c46edb767df6f4e36d4905e3514ad37 (patch) | |
| tree | dbf7f5fed1890f620e68a4f0b5dca9e6ceffc767 | |
| parent | efa631c26d3bb1162b8f95008801db602217f52b (diff) | |
x86, swiotlb: Make SWIOTLB use IOMMU_INIT_* macros.
We utilize the IOMMU_INIT macros to create this dependency:
[pci_xen_swiotlb_detect]
|
[pci_swiotlb_detect_override]
|
[pci_swiotlb_detect_4gb]
And set the SWIOTLB IOMMU_INIT to utilize 'pci_swiotlb_init'
for .init and 'pci_swiotlb_late_init' for .late_init.
Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
LKML-Reference: <[email protected]>
CC: Fujita Tomonori <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
| -rw-r--r-- | arch/x86/kernel/pci-swiotlb.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c index c7a72faeb146..8f972cbddef0 100644 --- a/arch/x86/kernel/pci-swiotlb.c +++ b/arch/x86/kernel/pci-swiotlb.c @@ -10,7 +10,8 @@ #include <asm/iommu.h> #include <asm/swiotlb.h> #include <asm/dma.h> - +#include <asm/xen/swiotlb-xen.h> +#include <asm/iommu_table.h> int swiotlb __read_mostly; static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size, @@ -55,6 +56,10 @@ int __init pci_swiotlb_detect_override(void) return use_swiotlb; } +IOMMU_INIT_FINISH(pci_swiotlb_detect_override, + pci_xen_swiotlb_detect, + pci_swiotlb_init, + pci_swiotlb_late_init); /* * if 4GB or more detected (and iommu=off not set) return 1 @@ -69,6 +74,10 @@ int __init pci_swiotlb_detect_4gb(void) #endif return swiotlb; } +IOMMU_INIT(pci_swiotlb_detect_4gb, + pci_swiotlb_detect_override, + pci_swiotlb_init, + pci_swiotlb_late_init); void __init pci_swiotlb_init(void) { |