lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dev][arm_gic] fix warning in arm64 by adding arm/arm64 specific iframe code

Browse Source 
It's all in service of a LTRACEF, but it's one I use commonly enough to debug
stuff that it's probably worth it. No actual overhead, except what's already
in the first level handlers.
This commit is contained in:
Travis Geiselbrecht
2015-09-20 13:51:15 -07:00
parent 36c8eb6af3
commit caec70a21b
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dev/interrupt/arm_gic/arm_gic.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2014 Travis Geiselbrecht
* Copyright (c) 2012-2015 Travis Geiselbrecht
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files
@@ -41,6 +41,17 @@
#define LOCAL_TRACE 0
#if ARCH_ARM
#include <arch/arm.h>
#define iframe arm_iframe
#define IFRAME_PC(frame) ((frame)->pc)
#endif
#if ARCH_ARM64
#include <arch/arm64.h>
#define iframe arm64_iframe_short
#define IFRAME_PC(frame) ((frame)->elr)
#endif
static status_t arm_gic_set_secure_locked(u_int irq, bool secure);
static spin_lock_t gicd_lock;
@@ -358,7 +369,7 @@ status_t unmask_interrupt(unsigned int vector)
}
static
enum handler_return __platform_irq(struct arm_iframe *frame)
enum handler_return __platform_irq(struct iframe *frame)
{
// get the current vector
uint32_t iar = GICREG(0, GICC_IAR);
@@ -374,8 +385,8 @@ enum handler_return __platform_irq(struct arm_iframe *frame)
uint cpu = arch_curr_cpu_num();
// printf("platform_irq: iar 0x%x cpu %u spsr 0x%x, pc 0x%x, currthread %p, vector %d\n",
// iar, cpu, frame->spsr, frame->pc, get_current_thread(), vector);
LTRACEF_LEVEL(2, "iar 0x%x cpu %u currthread %p vector %d pc 0x%lx\n", iar, cpu,
get_current_thread(), vector, (uintptr_t)IFRAME_PC(frame));
// deliver the interrupt
enum handler_return ret;
@@ -387,14 +398,14 @@ enum handler_return __platform_irq(struct arm_iframe *frame)
GICREG(0, GICC_EOIR) = iar;
// printf("platform_irq: cpu %u exit %d\n", cpu, ret);
LTRACEF_LEVEL(2, "cpu %u exit %d\n", cpu, ret);
KEVLOG_IRQ_EXIT(vector);
return ret;
}
enum handler_return platform_irq(struct arm_iframe *frame)
enum handler_return platform_irq(struct iframe *frame)
{
#if WITH_LIB_SM
uint32_t ahppir = GICREG(0, GICC_AHPPIR);
@@ -437,7 +448,7 @@ enum handler_return platform_irq(struct arm_iframe *frame)
#endif
}
void platform_fiq(struct arm_iframe *frame)
void platform_fiq(struct iframe *frame)
{
#if WITH_LIB_SM
sm_handle_fiq();