From 4373261be0bcd34ee3bfeec334685db95ca597b0 Mon Sep 17 00:00:00 2001 From: Prasad Sodagudi Date: Wed, 9 Jun 2021 13:48:47 -0700 Subject: [PATCH] ANDROID: tracing: Add generic flag for register tracing disable Instead of using __KVM_NVHE_HYPERVISOR__ flag from NVHE, add generic flag(__DISABLE_TRACE_MMIO__) for disabling register read/write tracing. This helps to disable the tracing for a specific driver to avoid flooding of register read/write operation logging. For example - CFLAGS_msm_geni_serial.o := -D__DISABLE_TRACE_MMIO__ Bug: 190629271 Change-Id: Ic8e84eb84a485058d6a37cc2b495f5584c7d2b43 Signed-off-by: Prasad Sodagudi --- arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- include/linux/log_mmiorw.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index a6c007816bd9..73bd835d6aad 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -4,7 +4,7 @@ # asflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS -ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS +ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS -D__DISABLE_TRACE_MMIO__ hostprogs := gen-hyprel HOST_EXTRACFLAGS += -I$(objtree)/include diff --git a/include/linux/log_mmiorw.h b/include/linux/log_mmiorw.h index b42ef5ac8d99..a7cc101cd881 100644 --- a/include/linux/log_mmiorw.h +++ b/include/linux/log_mmiorw.h @@ -13,9 +13,9 @@ * TODO - io.h is included in NVHE files and these tracepoints are getting * enabled for NVHE too. To avoid these tracepoints enabling in NHVE below * condition is introduced. - * !(defined(__KVM_NVHE_HYPERVISOR__)) + * !(defined(__DISABLE_TRACE_MMIO__)) */ -#if IS_ENABLED(CONFIG_TRACE_MMIO_ACCESS) && !(defined(__KVM_NVHE_HYPERVISOR__)) +#if IS_ENABLED(CONFIG_TRACE_MMIO_ACCESS) && !(defined(__DISABLE_TRACE_MMIO__)) DECLARE_TRACEPOINT(rwmmio_write); DECLARE_TRACEPOINT(rwmmio_read); DECLARE_TRACEPOINT(rwmmio_post_read);