Skip to content
Snippets Groups Projects
Commit 330cbfbd authored by Sylvain Gauthier's avatar Sylvain Gauthier
Browse files

Made declaration of handleReservedIRQ optional, refactored consequently

parent 7b019e3d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 28 additions and 155 deletions
include/arch/arm/arch/object/interrupt.h
+ 27
− 0
View file @ 330cbfbd
......@@ -20,6 +20,33 @@ exception_t Arch_decodeIRQControlInvocation(word_t invLabel, word_t length,
cte_t *srcSlot, extra_caps_t excaps,
word_t *buffer);
/* Handle a platform-reserved IRQ. */
#define DEF_HANDLE_RESERVED_IRQ
static inline void
handleReservedIRQ(irq_t irq)
{
#ifdef CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT
if (irq == KERNEL_PMU_IRQ) {
handleOverflowIRQ();
}
#endif /* CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT */
#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
if ((config_set(CONFIG_ARM_HYPERVISOR_SUPPORT)) && (irq == INTERRUPT_VGIC_MAINTENANCE)) {
VGICMaintenance();
return;
}
#endif
#ifdef CONFIG_ARM_SMMMU
if (config_set(CONFIG_ARM_SMMU) && (irq == INTERRUPT_SMMU)) {
plat_smmu_handle_interrupt();
return;
}
#endif
}
static inline exception_t
Arch_checkIRQ(word_t irq_w)
{
......
include/plat/allwinnerA20/plat/machine/hardware.h
+ 0
− 10
View file @ 330cbfbd
......@@ -11,16 +11,6 @@
#ifndef __PLAT_MACHINE_HARDWARE_H
#define __PLAT_MACHINE_HARDWARE_H
#include <util.h>
#include <basic_types.h>
#include <linker.h>
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
}
#endif
include/plat/am335x/plat/machine/hardware.h
+ 0
− 3
View file @ 330cbfbd
......@@ -11,9 +11,6 @@
#ifndef __PLAT_MACHINE_HARDWARE_H
#define __PLAT_MACHINE_HARDWARE_H
#include <basic_types.h>
#include <linker.h>
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
#include <plat/machine/interrupt.h>
......
include/plat/am335x/plat/machine/interrupt.h
+ 0
− 6
View file @ 330cbfbd
......@@ -101,12 +101,6 @@ maskInterrupt(bool_t disable, interrupt_t irq)
}
}
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
}
static inline void
ackInterrupt(irq_t irq)
{
......
include/plat/apq8064/plat/machine/hardware.h
+ 0
− 6
View file @ 330cbfbd
......@@ -16,10 +16,4 @@
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
}
#endif /* !__PLAT_MACHINE_HARDWARE_H */
include/plat/bcm2837/plat/machine.h
+ 0
− 8
View file @ 330cbfbd
......@@ -132,14 +132,6 @@ enum irqNumbers {
irqInvalid = (irq_t) - 1
};
static inline void
handleReservedIRQ(irq_t irq)
{
if (config_set(CONFIG_IRQ_REPORTING)) {
printf("Received reserved IRQ: %d\n", (int)irq);
}
}
interrupt_t
getActiveIRQ(void);
......
include/plat/exynos4/plat/machine/hardware.h
+ 0
− 6
View file @ 330cbfbd
......@@ -16,10 +16,4 @@
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
}
#endif /* !__PLAT_MACHINE_HARDWARE_H */
include/plat/exynos5/plat/machine/hardware.h
+ 0
− 11
View file @ 330cbfbd
......@@ -18,15 +18,4 @@
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
if ((config_set(CONFIG_ARM_HYPERVISOR_SUPPORT)) &&
(irq == INTERRUPT_VGIC_MAINTENANCE)) {
VGICMaintenance();
return;
}
}
#endif /* !__PLAT_MACHINE_HARDWARE_H */
include/plat/hikey/plat/machine/hardware.h
+ 0
− 6
View file @ 330cbfbd
......@@ -17,10 +17,4 @@
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
}
#endif
include/plat/imx31/plat/machine/interrupt.h
+ 0
− 11
View file @ 330cbfbd
......@@ -84,17 +84,6 @@ maskInterrupt(bool_t disable, interrupt_t irq)
}
}
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
#ifdef CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT
if (irq == KERNEL_PMU_IRQ) {
handleOverflowIRQ();
}
#endif /* CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT */
}
static inline void
ackInterrupt(irq_t irq)
{
......
include/plat/imx6/plat/machine/hardware.h
+ 0
− 15
View file @ 330cbfbd
......@@ -11,21 +11,6 @@
#ifndef __PLAT_MACHINE_HARDWARE_H
#define __PLAT_MACHINE_HARDWARE_H
#include <config.h>
#include <basic_types.h>
#include <linker.h>
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
#include <arch/benchmark_overflowHandler.h>
static inline void
handleReservedIRQ(irq_t irq)
{
#ifdef CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT
if (irq == KERNEL_PMU_IRQ) {
handleOverflowIRQ();
}
#endif /* CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT */
}
#endif /* !__PLAT_MACHINE_HARDWARE_H */
include/plat/imx7/plat/machine/hardware.h
+ 0
− 6
View file @ 330cbfbd
......@@ -16,10 +16,4 @@
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
}
#endif /* !__PLAT_MACHINE_HARDWARE_H */
include/plat/omap3/plat/machine/interrupt.h
+ 0
− 10
View file @ 330cbfbd
......@@ -91,16 +91,6 @@ maskInterrupt(bool_t disable, interrupt_t irq)
}
}
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
/* We shouldn't be receiving any reserved IRQs anyway. */
maskInterrupt(true, irq);
return;
}
static inline void
ackInterrupt(irq_t irq)
{
......
include/plat/pc99/plat/machine/interrupt.h
+ 1
− 0
View file @ 330cbfbd
......@@ -24,6 +24,7 @@
#include <plat/machine/intel-vtd.h>
/* Handle a platform-reserved IRQ. */
#define DEF_HANDLE_RESERVED_IRQ
static inline void
handleReservedIRQ(irq_t irq)
{
......
include/plat/spike/plat/machine/hardware.h
+ 0
− 1
View file @ 330cbfbd
......@@ -65,7 +65,6 @@ bool_t add_avail_p_reg(p_region_t reg);
void map_kernel_devices(void);
bool_t CONST isReservedIRQ(irq_t irq);
void handleReservedIRQ(irq_t irq);
void ackInterrupt(irq_t irq);
bool_t isIRQPending(void);
/** MODIFIES: [*] */
......
include/plat/tk1/plat/machine/hardware.h
+ 0
− 21
View file @ 330cbfbd
......@@ -24,25 +24,4 @@
#include <mode/api/constants.h>
#include <arch/benchmark_overflowHandler.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
#ifdef CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT
if (irq == KERNEL_PMU_IRQ) {
handleOverflowIRQ();
}
#endif /* CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT */
if ((config_set(CONFIG_ARM_HYPERVISOR_SUPPORT)) && (irq == INTERRUPT_VGIC_MAINTENANCE)) {
VGICMaintenance();
return;
}
if (config_set(CONFIG_ARM_SMMU) && (irq == INTERRUPT_SMMU)) {
plat_smmu_handle_interrupt();
return;
}
}
#endif
include/plat/tx1/plat/machine/hardware.h
+ 0
− 11
View file @ 330cbfbd
......@@ -20,15 +20,4 @@
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
if ((config_set(CONFIG_ARM_HYPERVISOR_SUPPORT)) && (irq == INTERRUPT_VGIC_MAINTENANCE)) {
VGICMaintenance();
return;
}
printf("spurious irq %d\n", (int)irq);
}
#endif /* __PLAT_MACHINE_HARDWARE_H */
include/plat/tx2/plat/machine/hardware.h
+ 0
− 7
View file @ 330cbfbd
......@@ -20,11 +20,4 @@
#include <plat/machine.h>
#include <plat/machine/devices_gen.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
printf("spurious irq %d\n", (int)irq);
}
#endif /* __PLAT_MACHINE_HARDWARE_H */
include/plat/zynq7000/plat/machine/hardware.h
+ 0
− 11
View file @ 330cbfbd
......@@ -18,15 +18,4 @@
#include <plat/machine/devices_gen.h>
#include <arch/benchmark_overflowHandler.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
#ifdef CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT
if (irq == KERNEL_PMU_IRQ) {
handleOverflowIRQ();
}
#endif /* CONFIG_ARM_ENABLE_PMU_OVERFLOW_INTERRUPT */
}
#endif /* !__PLAT_MACHINE_HARDWARE_H */
include/plat/zynqmp/plat/machine/hardware.h
+ 0
− 6
View file @ 330cbfbd
......@@ -27,10 +27,4 @@
#include <plat/machine/devices_gen.h>
#include <machine/io.h>
/* Handle a platform-reserved IRQ. */
static inline void
handleReservedIRQ(irq_t irq)
{
}
#endif /* !__PLAT_MACHINE_HARDWARE_H */
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment