From 6d8109960931a353a05ce7a4ea94c5eaf4d27724 Mon Sep 17 00:00:00 2001 From: Satya Durga Srinivasu Prabhala Date: Fri, 25 Oct 2024 07:06:31 -0700 Subject: [PATCH] ANDROID: drivers: debug_kinfo: drop KALLSYMS_BASE_RELATIVE reference Commit 64e166099b69 ("kallsyms: get rid of code for absolute kallsyms") dropped support for KALLSYMS_BASE_RELATIVE which is leading to below error in downstream drivers: pc : debug_symbol_available lr : debug_symbol_available Call trace: debug_symbol_available init_module do_one_initcall do_init_module load_module __arm64_sys_finit_module invoke_syscall el0_svc_common.llvm.7307617742197862454 do_el0_svc el0_svc el0t_64_sync_handler el0t_64_sync Fix the error by removing reference to KALLSYMS_BASE_RELATIVE and drop the functionality under it. Bug: 375590296 Change-Id: If7cb9cc0e08b09dfd61f36ce8b7259b820a89e37 Signed-off-by: Satya Durga Srinivasu Prabhala --- drivers/android/debug_kinfo.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/android/debug_kinfo.c b/drivers/android/debug_kinfo.c index 2c9d4bb896aa..090b672f8179 100644 --- a/drivers/android/debug_kinfo.c +++ b/drivers/android/debug_kinfo.c @@ -134,7 +134,6 @@ static int debug_kinfo_probe(struct platform_device *pdev) all_info = (struct kernel_all_info *)all_info_addr; info = &(all_info->info); info->enabled_all = IS_ENABLED(CONFIG_KALLSYMS_ALL); - info->enabled_base_relative = IS_ENABLED(CONFIG_KALLSYMS_BASE_RELATIVE); info->enabled_absolute_percpu = IS_ENABLED(CONFIG_KALLSYMS_ABSOLUTE_PERCPU); info->enabled_cfi_clang = IS_ENABLED(CONFIG_CFI_CLANG); info->num_syms = kallsyms_num_syms; @@ -142,12 +141,8 @@ static int debug_kinfo_probe(struct platform_device *pdev) info->bit_per_long = BITS_PER_LONG; info->module_name_len = MODULE_NAME_LEN; info->symbol_len = KSYM_SYMBOL_LEN; - if (!info->enabled_base_relative) - info->_addresses_pa = (u64)__pa_symbol((volatile void *)kallsyms_addresses); - else { - info->_relative_pa = (u64)__pa_symbol((volatile void *)kallsyms_relative_base); - info->_offsets_pa = (u64)__pa_symbol((volatile void *)kallsyms_offsets); - } + info->_relative_pa = (u64)__pa_symbol((volatile void *)kallsyms_relative_base); + info->_offsets_pa = (u64)__pa_symbol((volatile void *)kallsyms_offsets); info->_stext_pa = (u64)__pa_symbol(_stext); info->_etext_pa = (u64)__pa_symbol(_etext); info->_sinittext_pa = (u64)__pa_symbol(_sinittext);