From patchwork Fri Apr 30 05:53:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12232293 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0062BC433ED for ; Fri, 30 Apr 2021 05:53:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8FA48613F8 for ; Fri, 30 Apr 2021 05:53:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FA48613F8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C8F686B0074; Fri, 30 Apr 2021 01:53:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C1A026B0075; Fri, 30 Apr 2021 01:53:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A92B36B0078; Fri, 30 Apr 2021 01:53:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0193.hostedemail.com [216.40.44.193]) by kanga.kvack.org (Postfix) with ESMTP id 840146B0074 for ; Fri, 30 Apr 2021 01:53:35 -0400 (EDT) Received: from smtpin33.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 501D9364C for ; Fri, 30 Apr 2021 05:53:35 +0000 (UTC) X-FDA: 78087966390.33.81C75BA Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf20.hostedemail.com (Postfix) with ESMTP id 8FC9213A for ; Fri, 30 Apr 2021 05:53:26 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 06D7861452; Fri, 30 Apr 2021 05:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1619762014; bh=rAr4jp0h18Rs0Uz/pkg0Q5FuGrCt99WBLtLAPp79m3I=; h=Date:From:To:Subject:In-Reply-To:From; b=ANaOQBCbw9pERDbK+kB+hssNCNhpn48x2hWEcsUY94uuD3kITyXJslAYSZNSD3JxA Dsr/OFrYw6pvFdhIZTmCDvktmU3PPNi4O12p0MVc7Ayg5nyoA2cc9ANhcYN/cIV1ds SPBgSNqJzZO19Pg7QQtqmoXPWF7KkPO++SOUgLAg= Date: Thu, 29 Apr 2021 22:53:33 -0700 From: Andrew Morton To: akpm@linux-foundation.org, glaubitz@physik.fu-berlin.de, linux-mm@kvack.org, mm-commits@vger.kernel.org, slyfox@gentoo.org, torvalds@linux-foundation.org Subject: [patch 006/178] ia64: simplify code flow around swiotlb init Message-ID: <20210430055333.a5s5n6ytU%akpm@linux-foundation.org> In-Reply-To: <20210429225251.02b6386d21b69255b4f6c163@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Stat-Signature: 8skur95yyscwujhp4z3ukucka4ma1ida X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 8FC9213A Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=ANaOQBCb; spf=pass (imf20.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf20; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619762006-695599 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Sergei Trofimovich Subject: ia64: simplify code flow around swiotlb init Before the change CONFIG_INTEL_IOMMU && !CONFIG_SWIOTLB && !CONFIG_FLATMEM could skip `set_max_mapnr(max_low_pfn);` if iommu is not present on system. Link: https://lkml.kernel.org/r/20210328202439.403601-1-slyfox@gentoo.org Signed-off-by: Sergei Trofimovich Cc: John Paul Adrian Glaubitz Signed-off-by: Andrew Morton --- arch/ia64/mm/init.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/arch/ia64/mm/init.c~ia64-simplify-code-flow-around-swiotlb-init +++ a/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);