From 278dfb09d7bfbea2c30b57784cd8de2553fd86cf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 18 Feb 2023 13:33:02 +0000 Subject: [PATCH] Revert "ANDROID: dma-ops: Add restricted vendor hook" This reverts commit 9d2ec2e0b69e81d5925e363f3a4e0b6cfaefb7e7. The hook android_rvh_setup_dma_ops is not used by any vendor, so remove it to help with merge issues with future LTS releases. If this is needed by any real user, it can easily be reverted to add it back and then the symbol should be added to the abi list at the same time to prevent it from being removed again later. Bug: 263236925 Bug: 203756332 Cc: Beata Michalska Signed-off-by: Greg Kroah-Hartman Change-Id: I7741910039ac9914e2e2adf974204278d37db94d --- arch/arm64/mm/dma-mapping.c | 4 ---- drivers/android/vendor_hooks.c | 2 -- include/trace/hooks/dma_noalias.h | 19 ------------------- 3 files changed, 25 deletions(-) delete mode 100644 include/trace/hooks/dma_noalias.h diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 19ceea8fea1a..e75e5e75b192 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -11,7 +11,6 @@ #include #include #include -#include #include @@ -57,9 +56,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, trace_android_rvh_iommu_setup_dma_ops(dev, dma_base, size); } - /* Allow vendor modules to opt-in for the 2454944 erratum workaround */ - trace_android_rvh_setup_dma_ops(dev); - #ifdef CONFIG_XEN if (xen_initial_domain()) dev->dma_ops = &xen_swiotlb_dma_ops; diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 54c46c11c09a..5702bf54e0e6 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -217,7 +216,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_die_kernel_fault); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sea); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_mem_abort); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sp_pc_abort); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_setup_dma_ops); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_iommu_setup_dma_ops); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_setup_dma_ops); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_alloc_iova); diff --git a/include/trace/hooks/dma_noalias.h b/include/trace/hooks/dma_noalias.h deleted file mode 100644 index 2dc7b04d9ab2..000000000000 --- a/include/trace/hooks/dma_noalias.h +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM dma_noalias - -#define TRACE_INCLUDE_PATH trace/hooks - -#if !defined(_TRACE_HOOK_DMA_NOALIAS_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_HOOK_DMA_NOALIAS_H - -#include - -DECLARE_RESTRICTED_HOOK(android_rvh_setup_dma_ops, - TP_PROTO(struct device *dev), - TP_ARGS(dev), 1); - -#endif /*_TRACE_HOOK_DMA_NOALIAS_H */ - -/* This part must be outside protection */ -#include