From 5aea34a2f3470393d89978499605d4c6cdc38cf0 Mon Sep 17 00:00:00 2001 From: Chris Goldsworthy Date: Wed, 25 May 2022 16:44:51 -0700 Subject: [PATCH] qcom-iommu-util: Add iommu_domain_ops to qcom_iommu_ops commit 9a630a4b41a2 ("iommu: Split struct iommu_ops") adds a new type iommu_domain_ops that covers all per-domain (i.e. "translation) operations (setting up page tables, doing TLB maintenance, etc.) are moved from iommu_ops into this domain specific structure. As a result of this, IOMMU domains now only supply a pointer to these domain ops and not the iommu_ops. Thus, add a iommu_domain_ops member in qciom_iommu_ops. Change-Id: I77919feed92232e1b487cd621d164f597676d14c Signed-off-by: Chris Goldsworthy --- include/linux/qcom-iommu-util.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/qcom-iommu-util.h b/include/linux/qcom-iommu-util.h index 291e91f52e21..b90008bfcd13 100644 --- a/include/linux/qcom-iommu-util.h +++ b/include/linux/qcom-iommu-util.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __QCOM_IOMMU_UTIL_H @@ -97,8 +98,9 @@ struct qcom_iommu_ops { int (*enable_s1_translation)(struct iommu_domain *domain); int (*get_mappings_configuration)(struct iommu_domain *domain); struct iommu_ops iommu_ops; + struct iommu_domain_ops domain_ops; }; -#define to_qcom_iommu_ops(x) (container_of(x, struct qcom_iommu_ops, iommu_ops)) +#define to_qcom_iommu_ops(x) (container_of(x, struct qcom_iommu_ops, domain_ops)) struct device_node *qcom_iommu_group_parse_phandle(struct device *dev); int qcom_iommu_generate_dma_regions(struct device *dev,