Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp256922pxt; Wed, 4 Aug 2021 10:18:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUNmzWzRLW7h6RCK9aGKIXM0H8ry0owUJvvAMmrPRhm1Y/ARFn3TyJfTnz4PbCzVd/VXDx X-Received: by 2002:a92:1e10:: with SMTP id e16mr551588ile.266.1628097503762; Wed, 04 Aug 2021 10:18:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628097503; cv=none; d=google.com; s=arc-20160816; b=YLwoOzYt7FUPI6w5flCoNH8UDa80QwRAZ+yBWCWjjlwEmOdMHGGaPQzUjVGgwKisAz g+G2AVOTKkzQi071yg8qgKtSr32AQPaisYAfUhFNqMe5Q8LQXZjojiRDBw8TZh765J17 MaFYB/KjA0Es8waoxgZXKYWTsteInaABGKC+olaWpHkPYBW5fjww8+uR3fozXJisBI05 LzfU8ySVDVCQrun5D2v8W2Qi28rJWFeAhCZneJoVdFVUdFEMwpsFuF4dCEHHdtzpMcHU 259AxFus3sdZGvBSLguC+FATTKQxpQKpxINnJRCCodtcwJIey6723+4DbatlrhWOPhSn FYJw== 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=+hw9Q/4O2oJEhIZmFqfA+M8fbhi/JCa0Wt6iQ5vcOak=; b=0YYqI4KOlLQqu2B5K8qPZ+5qXh0+4b2UKfz5YTxrlm2gvVoj5KU9oBxeczrC/h9HH0 QYGbi4BqgT2bXDVxOlJbYLaR5A2slIb1QDP8sZAr+mczhARThETnEI6qbjMgU30jf2+Q bdcQM2LTrp5OUsWz4deXFr0C3evWixBGKnFvENehv6gV6wsiWzB+7YJ6JfsZOU540UM6 AlSQ0JOC+cWEjPgZZA2PDu+chE294deqHEsZnLyIob+yotrYynaQQUVGRTRHEZmVMWLv /aUD/Z+X6NWbTExZ4Zs6zkhhi1K2SZziongohk4NRVU5enRnKV3CcQnHLSL+ngtTl+HG /UBQ== 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 k14si3115166jad.34.2021.08.04.10.18.12; Wed, 04 Aug 2021 10:18:23 -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 S239894AbhHDRQn (ORCPT + 99 others); Wed, 4 Aug 2021 13:16:43 -0400 Received: from foss.arm.com ([217.140.110.172]:34920 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239835AbhHDRQg (ORCPT ); Wed, 4 Aug 2021 13:16:36 -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 690091063; Wed, 4 Aug 2021 10:16:23 -0700 (PDT) Received: from 010265703453.arm.com (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8D59A3F66F; Wed, 4 Aug 2021 10:16:21 -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, Yong Wu Subject: [PATCH v3 07/25] iommu/mtk: Drop IOVA cookie management Date: Wed, 4 Aug 2021 18:15:35 +0100 Message-Id: <7c3e480fc18018ec75363579c257ff825d0ca123.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: Yong Wu Signed-off-by: Robin Murphy --- v3: Also remove unneeded includes --- drivers/iommu/mtk_iommu.c | 7 ------- drivers/iommu/mtk_iommu_v1.c | 1 - 2 files changed, 8 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 6f7c69688ce2..185694eb4456 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -441,17 +440,11 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) if (!dom) return NULL; - if (iommu_get_dma_cookie(&dom->domain)) { - kfree(dom); - return NULL; - } - return &dom->domain; } static void mtk_iommu_domain_free(struct iommu_domain *domain) { - iommu_put_dma_cookie(domain); kfree(to_mtk_domain(domain)); } diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index 778e66f5f1aa..be22fcf988ce 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include -- 2.25.1