xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: dma-ops: Add restricted vendor hook"

Browse Source 
This reverts commit 9d2ec2e0b6.

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 <beata.michalska@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7741910039ac9914e2e2adf974204278d37db94d
This commit is contained in:
Greg Kroah-Hartman
2023-02-18 13:33:02 +00:00
parent c2e3f757d3
commit 278dfb09d7
3 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/mm/dma-mapping.c
View File

@@ -11,7 +11,6 @@
#include <xen/xen.h>
#include <xen/swiotlb-xen.h>
#include <trace/hooks/iommu.h>
#include <trace/hooks/dma_noalias.h>
#include <asm/cacheflush.h>
@@ -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;

2
drivers/android/vendor_hooks.c
View File

@@ -42,7 +42,6 @@
#include <trace/hooks/power.h>
#include <trace/hooks/fault.h>
#include <trace/hooks/iommu.h>
#include <trace/hooks/dma_noalias.h>
#include <trace/hooks/thermal.h>
#include <trace/hooks/ufshcd.h>
#include <trace/hooks/block.h>
@@ -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);

19
include/trace/hooks/dma_noalias.h
View File

@@ -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 <trace/hooks/vendor_hooks.h>
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 <trace/define_trace.h>