From patchwork Thu Jun 13 08:42:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 166708 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp948223ilk; Thu, 13 Jun 2019 09:11:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqw8yOSsiAmLFGK0QoCRfXEcOKi1BAeQsxDhlAFXl9T0HIa6hZEj2nJgTV6+4Vquie63X13m X-Received: by 2002:a63:5f0d:: with SMTP id t13mr25061690pgb.358.1560442303454; Thu, 13 Jun 2019 09:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560442303; cv=none; d=google.com; s=arc-20160816; b=VH+3+3lc70B2QEz7bBHFTm/uV49MET9+P5KrUbbcd5T8yWH26kdPM98W1Pe3gJMtWO x2pUErV6m9uurxUQgSiWRIytICLqYeSGznYvvBqS5KV5wnHO3rhRljRnu/OjcrDpmLeT GOKZk+eQkWsSlDTqmK8bbtNPHcwumSB7LsEmCfJYvq+zXFT9z8yaKGt9flUMHY9bX6z9 jMKyaeIWxOW4Ghpb0WiLlVGQM0KhKPgn1e3qm4KGoUtm+0hVphj/coiO6xE7aIXb5OqD MzcDk/RE6OgX59eBZFPPqJWWhxwfkK8T0yifkMenoJup4n/ruiPB/aq87JsKlxKDfhV7 VbMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ajDkxYtaTG7eHg7VZ9mslt65bkZWI5l3O39aMgF8aEE=; b=BZi51Fm7ttrjS3uM8wYWzRDK/HAFhdFCPK0+q+6HaIO+AhkZp/RvUjvUdFPP1OB+dP 3NCH7qrMHp6Jkg7ZtaXDn40ueJkU5Da0mWBn4ygz4m/EiPTv8kCEDpRMSIcZQxlSObhV Ut+5pEBAX5P3S6LJGxJeG8+MnblpauswJfr9slys/WccEu/3JX+al3hmThYS8x1V9ybd Y0PCJGVBj7v06NiZ6B7C258dj7m/ZRhOfQOegzpiczHlIfj/envhAH5gUHEFl2k/aouO rSE8DjP3Abl4r6CbXP8icHfklY0nzbDBWSpDYuZEWQIuF8TPw3YwVfK+q6Do4WgfETcC icAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 5si40121plx.200.2019.06.13.09.11.43; Thu, 13 Jun 2019 09:11:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391557AbfFMQL1 (ORCPT + 24 others); Thu, 13 Jun 2019 12:11:27 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:47950 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731237AbfFMInd (ORCPT ); Thu, 13 Jun 2019 04:43:33 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id B78189A2D36077A28788; Thu, 13 Jun 2019 16:43:30 +0800 (CST) Received: from HGHY4L002753561.china.huawei.com (10.133.215.186) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.439.0; Thu, 13 Jun 2019 16:43:23 +0800 From: Zhen Lei To: Jean-Philippe Brucker , John Garry , Robin Murphy , Will Deacon , Joerg Roedel , Jonathan Corbet , linux-doc , Sebastian Ott , Gerald Schaefer , "Martin Schwidefsky" , Heiko Carstens , Benjamin Herrenschmidt , Paul Mackerras , "Michael Ellerman" , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , David Woodhouse , iommu , linux-kernel , linux-s390 , linuxppc-dev , x86 , linux-ia64 CC: Zhen Lei Subject: [PATCH v9 4/7] powernv/iommu: add support for IOMMU default DMA mode build options Date: Thu, 13 Jun 2019 16:42:37 +0800 Message-ID: <20190613084240.16768-5-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190613084240.16768-1-thunder.leizhen@huawei.com> References: <20190613084240.16768-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.215.186] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The default DMA mode is PASSTHROUGH on powernv, this patch make it can be set to STRICT at build time. It can be overridden by boot option. There is no functional change. Signed-off-by: Zhen Lei --- arch/powerpc/platforms/powernv/pci-ioda.c | 3 ++- drivers/iommu/Kconfig | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) -- 1.8.3 diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 10cc42b9e541c46..27e25e8e3a9c637 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -81,7 +81,8 @@ void pe_level_printk(const struct pnv_ioda_pe *pe, const char *level, va_end(args); } -static bool pnv_iommu_bypass_disabled __read_mostly; +static bool pnv_iommu_bypass_disabled __read_mostly = + !IS_ENABLED(CONFIG_IOMMU_DEFAULT_PASSTHROUGH); static bool pci_reset_phbs __read_mostly; static int __init iommu_setup(char *str) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index a8dd69d175fb3c6..bfbcaa24e283aad 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -78,6 +78,7 @@ config IOMMU_DEBUGFS choice prompt "IOMMU default DMA mode" depends on IOMMU_API + default IOMMU_DEFAULT_PASSTHROUGH if (PPC_POWERNV && PCI) default IOMMU_DEFAULT_LAZY if S390_IOMMU default IOMMU_DEFAULT_STRICT help @@ -98,6 +99,7 @@ config IOMMU_DEFAULT_PASSTHROUGH config IOMMU_DEFAULT_LAZY bool "lazy" + depends on !PPC_POWERNV help Support lazy mode, where for every IOMMU DMA unmap operation, the flush operation of IOTLB and the free operation of IOVA are deferred.