Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp256574pxt; Wed, 4 Aug 2021 10:17:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5HLPgp5jL/QG9XtKIQYRgbaB/b+Ii0J3xTNe4SPK2KKUQ2zscTPm6BLBTpCjEhbwDVvkB X-Received: by 2002:a05:6e02:78c:: with SMTP id q12mr520652ils.243.1628097474607; 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=rK+Oj3gMN9Gp96DCut3KbvHMBdBhKUDrt8fieap+vGdk3PrpxCvajp9HaULMw6zS+m dTrlklgoB8m0rsRn541weDqfFhmC0DJZG80YbxZCWM0s6EWaNSp1CP27xLe0jyiLciOE Ck2NkZ8sovMqNCOqYnYU2zdiJPY0i7LcCwm8yv/ZkiqHz4d5sSxXwEXWmyJTtY4wEw9m 1dYksSUBvle4+cXRA6Wc6kFNwY/Hyk8XMdDeDuR1IFDQveqdzgiqhFQ8+LscoLZPQFLl c5waoppAi2nwbaOQrv4gjlC59iChmqU3fQyVH20xwaQNjpmoQa9bKh6hk0GKvOt5rA3f fSHw== 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=aK72q3x2zZgvJoknQ89+7y43fKv38qA4to5SYs7s3Go=; b=0yz0ZfoQaH9JskQqdozkX89XYqqVO8Eva1AYLGo+nLYI/ZATo5Hafx3hfqUvtuUDcC bN08dYyHubBiPbGMdD3ItErAh1nLvOOEBxA3nNqiOxYqcY2D0AIcQAh9u82diONBLwsc sZfHHtvmWDk3MSz5unYkbPNZp7XFehWFQ2djQIrW4dI/F99m02wG1aet/O9f0bWXoFGA KnOlDtkXY+ncqKn+K++AaBSfZh2Jx/XiUKkEpHGl5rQRkXkASrBJE0ih16bf7uQhZ4jY 1Bbm9SuANz/ZERq13Qz5+0H4Iax5xv7vvW2wC0aBb9twFVmlolBTyIoVx4qc6Ki0inIG sjKw== 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 d14si2780544ilq.43.2021.08.04.10.17.42; 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 S239874AbhHDRQv (ORCPT + 99 others); Wed, 4 Aug 2021 13:16:51 -0400 Received: from foss.arm.com ([217.140.110.172]:34948 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230052AbhHDRQi (ORCPT ); Wed, 4 Aug 2021 13:16:38 -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 7E52E31B; Wed, 4 Aug 2021 10:16:25 -0700 (PDT) Received: from 010265703453.arm.com (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A67D13F66F; Wed, 4 Aug 2021 10:16:23 -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, Heiko Stuebner Subject: [PATCH v3 08/25] iommu/rockchip: Drop IOVA cookie management Date: Wed, 4 Aug 2021 18:15:36 +0100 Message-Id: <0d25511c58981ecd0a1f3006dc1c30a73fb7d377.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 core code bakes its own cookies now. CC: Heiko Stuebner Signed-off-by: Robin Murphy --- v3: Also remove unneeded include --- drivers/iommu/rockchip-iommu.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 9febfb7f3025..5cb260820eda 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -1074,10 +1073,6 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) if (!rk_domain) return NULL; - if (type == IOMMU_DOMAIN_DMA && - iommu_get_dma_cookie(&rk_domain->domain)) - goto err_free_domain; - /* * rk32xx iommus use a 2 level pagetable. * Each level1 (dt) and level2 (pt) table has 1024 4-byte entries. @@ -1085,7 +1080,7 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) */ rk_domain->dt = (u32 *)get_zeroed_page(GFP_KERNEL | GFP_DMA32); if (!rk_domain->dt) - goto err_put_cookie; + goto err_free_domain; rk_domain->dt_dma = dma_map_single(dma_dev, rk_domain->dt, SPAGE_SIZE, DMA_TO_DEVICE); @@ -1106,9 +1101,6 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) err_free_dt: free_page((unsigned long)rk_domain->dt); -err_put_cookie: - if (type == IOMMU_DOMAIN_DMA) - iommu_put_dma_cookie(&rk_domain->domain); err_free_domain: kfree(rk_domain); @@ -1137,8 +1129,6 @@ static void rk_iommu_domain_free(struct iommu_domain *domain) SPAGE_SIZE, DMA_TO_DEVICE); free_page((unsigned long)rk_domain->dt); - if (domain->type == IOMMU_DOMAIN_DMA) - iommu_put_dma_cookie(&rk_domain->domain); kfree(rk_domain); } -- 2.25.1