Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp257809pxt; Wed, 4 Aug 2021 10:19:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyp/80h6CCRPuWH2xcKy05zWGP8i0t8E+x6FQYsxi6QK5ZelPu7uO21PtIjt6mLn9q/XCGw X-Received: by 2002:a05:6e02:b4b:: with SMTP id f11mr540779ilu.130.1628097580831; Wed, 04 Aug 2021 10:19:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628097580; cv=none; d=google.com; s=arc-20160816; b=QFvt1pdmY05dNGxDlLcy4DLHOZn8sXfhS+bB025gQeYHLyap4VzrwB3AtgF3UFD+SO NaHFNB4sBdWW5YcEh7uI0ZrB5VdUZEvXwd8GNXb3kCVsPP3ZsdvNG20j/GH0eiG7Tnuq JDthrIg0/VfXJSarSegGzpefEab95Xma7980i2ijDNFQ5aTNddQQSBI4diXwIfd337r5 tMlLFetuks7c8uqDgbZBuUSl1EgCrs0vMEuiBgWZEacTfzm8yP4+lFQbV6c7hUl8WBsB 77C4WdEsPug16Lr2yu5wXyo+nasiuePWPiKfG5Ds3FctwLZA2JGCGKqflSbcgx/3j2oZ sgAw== 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=qn7R2EBAgQr3uyd8x5Btm34ySvewJBuxfDOjK8IMyGo=; b=Z9NagDTjdk2dmZ0P9RZb3m1T7XD9U3p0S4rfjpw/gpPg3LrAW4sZ04dkFtQixni1le 6BR7g57h9iBrb5xeuj/dTZRQTtr+xyNIHfno5bztVVQJSSsNxASH/dXLSDSpUpSHYJNF ZgTQuKBXs0v+6YBjFpc3CJZs9/+vPl1B+/zoRo2eeZhkvu9Qf5gHZiKGEYukxHfJ1m7x lDdeBgwRb0+M8inihv07yuC7DktzBhtZhpCbVuaw42pO/wcx+DTncFKfZTE7SlKmKrDs PPoADvZmcErgiLjm0NM9ngLXjkCMjHyEiKhIzEDioTwaRAx+LfkpyCxrT34MfaPsmioE YQfA== 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 y7si2740441ila.59.2021.08.04.10.19.29; Wed, 04 Aug 2021 10:19:40 -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 S239976AbhHDRRT (ORCPT + 99 others); Wed, 4 Aug 2021 13:17:19 -0400 Received: from foss.arm.com ([217.140.110.172]:35178 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239835AbhHDRQ6 (ORCPT ); Wed, 4 Aug 2021 13:16:58 -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 022A912FC; Wed, 4 Aug 2021 10:16:46 -0700 (PDT) Received: from 010265703453.arm.com (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 46E9C3F66F; Wed, 4 Aug 2021 10:16:44 -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 18/25] iommu/arm-smmu: Prepare for multiple DMA domain types Date: Wed, 4 Aug 2021 18:15:46 +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. Signed-off-by: Robin Murphy --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index d9c93d8d193d..883a99cb10c1 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1972,6 +1972,7 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA && + type != IOMMU_DOMAIN_DMA_FQ && type != IOMMU_DOMAIN_IDENTITY) return NULL; diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index a325d4769c17..1d013b1d7bb2 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -866,7 +866,8 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) struct arm_smmu_domain *smmu_domain; if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_IDENTITY) { - if (using_legacy_binding || type != IOMMU_DOMAIN_DMA) + if (using_legacy_binding || + (type != IOMMU_DOMAIN_DMA && type != IOMMU_DOMAIN_DMA_FQ)) return NULL; } /* -- 2.25.1