From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on archive.lwn.net X-Spam-Level: X-Spam-Status: No, score=-5.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by archive.lwn.net (Postfix) with ESMTP id 611DD7D2F0 for ; Thu, 15 Aug 2019 04:54:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726302AbfHOEyd (ORCPT ); Thu, 15 Aug 2019 00:54:33 -0400 Received: from mga06.intel.com ([134.134.136.31]:30799 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726252AbfHOEyc (ORCPT ); Thu, 15 Aug 2019 00:54:32 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Aug 2019 21:54:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,388,1559545200"; d="scan'208";a="171011114" Received: from allen-box.sh.intel.com (HELO [10.239.159.136]) ([10.239.159.136]) by orsmga008.jf.intel.com with ESMTP; 14 Aug 2019 21:54:28 -0700 Cc: baolu.lu@linux.intel.com, fenghua.yu@intel.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, corbet@lwn.net, Joerg Roedel , x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, mingo@redhat.com, bp@alien8.de, Thomas.Lendacky@amd.com, hpa@zytor.com, tglx@linutronix.de Subject: Re: [PATCH 04/10] x86/dma: Get rid of iommu_pass_through To: Joerg Roedel References: <20190814133841.7095-1-joro@8bytes.org> <20190814133841.7095-5-joro@8bytes.org> From: Lu Baolu Message-ID: Date: Thu, 15 Aug 2019 12:53:28 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190814133841.7095-5-joro@8bytes.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Hi, On 8/14/19 9:38 PM, Joerg Roedel wrote: > From: Joerg Roedel > > This variable has no users anymore. Remove it and tell the > IOMMU code via its new functions about requested DMA modes. > > Signed-off-by: Joerg Roedel This will also simplify the procedures in iommu_probe_device() on x86 platforms. Reviewed-by: Lu Baolu > --- > arch/x86/include/asm/iommu.h | 1 - > arch/x86/kernel/pci-dma.c | 11 +++-------- > 2 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h > index baedab8ac538..b91623d521d9 100644 > --- a/arch/x86/include/asm/iommu.h > +++ b/arch/x86/include/asm/iommu.h > @@ -4,7 +4,6 @@ > > extern int force_iommu, no_iommu; > extern int iommu_detected; > -extern int iommu_pass_through; > > /* 10 seconds */ > #define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) > diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c > index f62b498b18fb..a6fd479d4a71 100644 > --- a/arch/x86/kernel/pci-dma.c > +++ b/arch/x86/kernel/pci-dma.c > @@ -1,6 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > #include > #include > +#include > #include > #include > #include > @@ -43,12 +44,6 @@ int iommu_detected __read_mostly = 0; > * It is also possible to disable by default in kernel config, and enable with > * iommu=nopt at boot time. > */ > -#ifdef CONFIG_IOMMU_DEFAULT_PASSTHROUGH > -int iommu_pass_through __read_mostly = 1; > -#else > -int iommu_pass_through __read_mostly; > -#endif > - > extern struct iommu_table_entry __iommu_table[], __iommu_table_end[]; > > void __init pci_iommu_alloc(void) > @@ -120,9 +115,9 @@ static __init int iommu_setup(char *p) > swiotlb = 1; > #endif > if (!strncmp(p, "pt", 2)) > - iommu_pass_through = 1; > + iommu_set_default_passthrough(); > if (!strncmp(p, "nopt", 4)) > - iommu_pass_through = 0; > + iommu_set_default_translated(); > > gart_parse_options(p); > >