Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c12d8d2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm_rtb: Include <asm/io.h> header in rtb for QGKI"

parents 988fc3d6 95c72d05

arch/arm64/configs/vendor/holi_debug.config

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm64/configs/vendor/lahaina_consolidate.config

+1 −0
Original line number Diff line number Diff line
@@ -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

include/linux/msm_rtb.h

+3 −1
Original line number Diff line number Diff line 
/* 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 <asm/io.h>

#endif



/*

 * These numbers are used from the kernel command line and sysfs

kernel/trace/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -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