xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86, swiotlb: Simplify SWIOTLB pci_swiotlb_detect routine.

Browse Source 
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>
This commit is contained in:
Konrad Rzeszutek Wilk
2010-08-26 13:57:59 -04:00
committed by H. Peter Anvin
parent 5bef80a4b8
commit efa631c26d
4 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/pci-dma.c
View File

@@ -133,9 +133,11 @@ void __init pci_iommu_alloc(void)
/* free the range so iommu could get some range less than 4G */
dma32_free_bootmem();
if (pci_xen_swiotlb_detect() || pci_swiotlb_detect())
if (pci_xen_swiotlb_detect() || pci_swiotlb_detect_override())
goto out;
pci_swiotlb_detect_4gb();
gart_iommu_hole_init();
detect_calgary();