From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C101FC433F5 for ; Tue, 8 Feb 2022 01:48:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343776AbiBHBsn (ORCPT ); Mon, 7 Feb 2022 20:48:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242270AbiBHB1s (ORCPT ); Mon, 7 Feb 2022 20:27:48 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DD42C043189 for ; Mon, 7 Feb 2022 17:27:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644283668; x=1675819668; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yrnVpbUTBJshPuiouZjgXbQVpQ4Ovq0yS3i0Rg1TiQc=; b=GMMM8E/WO/6dr+a+FiqV7UK7/z50KLslARxpMy5aakIFtmKrrhBAY6W8 wIKoEPxqLjcyOzR7n724y4SpSp6uVjjwB/ql9V+jZDWefnzWVGHE6LwE4 lyFGom7COV8XGy+5RoU04yoU9iBDLLkx0fPheBWkISLvor99eGE6+mCac kYGdFvi3siTxS1OlE1N55kD/ZuVIMTHFFV1QC8RgzrY5gY/D7uss5P46s eXQIZE6XzEtpExxP08bwhbauftitol2gpD+PK8/KVIuwUBB6t0c1tNKx9 KwremeDl3RDKAlY/8y0tX11NvHfwFFSeVpySTWW6l299WoEbLMoQD4mR+ A==; X-IronPort-AV: E=McAfee;i="6200,9189,10251"; a="236251973" X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="236251973" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 17:27:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="677948831" Received: from allen-box.sh.intel.com ([10.239.159.118]) by fmsmga001.fm.intel.com with ESMTP; 07 Feb 2022 17:27:44 -0800 From: Lu Baolu To: Joerg Roedel , Jason Gunthorpe , Christoph Hellwig , Ben Skeggs , Kevin Tian , Ashok Raj , Will Deacon , Robin Murphy Cc: Alex Williamson , Eric Auger , Liu Yi L , Jacob jun Pan , David Airlie , Daniel Vetter , Thierry Reding , Jonathan Hunter , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v2 05/10] iommu: Remove apply_resv_region Date: Tue, 8 Feb 2022 09:25:54 +0800 Message-Id: <20220208012559.1121729-6-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220208012559.1121729-1-baolu.lu@linux.intel.com> References: <20220208012559.1121729-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The apply_resv_region callback in iommu_ops was introduced to reserve an IOVA range in the given DMA domain when the IOMMU driver manages the IOVA by itself. As all drivers converted to use dma-iommu in the core, there's no driver using this anymore. Remove it to avoid dead code. Suggested-by: Robin Murphy Signed-off-by: Lu Baolu --- include/linux/iommu.h | 4 ---- drivers/iommu/iommu.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 9983a01373b2..9ffa2e88f3d0 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -214,7 +214,6 @@ struct iommu_iotlb_gather { * @set_pgtable_quirks: Set io page table quirks (IO_PGTABLE_QUIRK_*) * @get_resv_regions: Request list of reserved regions for a device * @put_resv_regions: Free list of reserved regions for a device - * @apply_resv_region: Temporary helper call-back for iova reserved ranges * @of_xlate: add OF master IDs to iommu grouping * @is_attach_deferred: Check if domain attach should be deferred from iommu * driver init to device driver init (default no) @@ -268,9 +267,6 @@ struct iommu_ops { /* Request/Free a list of reserved regions for a device */ void (*get_resv_regions)(struct device *dev, struct list_head *list); void (*put_resv_regions)(struct device *dev, struct list_head *list); - void (*apply_resv_region)(struct device *dev, - struct iommu_domain *domain, - struct iommu_resv_region *region); int (*of_xlate)(struct device *dev, struct of_phandle_args *args); bool (*is_attach_deferred)(struct iommu_domain *domain, struct device *dev); diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index cf54dc925827..df6bd1d58c74 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -785,9 +785,6 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, dma_addr_t start, end, addr; size_t map_size = 0; - if (domain->ops->apply_resv_region) - domain->ops->apply_resv_region(dev, domain, entry); - start = ALIGN(entry->start, pg_size); end = ALIGN(entry->start + entry->length, pg_size); -- 2.25.1