Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp257115pxt; Wed, 4 Aug 2021 10:18:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRw4tgCc8rNTTN0RJiXMYJBqOlbzY1RAxVzOo7duylHOvQ0q2pBH0B4idEqquZ2hlyoM+S X-Received: by 2002:a92:cdae:: with SMTP id g14mr480168ild.123.1628097523188; Wed, 04 Aug 2021 10:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628097523; cv=none; d=google.com; s=arc-20160816; b=TaimMvRazFvH7oHTZbi8gGy3MvQ2L6K5BMJemFkzpakECjPCYPbwooZrR/tTFNB+vX IP15q0ALbNCtuXu2VNyT4Ut9k+2QK1FlH8b9JDWgkOTayncHUeiQv+ULBkmulBaNuEcf hcmkGaZ4n7XjZ+DN1lDL2uC9VZ3qR7pfCYIx7S5XA7JUkPeDF45ksc3oyoXI2k91sI5g SgE7DHc4bInrxzOVuEGhzc+66H6XfEBQpPfh8AqBPuEMA9j6kMr1zD3jnXlkBKQHgFdq 9ghZxXdzwpgzhAr7LQbw8OKUt1M8af0AWwNy1ryzXrLHi3ygSc4T3A9/jb9+CnrC5qdZ +IDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=CXuZhwIUSgXVovD6WYyai/pZtqQjtk1iP/6cLdpq1OY=; b=P/Y0IeZPPhSEOaTBVORVnHcCvGkil6sQ91xzuFEHLSzR5Yz/kUowM+ndav0STsUEJF EKqfNkEsIim939Y3psmpLunZco0L3EQ7SH0d0vwXYiqVYVg8vaOSNB4TmTp+V//kGuLk DTI/Imm5dJRvQGjckLaInM+B7NLHLOeqgcklnoTDx/oGoG9Trjh0yb3g6A2v7TIEgWu3 OehcA/ufkCTtHFvszeW9p7Dwkn5MHysx/1vY+g8tijfffD/vJSam/Rp0vR3b7owk70zx K5uvEv6S6TWz8ncof2kyZLH1Kj5FkNa4d/JwL9QjiLeXIPC5qyaRQ5A402Q8qLABiEeb c69Q== 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=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n13si2815783ioj.25.2021.08.04.10.18.31; Wed, 04 Aug 2021 10:18:43 -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=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240076AbhHDRRV (ORCPT + 99 others); Wed, 4 Aug 2021 13:17:21 -0400 Received: from foss.arm.com ([217.140.110.172]:35084 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239977AbhHDRRA (ORCPT ); Wed, 4 Aug 2021 13:17:00 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E8C011424; Wed, 4 Aug 2021 10:16:47 -0700 (PDT) Received: from 010265703453.arm.com (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3DF393F66F; Wed, 4 Aug 2021 10:16:46 -0700 (PDT) From: Robin Murphy To: joro@8bytes.org, will@kernel.org Cc: iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, suravee.suthikulpanit@amd.com, baolu.lu@linux.intel.com, john.garry@huawei.com, dianders@chromium.org, rajatja@google.com, chenxiang66@hisilicon.com Subject: [PATCH v3 19/25] iommu/vt-d: Prepare for multiple DMA domain types Date: Wed, 4 Aug 2021 18:15:47 +0100 Message-Id: X-Mailer: git-send-email 2.25.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 In preparation for the strict vs. non-strict decision for DMA domains to be expressed in the domain type, make sure we expose our flush queue awareness by accepting the new domain type, and test the specific feature flag where we want to identify DMA domains in general. The DMA ops reset/setup can simply be made unconditional, since iommu-dma already knows only to touch DMA domains. Reviewed-by: Lu Baolu Signed-off-by: Robin Murphy --- drivers/iommu/intel/iommu.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 7e168634c433..8fc46c9d6b96 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -582,7 +582,7 @@ struct intel_iommu *domain_get_iommu(struct dmar_domain *domain) int iommu_id; /* si_domain and vm domain should not get here. */ - if (WARN_ON(domain->domain.type != IOMMU_DOMAIN_DMA)) + if (WARN_ON(!iommu_is_dma_domain(&domain->domain))) return NULL; for_each_domain_iommu(iommu_id, domain) @@ -1034,7 +1034,7 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain, pteval = ((uint64_t)virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE; if (domain_use_first_level(domain)) { pteval |= DMA_FL_PTE_XD | DMA_FL_PTE_US; - if (domain->domain.type == IOMMU_DOMAIN_DMA) + if (iommu_is_dma_domain(&domain->domain)) pteval |= DMA_FL_PTE_ACCESS; } if (cmpxchg64(&pte->val, 0ULL, pteval)) @@ -2345,7 +2345,7 @@ __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn, if (domain_use_first_level(domain)) { attr |= DMA_FL_PTE_XD | DMA_FL_PTE_US; - if (domain->domain.type == IOMMU_DOMAIN_DMA) { + if (iommu_is_dma_domain(&domain->domain)) { attr |= DMA_FL_PTE_ACCESS; if (prot & DMA_PTE_WRITE) attr |= DMA_FL_PTE_DIRTY; @@ -4528,6 +4528,7 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type) switch (type) { case IOMMU_DOMAIN_DMA: + case IOMMU_DOMAIN_DMA_FQ: case IOMMU_DOMAIN_UNMANAGED: dmar_domain = alloc_domain(0); if (!dmar_domain) { @@ -5197,12 +5198,8 @@ static void intel_iommu_release_device(struct device *dev) static void intel_iommu_probe_finalize(struct device *dev) { - struct iommu_domain *domain = iommu_get_domain_for_dev(dev); - - if (domain && domain->type == IOMMU_DOMAIN_DMA) - iommu_setup_dma_ops(dev, 0, U64_MAX); - else - set_dma_ops(dev, NULL); + set_dma_ops(dev, NULL); + iommu_setup_dma_ops(dev, 0, U64_MAX); } static void intel_iommu_get_resv_regions(struct device *device, -- 2.25.1