aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-dma.c
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2010-08-26 13:57:59 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2010-08-26 18:13:29 -0400
commitefa631c26d3bb1162b8f95008801db602217f52b (patch)
treebc2b88fa3a08be9c96b663f37ed425a7b3be15f5 /arch/x86/kernel/pci-dma.c
parent5bef80a4b826b9cee1c6aec7ecc371ec395260cc (diff)
x86, swiotlb: Simplify SWIOTLB pci_swiotlb_detect routine.
In 'pci_swiotlb_detect' we used to do two different things: a). If user provided 'iommu=soft' or 'swiotlb=force' we would set swiotlb=1 and return 1 (and forcing pci-dma.c to call pci_swiotlb_init() immediately). b). If 4GB or more would be detected and if user did not specify iommu=off, we would set 'swiotlb=1' and return whatever 'a)' figured out. We simplify this by splitting a) and b) in two different routines. CC: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> LKML-Reference: <1282845485-8991-5-git-send-email-konrad.wilk@oracle.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
-rw-r--r--arch/x86/kernel/pci-dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 9f07cfcbd3a5..1b3beb5075e6 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -133,9 +133,11 @@ void __init pci_iommu_alloc(void)
133 /* free the range so iommu could get some range less than 4G */ 133 /* free the range so iommu could get some range less than 4G */
134 dma32_free_bootmem(); 134 dma32_free_bootmem();
135 135
136 if (pci_xen_swiotlb_detect() || pci_swiotlb_detect()) 136 if (pci_xen_swiotlb_detect() || pci_swiotlb_detect_override())
137 goto out; 137 goto out;
138 138
139 pci_swiotlb_detect_4gb();
140
139 gart_iommu_hole_init(); 141 gart_iommu_hole_init();
140 142
141 detect_calgary(); 143 detect_calgary();