Messages in this thread Patch in this message | | | From | Sergei Trofimovich <> | Subject | [PATCH] ia64: simplify code flow around swiotlb init | Date | Thu, 25 Mar 2021 23:35:30 +0000 |
| |
Before the change CONFIG_INTEL_IOMMU && !CONFIG_SWIOTLB && !CONFIG_FLATMEM
could skip `set_max_mapnr(max_low_pfn);` is iommu is not present on system.
CC: Andrew Morton <akpm@linux-foundation.org> CC: linux-ia64@vger.kernel.org Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> --- arch/ia64/mm/init.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 16d0d7d22657..a63585db94fe 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -644,13 +644,16 @@ mem_init (void) * _before_ any drivers that may need the PCI DMA interface are * initialized or bootmem has been freed. */ + do { #ifdef CONFIG_INTEL_IOMMU - detect_intel_iommu(); - if (!iommu_detected) + detect_intel_iommu(); + if (iommu_detected) + break; #endif #ifdef CONFIG_SWIOTLB swiotlb_init(1); #endif + } while (0); #ifdef CONFIG_FLATMEM BUG_ON(!mem_map); -- 2.31.0
| |