portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm: Rename gic_pl390 to gic_v2

Browse source 
This is to reflect that this driver provides support for features that
are newer than gic_pl390 such as virtualisation.
This commit is contained in:
Kent McLeod 2019-03-27 14:05:46 +11:00
parent 60e64bd53a
commit 0d60f6f298
17 changed files with 43 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/arch/arm/arch/machine/gic_pl390.h → include/arch/arm/arch/machine/gic_v2.h
View file

@ -11,8 +11,8 @@
/*
* ARM Generic Interrupt Controller PL-390
*/
#ifndef __ARCH_MACHINE_GICPL390_H
#define __ARCH_MACHINE_GICPL390_H
#ifndef __ARCH_MACHINE_GIC_V2_H
#define __ARCH_MACHINE_GIC_V2_H
/* tell the kernel we have the set trigger feature */
#define HAVE_SET_TRIGGER 1
@ -321,4 +321,4 @@ static inline void set_gic_vcpu_ctrl_lr(int num, virq_t lr)
#endif /* End of CONFIG_ARM_HYPERVISOR_SUPPORT */
#endif /* !__ARCH_MACHINE_GICPL390_H */
#endif /* !__ARCH_MACHINE_GIC_V2_H */

20
src/arch/arm/machine/gic_pl390.c → src/arch/arm/machine/gic_v2.c
View file

@ -9,7 +9,7 @@
*/
#include <config.h>
#include <arch/machine/gic_pl390.h>
#include <arch/machine/gic_v2.h>
#define TARGET_CPU_ALLINT(CPU) ( \
( ((CPU)&0xff)<<0u ) |\
@ -24,18 +24,18 @@
#define IRQ_SET_ALL 0xffffffff;
#ifndef GIC_PL390_DISTRIBUTOR_PPTR
#error GIC_PL390_DISTRIBUTOR_PPTR must be defined for virtual memory access to the gic distributer
#ifndef GIC_V2_DISTRIBUTOR_PPTR
#error GIC_V2_DISTRIBUTOR_PPTR must be defined for virtual memory access to the gic distributer
#else /* GIC_DISTRIBUTOR_PPTR */
volatile struct gic_dist_map *const gic_dist =
(volatile struct gic_dist_map *)(GIC_PL390_DISTRIBUTOR_PPTR);
(volatile struct gic_dist_map *)(GIC_V2_DISTRIBUTOR_PPTR);
#endif /* GIC_DISTRIBUTOR_PPTR */
#ifndef GIC_PL390_CONTROLLER_PPTR
#error GIC_PL390_CONTROLLER_PPTR must be defined for virtual memory access to the gic cpu interface
#ifndef GIC_V2_CONTROLLER_PPTR
#error GIC_V2_CONTROLLER_PPTR must be defined for virtual memory access to the gic cpu interface
#else /* GIC_CONTROLLER_PPTR */
volatile struct gic_cpu_iface_map *const gic_cpuiface =
(volatile struct gic_cpu_iface_map *)(GIC_PL390_CONTROLLER_PPTR);
(volatile struct gic_cpu_iface_map *)(GIC_V2_CONTROLLER_PPTR);
#endif /* GIC_CONTROLLER_PPTR */
uint32_t active_irq[CONFIG_MAX_NUM_NODES] = {IRQ_NONE};
@ -226,11 +226,11 @@ void setIRQTarget(irq_t irq, seL4_Word target)
#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
#ifndef GIC_PL400_VCPUCTRL_PPTR
#error GIC_PL400_VCPUCTRL_PPTR must be defined for virtual memory access to the gic virtual cpu interface control
#ifndef GIC_V2_VCPUCTRL_PPTR
#error GIC_V2_VCPUCTRL_PPTR must be defined for virtual memory access to the gic virtual cpu interface control
#else /* GIC_PL400_GICVCPUCTRL_PPTR */
volatile struct gich_vcpu_ctrl_map *gic_vcpu_ctrl =
(volatile struct gich_vcpu_ctrl_map *)(GIC_PL400_VCPUCTRL_PPTR);
(volatile struct gich_vcpu_ctrl_map *)(GIC_V2_VCPUCTRL_PPTR);
#endif /* GIC_PL400_GICVCPUCTRL_PPTR */
unsigned int gic_vcpu_num_list_regs;

2
src/arch/arm/object/vcpu.c
View file

@ -16,7 +16,7 @@
#include <armv/vcpu.h>
#include <arch/machine/debug.h> /* Arch_debug[A/Di]ssociateVCPUTCB() */
#include <arch/machine/debug_conf.h>
#include <arch/machine/gic_pl390.h>
#include <arch/machine/gic_v2.h>
static inline void vcpu_save_reg(vcpu_t *vcpu, word_t reg)

4
src/plat/allwinnerA20/config.cmake
View file

@ -26,11 +26,11 @@ if(KernelPlatformAllwinnerA20)
TIMER_FREQUENCY 24000000llu
MAX_IRQ 122
TIMER drivers/timer/allwinner.h
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
)
endif()
add_sources(
DEP "KernelPlatformAllwinnerA20"
CFILES src/plat/allwinnerA20/machine/l2cache.c src/arch/arm/machine/gic_pl390.c
CFILES src/plat/allwinnerA20/machine/l2cache.c src/arch/arm/machine/gic_v2.c
)

4
src/plat/apq8064/config.cmake
View file

@ -27,11 +27,11 @@ if(KernelPlatformAPQ8064)
TIMER_FREQUENCY 7000000llu
MAX_IRQ 283
TIMER drivers/timer/arm_generic.h
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
)
endif()
add_sources(
DEP "KernelPlatformAPQ8064"
CFILES src/arch/arm/machine/gic_pl390.c src/arch/arm/machine/l2c_nop.c
CFILES src/arch/arm/machine/gic_v2.c src/arch/arm/machine/l2c_nop.c
)

4
src/plat/exynos4/config.cmake
View file

@ -26,11 +26,11 @@ if(KernelPlatformExynos4)
TIMER_FREQUENCY 24000000llu
MAX_IRQ 159
TIMER drivers/timer/exynos4412-mct.h
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
)
endif()
add_sources(
DEP "KernelPlatformExynos4"
CFILES src/arch/arm/machine/l2c_310.c src/arch/arm/machine/gic_pl390.c
CFILES src/arch/arm/machine/l2c_310.c src/arch/arm/machine/gic_v2.c
)

4
src/plat/exynos5/config.cmake
View file

@ -71,11 +71,11 @@ if(KernelPlatExynos5)
TIMER_FREQUENCY 24000000llu
MAX_IRQ 232
TIMER drivers/timer/arm_generic.h
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
)
endif()
add_sources(
DEP "KernelPlatExynos5"
CFILES src/arch/arm/machine/gic_pl390.c src/arch/arm/machine/l2c_nop.c
CFILES src/arch/arm/machine/gic_v2.c src/arch/arm/machine/l2c_nop.c
)

4
src/plat/hikey/config.cmake
View file

@ -36,7 +36,7 @@ if(KernelPlatformHikey)
TIMER_FREQUENCY 1200000llu
MAX_IRQ 159
TIMER drivers/timer/arm_generic.h
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
)
endif()
@ -94,5 +94,5 @@ config_option(
add_sources(
DEP "KernelPlatformHikey"
CFILES src/arch/arm/machine/gic_pl390.c src/arch/arm/machine/l2c_nop.c
CFILES src/arch/arm/machine/gic_v2.c src/arch/arm/machine/l2c_nop.c
)

4
src/plat/imx6/config.cmake
View file

@ -43,12 +43,12 @@ if(KernelPlatImx6)
declare_default_headers(
TIMER_FREQUENCY 400000000llu
MAX_IRQ 159
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
TIMER drivers/timer/arm_priv.h
)
endif()
add_sources(
DEP "KernelPlatImx6"
CFILES src/arch/arm/machine/l2c_310.c src/arch/arm/machine/gic_pl390.c
CFILES src/arch/arm/machine/l2c_310.c src/arch/arm/machine/gic_v2.c
)

4
src/plat/imx7/config.cmake
View file

@ -26,7 +26,7 @@ if(KernelPlatImx7)
TIMER_FREQUENCY 8000000llu
MAX_IRQ 159
TIMER drivers/timer/arm_generic.h
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
)
else()
config_set(KernelPlatImx7 PLAT_IMX7 OFF)
@ -34,5 +34,5 @@ endif()
add_sources(
DEP "KernelPlatImx7"
CFILES src/arch/arm/machine/gic_pl390.c src/arch/arm/machine/l2c_nop.c
CFILES src/arch/arm/machine/gic_v2.c src/arch/arm/machine/l2c_nop.c
)

4
src/plat/odroidc2/config.cmake
View file

@ -25,11 +25,11 @@ if(KernelPlatformOdroidc2)
TIMER_FREQUENCY 24000000llu
MAX_IRQ 250
TIMER drivers/timer/arm_generic.h
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
)
endif()
add_sources(
DEP "KernelPlatformOdroidc2"
CFILES src/arch/arm/machine/gic_pl390.c src/arch/arm/machine/l2c_nop.c
CFILES src/arch/arm/machine/gic_v2.c src/arch/arm/machine/l2c_nop.c
)

5
src/plat/tk1/config.cmake
View file

@ -34,15 +34,14 @@ if(KernelPlatformTK1)
declare_default_headers(
TIMER_FREQUENCY 12000000llu
MAX_IRQ 191
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
TIMER drivers/timer/arm_generic.h SMMU plat/machine/smmu.h
)
endif()
add_sources(
DEP "KernelPlatformTK1"
CFILES
src/plat/tk1/machine/smmu.c src/arch/arm/machine/gic_pl390.c src/arch/arm/machine/l2c_nop.c
CFILES src/plat/tk1/machine/smmu.c src/arch/arm/machine/gic_v2.c src/arch/arm/machine/l2c_nop.c
)
add_bf_source_old("KernelPlatformTK1" "hardware.bf" "include/plat/tk1" "plat/machine")

4
src/plat/tx1/config.cmake
View file

@ -26,12 +26,12 @@ if(KernelPlatformTx1)
declare_default_headers(
TIMER_FREQUENCY 19200000llu
MAX_IRQ 224
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
TIMER drivers/timer/arm_generic.h
)
endif()
add_sources(
DEP "KernelPlatformTx1"
CFILES src/arch/arm/machine/gic_pl390.c src/arch/arm/machine/l2c_nop.c
CFILES src/arch/arm/machine/gic_v2.c src/arch/arm/machine/l2c_nop.c
)

4
src/plat/tx2/config.cmake
View file

@ -29,12 +29,12 @@ if(KernelPlatformTx2)
declare_default_headers(
TIMER_FREQUENCY 31250000llu
MAX_IRQ 383
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
TIMER drivers/timer/arm_generic.h
)
endif()
add_sources(
DEP "KernelPlatformTx2"
CFILES src/arch/arm/machine/gic_pl390.c src/arch/arm/machine/l2c_nop.c
CFILES src/arch/arm/machine/gic_v2.c src/arch/arm/machine/l2c_nop.c
)

4
src/plat/zynq7000/config.cmake
View file

@ -25,11 +25,11 @@ if(KernelPlatformZynq7000)
TIMER_FREQUENCY 400000000llu
MAX_IRQ 92
TIMER drivers/timer/arm_priv.h
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
)
endif()
add_sources(
DEP "KernelPlatformZynq7000"
CFILES src/arch/arm/machine/l2c_310.c src/arch/arm/machine/gic_pl390.c
CFILES src/arch/arm/machine/l2c_310.c src/arch/arm/machine/gic_v2.c
)

4
src/plat/zynqmp/config.cmake
View file

@ -46,11 +46,11 @@ if(KernelPlatformZynqmp)
TIMER_FREQUENCY 100000000llu
MAX_IRQ 187
TIMER drivers/timer/arm_generic.h
INTERRUPT_CONTROLLER arch/machine/gic_pl390.h
INTERRUPT_CONTROLLER arch/machine/gic_v2.h
)
endif()
add_sources(
DEP "KernelPlatformZynqmp"
CFILES src/arch/arm/machine/gic_pl390.c src/arch/arm/machine/l2c_nop.c
CFILES src/arch/arm/machine/gic_v2.c src/arch/arm/machine/l2c_nop.c
)

6
tools/hardware.yml
View file

@ -23,15 +23,15 @@ devices:
# distributor
- executeNever: true
index: 0
kernel: GIC_PL390_DISTRIBUTOR_PPTR
kernel: GIC_V2_DISTRIBUTOR_PPTR
# controller
- executeNever: true
index: 1
kernel: GIC_PL390_CONTROLLER_PPTR
kernel: GIC_V2_CONTROLLER_PPTR
# GICV
- executeNever: false
index: 2
kernel: GIC_PL400_VCPUCTRL_PPTR
kernel: GIC_V2_VCPUCTRL_PPTR
macro: CONFIG_ARM_HYPERVISOR_SUPPORT
user: false # never expose to userspace, even if macro is false.
# other regions (i.e. GICH)