Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp13106pxv; Wed, 21 Jul 2021 14:06:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXGkrTmjQx7s8/39ZH5KYQ/zSUGQ6jdG6oC1tkBJtN5mIrgkzXw9aQ80/OCOu7LBOPOCd7 X-Received: by 2002:a6b:6f11:: with SMTP id k17mr27931822ioc.114.1626901577453; Wed, 21 Jul 2021 14:06:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626901577; cv=none; d=google.com; s=arc-20160816; b=lMqYTlJlEr88IkljYQ6W07MQHkUZVKb/FKLTzLBlLINW7i48rl+nMeTyTsidtoQRf6 U9jeA8zD2aZn2RRmmmlvAOPZTdhKvNBb36+OWm7uTCGqKKdAafQxnyX9Kj88UPiCizLJ VptJz2+/ZPOCKxdLDXqM6sIYrkgtNWUUQ+ZvMd3PwbTVj7ayRJ7OTgnvAEV4RyMciKG0 eLm8qNH8swhL2A2Iqzi3yQrY027HflboC/xEmi/iYj5Ip4tQYN3+gHiJiwSF8UdsIHI/ rH9tUSfqXuYVNSrKVP2Jnsir2hfZ1ULowiuBP8Nkhib1SSCVk1IXIALxXiO3QzlH1Zzq cw9g== 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=chzWii7NMGzGx2kbWspgo7YngVQmYyTQS4HaFfodpf0=; b=lbSFKQhgl/eqroYT2JOEMz3oYnM00Fekm9saBpnRLpPYV2d0qmcl3RYB2Wr1x5GqbI JBEIUObV4pZ+FGRqVh+mQYpm+4EYLQ5ylqdcGoQni1FS57Y4VgsI8LSV46X6ZnZMxiaG KQ9nA3u0BacvidHG/nB1RayrnXMf5TQPd414wj+5o0yksrQ8DBSm9yFpGMIleEuXu7AK ObFnlTNMW5FkP93aWKSE6nhOE9bjIuA99onVkcL1eH61LHAWMxReuAyNdETPXpiJ+E9Y FMo3ry3nKg8Rdm5IDpd1S/mWYvmmAN9y4NHFEpE+b3dMfqfre7w7GSnft4wz6swBOMRB TRlA== 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 t9si29576596jaj.20.2021.07.21.14.06.05; Wed, 21 Jul 2021 14:06:17 -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 S231444AbhGURkP (ORCPT + 99 others); Wed, 21 Jul 2021 13:40:15 -0400 Received: from foss.arm.com ([217.140.110.172]:33134 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231434AbhGURkM (ORCPT ); Wed, 21 Jul 2021 13:40:12 -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 D55BD11FB; Wed, 21 Jul 2021 11:20:48 -0700 (PDT) Received: from 010265703453.arm.com (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5BFE43F694; Wed, 21 Jul 2021 11:20:47 -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 Subject: [PATCH 02/23] iommu/amd: Drop IOVA cookie management Date: Wed, 21 Jul 2021 19:20:13 +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 The core code bakes its own cookies now. Signed-off-by: Robin Murphy --- drivers/iommu/amd/iommu.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 811a49a95d04..40ae7130fc80 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -1924,16 +1924,7 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type) domain->domain.geometry.aperture_end = ~0ULL; domain->domain.geometry.force_aperture = true; - if (type == IOMMU_DOMAIN_DMA && - iommu_get_dma_cookie(&domain->domain) == -ENOMEM) - goto free_domain; - return &domain->domain; - -free_domain: - protection_domain_free(domain); - - return NULL; } static void amd_iommu_domain_free(struct iommu_domain *dom) @@ -1950,9 +1941,6 @@ static void amd_iommu_domain_free(struct iommu_domain *dom) if (!dom) return; - if (dom->type == IOMMU_DOMAIN_DMA) - iommu_put_dma_cookie(&domain->domain); - if (domain->flags & PD_IOMMUV2_MASK) free_gcr3_table(domain); -- 2.25.1