Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4543659pxj; Tue, 8 Jun 2021 17:31:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMVG7KRvYG3239f37VrYDuB8jGo/XI+91Nf9/yEk1iAEoJPgW32FGDVOU42lp23rpYVurx X-Received: by 2002:a17:906:15c2:: with SMTP id l2mr25894361ejd.348.1623198683182; Tue, 08 Jun 2021 17:31:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623198683; cv=none; d=google.com; s=arc-20160816; b=gKHzdNdJd5VyXxms3zQmPPW4lfzfbFooKOmp4HCLkmEvo2Y1VCHTBVtHwrX+lAkbYj iCTACrfzlofOBxiMpB7Zwm3K9BOZT7nRo2ppoIovtl39w9hliX9X0RVIH1V5s1zfROLH 2WOPlIeMgiNPrEHGpt3MLxXXfS14MQALnjWoL89t2r1Drn4n62fYxGd9cUo8plj2a/mH /Umc0cIvM9EyTENLWZUcBCY/c8vVZzpxtAzxfixckL0B0PTS1B5YpejtU+yKAAvoFI+i ohP2LiACuqHuHN0QBcEWq1q5khxI2XMcuUlmsvrKOw+3+V4Hpww+tpxSjNnIJhdB2tqd fr4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=5WvJ0pAbruRRJNfQzHzibyoDm/8NxDH8T8P/NTqXd+Q=; b=aKLczitUWI5TTnE2Ui9Je/y5Jd1MLwT6AV9NZ6w0Nvc5RKNlM+hxm5XTY1dny8vY8S +oSZg9su8O48FPVoehr4H7QKV4KeoFanXD1+XqCpR7OuV27R9rCe2JVfS1kQOYDa3V9o Om0GQczPpPG/EM//3cslVf/2cEzT7jNkahFMTf8TMFF2JBYCPi6ctIMijIvzKBN/SCmd 7MT2jejHZM67OM2xapLy8SymvkXnKoiWZfUUs/n5QLd+LLvZdgObMaWbyNYOcJqK/s0F w9wHnM6kwFmSDOaA6gG+TAml+eqBbY6icTVIpArhwOwyvhA2UTqU5kAK/SDg69ZqzNti V0Sg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g15si1024749ejt.569.2021.06.08.17.30.59; Tue, 08 Jun 2021 17:31:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233037AbhFHNY6 (ORCPT + 99 others); Tue, 8 Jun 2021 09:24:58 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3178 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232771AbhFHNYx (ORCPT ); Tue, 8 Jun 2021 09:24:53 -0400 Received: from fraeml741-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FzrKK1vsQz6H76b; Tue, 8 Jun 2021 21:13:41 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml741-chm.china.huawei.com (10.206.15.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 8 Jun 2021 15:22:59 +0200 Received: from localhost.localdomain (10.69.192.58) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 8 Jun 2021 14:22:55 +0100 From: John Garry To: , , , , CC: , , , , , , John Garry Subject: [PATCH v11 2/3] iommu/vt-d: Add support for IOMMU default DMA mode build options Date: Tue, 8 Jun 2021 21:18:27 +0800 Message-ID: <1623158308-180604-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1623158308-180604-1-git-send-email-john.garry@huawei.com> References: <1623158308-180604-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhen Lei Make IOMMU_DEFAULT_LAZY default for when INTEL_IOMMU config is set, and make intel_iommu_strict initially hold value of IS_ENABLED(CONFIG_IOMMU_DEFAULT_STRICT). Signed-off-by: Zhen Lei Signed-off-by: John Garry --- drivers/iommu/Kconfig | 1 + drivers/iommu/intel/iommu.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 369a3af9e5bf..b68ec7ed23c0 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -95,6 +95,7 @@ choice depends on IOMMU_API depends on X86 || IA64 || X86_64 || ARM || ARM64 + default IOMMU_DEFAULT_LAZY if INTEL_IOMMU default IOMMU_DEFAULT_STRICT help This option allows an IOMMU DMA mode to be chosen at build time, to diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index be35284a2016..fe33347f4a1e 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -360,7 +360,7 @@ int intel_iommu_enabled = 0; EXPORT_SYMBOL_GPL(intel_iommu_enabled); static int dmar_map_gfx = 1; -static int intel_iommu_strict; +static int intel_iommu_strict = IS_ENABLED(CONFIG_IOMMU_DEFAULT_STRICT); static int intel_iommu_superpage = 1; static int iommu_identity_mapping; static int iommu_skip_te_disable; -- 2.26.2