--- zzzz-none-000/linux-5.15.111/arch/arm/kernel/process.c 2023-05-11 14:00:40.000000000 +0000 +++ puma7-arm-6670-761/linux-5.15.111/arch/arm/kernel/process.c 2024-02-07 09:27:16.000000000 +0000 @@ -36,6 +36,13 @@ #include "signal.h" +#if defined(CONFIG_AVM_POWER) +#include +#endif /*--- #if defined(CONFIG_AVM_POWER) ---*/ +#if defined(CONFIG_AVM_ENHANCED) +#include +#endif/*--- #if defined(CONFIG_AVM_ENHANCED) ---*/ + #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK) #include unsigned long __stack_chk_guard __read_mostly; @@ -65,10 +72,17 @@ void arch_cpu_idle(void) { +#if defined(CONFIG_AVM_POWER) + avm_cpu_wait_start(); +#endif/*--- #if defined(CONFIG_AVM_POWER) ---*/ if (arm_pm_idle) arm_pm_idle(); else cpu_do_idle(); +#if defined(CONFIG_AVM_POWER) + avm_cpu_wait_end(); + avm_cpu_wait_info(); +#endif/*--- #if defined(CONFIG_AVM_POWER) ---*/ raw_local_irq_enable(); } @@ -127,17 +141,17 @@ printk("PC is at %pS\n", (void *)instruction_pointer(regs)); printk("LR is at %pS\n", (void *)regs->ARM_lr); - printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n", + printk(KERN_ERR"pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n", regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr); - printk("sp : %08lx ip : %08lx fp : %08lx\n", + printk(KERN_ERR"sp : %08lx ip : %08lx fp : %08lx\n", regs->ARM_sp, regs->ARM_ip, regs->ARM_fp); - printk("r10: %08lx r9 : %08lx r8 : %08lx\n", + printk(KERN_ERR"r10: %08lx r9 : %08lx r8 : %08lx\n", regs->ARM_r10, regs->ARM_r9, regs->ARM_r8); - printk("r7 : %08lx r6 : %08lx r5 : %08lx r4 : %08lx\n", + printk(KERN_ERR"r7 : %08lx r6 : %08lx r5 : %08lx r4 : %08lx\n", regs->ARM_r7, regs->ARM_r6, regs->ARM_r5, regs->ARM_r4); - printk("r3 : %08lx r2 : %08lx r1 : %08lx r0 : %08lx\n", + printk(KERN_ERR"r3 : %08lx r2 : %08lx r1 : %08lx r0 : %08lx\n", regs->ARM_r3, regs->ARM_r2, regs->ARM_r1, regs->ARM_r0); @@ -184,13 +198,18 @@ #endif asm("mrc p15, 0, %0, c1, c0\n" : "=r" (ctrl)); - printk("Control: %08x%s\n", ctrl, buf); + printk(KERN_ERR"Control: %08x%s\n", ctrl, buf); } #endif +#if defined(CONFIG_AVM_ENHANCED) + show_register_memoryclassifier(regs); +#endif/*--- #if defined(CONFIG_AVM_ENHANCED) ---*/ } void show_regs(struct pt_regs * regs) { + printk(KERN_ERR"\n"); + __show_regs(regs); dump_stack(); }