x86-64: IOMMU printk cleanup
PATCH 1/2 x86-64: IOMMU printk cleanup
This patch contains a printk reorder to remove the current problem of displaying "PCI-DMA: Disabling IOMMU." and then "PCI-DMA: using GART IOMMU" 20 lines later in dmesg.
It also constains a printk reorder in swiotlb to state swiotlb enablement prior to describing the location of the bounce buffers, and a printk reorder to state gart enablement prior to describing the aperature.
Also constains a whitespace cleanup in arch/x86_64/kernel/setup.c
Tested (along with patch 2/2) on dual opteron with gart enabled, iommu=soft, and iommu=off.
Thanks,
Jon
Signed-off-by Jon Mason <[email protected]>
arch/x86_64/kernel/pci-gart.c +9 -1
@@ -642,9 +642,18 @@ (no_agp && init_k8_gatt(&info) < 0)) { no_iommu =1 ;no_iommu_init (); +printk (KERN_INFO "PCI-DMA: Disabling IOMMU.\n" ); +if (end_pfn >MAX_DMA32_PFN ) { +printk (KERN_ERR "WARNING more than 4GB of memory " +"but IOMMU not compiled in.\n" +KERN_ERR "WARNING 32bit PCI may malfunction.\n" +KERN_ERR "You might want to enable " +"CONFIG_GART_IOMMU\n" ); + }return -1 ; } +printk (KERN_INFO "PCI-DMA: using GART IOMMU.\n" ); aper_size = info.aper_size *1024 *1024 ; iommu_size =check_iommu_size (info.aper_base, aper_size); iommu_pages = iommu_size >>PAGE_SHIFT ;
@@ -718,7 +727,6 @@flush_gart (NULL ); -printk (KERN_INFO "PCI-DMA: using GART IOMMU.\n" ); dma_ops = &gart_dma_ops;return 0 ;
arch/x86_64/kernel/pci-nommu.c +0 -7
@@ -88,12 +88,5 @@ {if (dma_ops)return ; -printk (KERN_INFO "PCI-DMA: Disabling IOMMU.\n" ); dma_ops = &nommu_dma_ops; -if (end_pfn >MAX_DMA32_PFN ) { -printk (KERN_ERR -"WARNING more than 4GB of memory but IOMMU not compiled in.\n" -KERN_ERR "WARNING 32bit PCI may malfunction.\n" -KERN_ERR "You might want to enable CONFIG_GART_IOMMU\n" ); - } }
arch/x86_64/kernel/pci-swiotlb.c +1 -1
@@ -35,8 +35,8 @@ (end_pfn > MAX_DMA32_PFN || force_iommu)) swiotlb =1 ;if (swiotlb) { +printk (KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n" );swiotlb_init (); -printk (KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n" ); dma_ops = &swiotlb_dma_ops; } }
arch/x86_64/kernel/setup.c +1 -1
@@ -741,7 +741,7 @@e820_setup_gap ();#ifdef CONFIG_GART_IOMMU -iommu_hole_init (); +iommu_hole_init ();#endif #ifdef CONFIG_VT