Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp256573pxt; Wed, 4 Aug 2021 10:17:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEeSI3BJ+J8YQ1BJOyrdmKo16vS1NXIneZK6HPSldugYWn9DJ2D7zptJzSjT+iOp/7/dTY X-Received: by 2002:a92:b108:: with SMTP id t8mr522744ilh.6.1628097474637; Wed, 04 Aug 2021 10:17:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628097474; cv=none; d=google.com; s=arc-20160816; b=CTgDTiKGS7gdT9rMmBS8l6z5RCBOYiGvmbwt3WtLLXHW9tE4eeV/gfzaP0Lf+W7k+D 5rq8jJbhHJpdwxSr22Ib6eU2wA9Yibg+nADS3+Qv448Yd1g3QLNvxueNfNI7cLuocSwW GeaKz1i6HiJqQOYLivsryXCKpoH/qR4rukpCj7rptnEO53SxdqQngSMNnXKA9u6kpPl6 ffvByqTHNqGsN1HFod4fbl8ElRIpe3mWVj9ZvFq/cgLnLsYWdPsoUaJPus1Jj0B17wWw JIccnKZkMr5Gg9vuYEY63Ks6GwnmfM5iTy68vIdMLVt6A67kX4cmk8sx8dURaOISGeQ6 Y6GQ== 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=uapH1thjVdUHynM1cAfwDTKh7uE555wjpVNOC2H/axQ=; b=0qZlJgp179+n55SqtdrlFXt7ZgQB5Sri1Lzxp4l5eWr9rJME9yXaRYdL5LArnw9SLz JpbHGLddqW4vl7tQaeCGhpkVVFfV6RMIhpSIMB0vZtmtNYvs2GTn9tsXvv4vvnPJ90NT 11Ek6p9S8EllOJ7aCuh7Og0ha0F4Enx61a/nbj0vweVBcIY00csU+33YicH6dBmErV3Y neDh36dYl+OJ/OsaspjGCaFjiHYO2tdk8riTFccw0y9UiRD4eJ4uSmd0r4Jh0wQ/I/Fr luRzWGQzuqLtetHtxCvMlHSWwVbQWo3mgTeZI1lQ/MZQ0vYvlBzcaGLoaaj4nnoOriqC X2ug== 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 g17si2571011jao.103.2021.08.04.10.17.41; Wed, 04 Aug 2021 10:17:54 -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 S239838AbhHDRQj (ORCPT + 99 others); Wed, 4 Aug 2021 13:16:39 -0400 Received: from foss.arm.com ([217.140.110.172]:34872 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239853AbhHDRQb (ORCPT ); Wed, 4 Aug 2021 13:16:31 -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 0E63931B; Wed, 4 Aug 2021 10:16:19 -0700 (PDT) Received: from 010265703453.arm.com (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2DE473F66F; Wed, 4 Aug 2021 10:16:17 -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, Marek Szyprowski Subject: [PATCH v3 05/25] iommu/exynos: Drop IOVA cookie management Date: Wed, 4 Aug 2021 18:15:33 +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. CC: Marek Szyprowski Signed-off-by: Robin Murphy --- v3: Also remove unneeded include --- drivers/iommu/exynos-iommu.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index d0fbf1d10e18..939ffa768986 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -21,7 +21,6 @@ #include #include #include -#include typedef u32 sysmmu_iova_t; typedef u32 sysmmu_pte_t; @@ -735,20 +734,16 @@ static struct iommu_domain *exynos_iommu_domain_alloc(unsigned type) /* Check if correct PTE offsets are initialized */ BUG_ON(PG_ENT_SHIFT < 0 || !dma_dev); + if (type != IOMMU_DOMAIN_DMA && type != IOMMU_DOMAIN_UNMANAGED) + return NULL; + domain = kzalloc(sizeof(*domain), GFP_KERNEL); if (!domain) return NULL; - if (type == IOMMU_DOMAIN_DMA) { - if (iommu_get_dma_cookie(&domain->domain) != 0) - goto err_pgtable; - } else if (type != IOMMU_DOMAIN_UNMANAGED) { - goto err_pgtable; - } - domain->pgtable = (sysmmu_pte_t *)__get_free_pages(GFP_KERNEL, 2); if (!domain->pgtable) - goto err_dma_cookie; + goto err_pgtable; domain->lv2entcnt = (short *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 1); if (!domain->lv2entcnt) @@ -779,9 +774,6 @@ static struct iommu_domain *exynos_iommu_domain_alloc(unsigned type) free_pages((unsigned long)domain->lv2entcnt, 1); err_counter: free_pages((unsigned long)domain->pgtable, 2); -err_dma_cookie: - if (type == IOMMU_DOMAIN_DMA) - iommu_put_dma_cookie(&domain->domain); err_pgtable: kfree(domain); return NULL; @@ -809,9 +801,6 @@ static void exynos_iommu_domain_free(struct iommu_domain *iommu_domain) spin_unlock_irqrestore(&domain->lock, flags); - if (iommu_domain->type == IOMMU_DOMAIN_DMA) - iommu_put_dma_cookie(iommu_domain); - dma_unmap_single(dma_dev, virt_to_phys(domain->pgtable), LV1TABLE_SIZE, DMA_TO_DEVICE); -- 2.25.1