Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp257538pxt; Wed, 4 Aug 2021 10:19:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweMmrnsvabrhSEFPGm6wW9d73GhJaL7k+hTfeC9HXyLQ51gAfPqgfXA6/gEez+u46VStQx X-Received: by 2002:a92:c8ce:: with SMTP id c14mr282218ilq.1.1628097554181; Wed, 04 Aug 2021 10:19:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628097554; cv=none; d=google.com; s=arc-20160816; b=a7pT7tI95XDCV18b03sszGEWg+JHpLXxEAQkyC7Ux4+YfXIZQcFUtp91mluzU1lwGq c6OzrxNjTbWrDGpkwWhBJuCS27Pb6A7eSr5eLufxQ25q2xGkyyPt0sQbIZ/K4tUrTsOf ZWuhCJxI4NVm59e8NcmuvvBzsRdz6jEhU1BxAT/gXWhqg4dxJHilZoPtrQAaMnr+Acyg lYreFDbdMXRX8Ur08T1CZY7IC7uxh+qEDUsQvIruxIqI69UkI5SRlmkyj9zbhXZ0DiMn 99ztrZU61YamUtonzWRJIh2rf69kPjFEdBJT6un+WTCMoESYI4oYt91SjAFg8oOdIPXz Vn0Q== 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=AIV4zaw2Y0k4/6SLLT5ObkbMwof1VHa+uqBT3FXEMwg=; b=v/qDDC9m1i8pdE/R+759hAoCZNT4UmFAyoMHq85mbzYK+j1J3EX0A7lXPYgEP+eSHv rONkuyqwlHEfGrx3uReBE2IsywJ3AMgkJY5jJg6yDgGP/PiwcY1/dUk8z6bnxCFkmH3B 84ok0rQLpWlDs+fMfziaEn4Tb89W28vxx5jMIv879WX6wLiVX8j0RKcKBy1xDu26mxba YoMk4KxD44Nq14D3b8ekf0197JilTAdDl8DCam01WkECARzZbdQNBJ/xNM9pR6Z/dCwf oa+EB/VQiMyOJDE6GwHPIx4PtJfqPS4UOf6fUep27gPJXyT5q8IvLxQ1aQthhlwXzQin a7Pw== 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 p31si3045204jac.95.2021.08.04.10.18.57; Wed, 04 Aug 2021 10:19:14 -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 S240045AbhHDRRP (ORCPT + 99 others); Wed, 4 Aug 2021 13:17:15 -0400 Received: from foss.arm.com ([217.140.110.172]:35156 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239955AbhHDRQ5 (ORCPT ); Wed, 4 Aug 2021 13:16:57 -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 0AF4911FB; Wed, 4 Aug 2021 10:16:44 -0700 (PDT) Received: from 010265703453.arm.com (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4A49B3F66F; Wed, 4 Aug 2021 10:16:42 -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 17/25] iommu/amd: Prepare for multiple DMA domain types Date: Wed, 4 Aug 2021 18:15:45 +0100 Message-Id: <51e020d80bfc7b2dcc90f78fad93faa697644723.1628094601.git.robin.murphy@arm.com> 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 The DMA ops reset/setup can simply be unconditional, since iommu-dma already knows only to touch DMA domains. Signed-off-by: Robin Murphy --- drivers/iommu/amd/iommu.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 92f7cbe3d14a..f8cd945f1776 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -1706,14 +1706,9 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) static void amd_iommu_probe_finalize(struct device *dev) { - struct iommu_domain *domain; - /* Domains are initialized for this device - have a look what we ended up with */ - domain = iommu_get_domain_for_dev(dev); - if (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 amd_iommu_release_device(struct device *dev) -- 2.25.1