github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: iommu: Add vendor hook

Browse Source 
Add vendor hook for arch_setup_dma_ops to allow vendor enhancement.

Bug: 179291683

Change-Id: Ie847a14d6536eb151cbd0a93452f6895ee451930
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
Signed-off-by: Chris Goldsworthy <cgoldswo@codeaurora.org>
This commit is contained in:
Patrick Daly 2021-02-03 15:47:52 -08:00 committed by Suren Baghdasaryan
parent d50b67ac75
commit 575ad9a263
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@
#include <linux/dma-iommu.h>
#include <xen/xen.h>
#include <xen/swiotlb-xen.h>
#include <trace/hooks/iommu.h>
#include <asm/cacheflush.h>
@ -49,8 +50,10 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
ARCH_DMA_MINALIGN, cls);
dev->dma_coherent = coherent;
if (iommu)
if (iommu) {
iommu_setup_dma_ops(dev, dma_base, size);
trace_android_vh_iommu_setup_dma_ops(dev, dma_base, size);
}
#ifdef CONFIG_XEN
if (xen_initial_domain())

2
drivers/android/vendor_hooks.c
View File

@ -35,6 +35,7 @@
#include <trace/hooks/softlockup.h>
#include <trace/hooks/power.h>
#include <trace/hooks/fault.h>
#include <trace/hooks/iommu.h>
/*
* Export tracepoints that act as a bare tracehook (ie: have no trace event
@ -150,3 +151,4 @@ 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_vh_iommu_setup_dma_ops);

30
include/trace/hooks/iommu.h Normal file
View File

@ -0,0 +1,30 @@
/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM iommu
#define TRACE_INCLUDE_PATH trace/hooks
#if !defined(_TRACE_HOOK_IOMMU_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_HOOK_IOMMU_H
#include <linux/types.h>
#include <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h>
#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
DECLARE_HOOK(android_vh_iommu_setup_dma_ops,
TP_PROTO(struct device *dev, u64 dma_base, u64 size),
TP_ARGS(dev, dma_base, size));
#else
#define trace_android_vh_iommu_setup_dma_ops(dev, dma_base, size)
#endif
#endif /* _TRACE_HOOK_IOMMU_H */
/* This part must be outside protection */
#include <trace/define_trace.h>