From 95c72d05ab4182db77168d5bf18804fb65f93816 Mon Sep 17 00:00:00 2001 From: Jeevan Shriram Date: Wed, 17 Jun 2020 10:50:38 -0700 Subject: [PATCH] msm_rtb: Include header in rtb for QGKI Include io.h header files in RTB only for QGKI configuration. Change-Id: I81d7e38ed446040c63e35c66b0b0bd5352b970e6 Signed-off-by: Jeevan Shriram --- arch/arm64/configs/vendor/holi_debug.config | 1 + arch/arm64/configs/vendor/lahaina_consolidate.config | 1 + include/linux/msm_rtb.h | 4 +++- kernel/trace/Kconfig | 10 ++++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/vendor/holi_debug.config b/arch/arm64/configs/vendor/holi_debug.config index f562e5855227..c6c4b804fd7c 100644 --- a/arch/arm64/configs/vendor/holi_debug.config +++ b/arch/arm64/configs/vendor/holi_debug.config @@ -23,6 +23,7 @@ CONFIG_MSM_GENI_SE=y CONFIG_SERIAL_MSM_GENI_HALF_SAMPLING=y CONFIG_QCOM_RTB=y CONFIG_QCOM_RTB_SEPARATE_CPUS=y +CONFIG_QCOM_RTB_QGKI=y CONFIG_IPA_DEBUG=y CONFIG_IPA_UT=y CONFIG_MSM_ADSPRPC=y diff --git a/arch/arm64/configs/vendor/lahaina_consolidate.config b/arch/arm64/configs/vendor/lahaina_consolidate.config index e15ccc4b0532..d0720d4a4dbd 100644 --- a/arch/arm64/configs/vendor/lahaina_consolidate.config +++ b/arch/arm64/configs/vendor/lahaina_consolidate.config @@ -27,6 +27,7 @@ CONFIG_PREEMPTIRQ_EVENTS=y CONFIG_SERIAL_MSM_GENI_CONSOLE=y CONFIG_QCOM_RTB=y CONFIG_QCOM_RTB_SEPARATE_CPUS=y +CONFIG_QCOM_RTB_QGKI=y CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS=y CONFIG_COMMON_CLK_QCOM_DEBUG=y CONFIG_CNSS2_DEBUG=y diff --git a/include/linux/msm_rtb.h b/include/linux/msm_rtb.h index 9183d23c5e01..391c266705a0 100644 --- a/include/linux/msm_rtb.h +++ b/include/linux/msm_rtb.h @@ -1,12 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2012-2014, 2016, 2018-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014, 2016, 2018-2020, The Linux Foundation. All rights reserved. */ #ifndef __MSM_RTB_H__ #define __MSM_RTB_H__ +#ifdef CONFIG_QCOM_RTB_QGKI #include +#endif /* * These numbers are used from the kernel command line and sysfs diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 5cb74865efeb..e38fedf06e56 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -116,6 +116,16 @@ config QCOM_RTB to aid in debugging reset cases where the caches may not be flushed before the target resets. +config QCOM_RTB_QGKI + bool "QCOM RTB QGKI support" + depends on QGKI + help + When QGKI variants are selected, include arch specific io header in + in resolving multiple declaration of various read, write log variants. + This flag is enabled only for QGKI variants and when enabled,ABI + compatibilities are not applicable as exported symbols' CRC changes + with the arch specific header inclusion. + config QCOM_RTB_SEPARATE_CPUS bool "Separate entries for each cpu" depends on QCOM_RTB