From mboxrd@z Thu Jan 1 00:00:00 1970 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 C06A1C433C1 for ; Sun, 28 Mar 2021 20:25:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 76A586186A for ; Sun, 28 Mar 2021 20:25:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231481AbhC1UZD (ORCPT ); Sun, 28 Mar 2021 16:25:03 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:36330 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231366AbhC1UYy (ORCPT ); Sun, 28 Mar 2021 16:24:54 -0400 Received: by sf.home (Postfix, from userid 1000) id 8C4745A22061; Sun, 28 Mar 2021 21:24:46 +0100 (BST) From: Sergei Trofimovich To: Andrew Morton , John Paul Adrian Glaubitz , inux-ia64@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sergei Trofimovich , linux-ia64@vger.kernel.org Subject: [PATCH v2] ia64: simplify code flow around swiotlb init Date: Sun, 28 Mar 2021 21:24:39 +0100 Message-Id: <20210328202439.403601-1-slyfox@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. CC: Andrew Morton CC: John Paul Adrian Glaubitz CC: linux-ia64@vger.kernel.org Signed-off-by: Sergei Trofimovich --- Change since v1: fixed a typo in commit mesage. 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.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Trofimovich Date: Sun, 28 Mar 2021 20:24:39 +0000 Subject: [PATCH v2] ia64: simplify code flow around swiotlb init Message-Id: <20210328202439.403601-1-slyfox@gentoo.org> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Andrew Morton , John Paul Adrian Glaubitz , inux-ia64@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sergei Trofimovich , linux-ia64@vger.kernel.org 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. CC: Andrew Morton CC: John Paul Adrian Glaubitz CC: linux-ia64@vger.kernel.org Signed-off-by: Sergei Trofimovich --- Change since v1: fixed a typo in commit mesage. 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.1