diff --git a/src/arch/arm/platform_gen.h.in b/src/arch/arm/platform_gen.h.in index 572ece1788de885d88763838665ca210a0fcbad7..9c44d5475f6580ebfb5d3dae84c3b3c6ef1119a1 100644 --- a/src/arch/arm/platform_gen.h.in +++ b/src/arch/arm/platform_gen.h.in @@ -8,7 +8,7 @@ #include <config.h> -#define TIMER_CLOCK_HZ @CONFIGURE_TIMER_FREQUENCY@ +#define TIMER_CLOCK_HZ ULL_CONST(@CONFIGURE_TIMER_FREQUENCY@) #define CLK_MAGIC @CONFIGURE_CLK_MAGIC@ #define CLK_SHIFT @CONFIGURE_CLK_SHIFT@ #define TIMER_PRECISION @CONFIGURE_TIMER_PRECISION@ diff --git a/src/arch/riscv/platform_gen.h.in b/src/arch/riscv/platform_gen.h.in index 6d96efd87338d66adfc0f54e7a6733ade03465a5..96d5084fd905c9753b8a00cdc459e324cea070a6 100644 --- a/src/arch/riscv/platform_gen.h.in +++ b/src/arch/riscv/platform_gen.h.in @@ -8,7 +8,7 @@ #include <config.h> -#define TIMER_CLOCK_HZ @CONFIGURE_TIMER_FREQUENCY@ +#define TIMER_CLOCK_HZ ULL_CONST(@CONFIGURE_TIMER_FREQUENCY@) #include <machine/interrupt.h> diff --git a/src/drivers/timer/generic_timer.c b/src/drivers/timer/generic_timer.c index 3dc000b62c01ab955646a9ee3c7808035dbec229..69aa1c1f80e7882e8ba33a56b9a9464805643c38 100644 --- a/src/drivers/timer/generic_timer.c +++ b/src/drivers/timer/generic_timer.c @@ -16,13 +16,10 @@ BOOT_CODE void initGenericTimer(void) * compared with TIMER_CLOCK_HZ. */ if ((gpt_cntfrq != 0) && (gpt_cntfrq != TIMER_CLOCK_HZ)) { - /* TIMER_CLOCK_HZ is supposed to be a 64-bit value, but that is not - * really enforced, it could be any integer type. Variable args - * require the type to be very well defined to work properly, so - * casting explicitly to unit64_t here is the best option. - */ - printf("Warning: gpt_cntfrq %"SEL4_PRIu_word", expected %"PRIu64"\n", - gpt_cntfrq, (uint64_t)TIMER_CLOCK_HZ); + /* TIMER_CLOCK_HZ is defined as a unsigned long long constant on + * every architecture. */ + printf("Warning: gpt_cntfrq %"SEL4_PRIu_word", expected %llu\n", + gpt_cntfrq, TIMER_CLOCK_HZ); } } diff --git a/src/plat/allwinnerA20/config.cmake b/src/plat/allwinnerA20/config.cmake index 33bfc0bc8755793fb619dee0fad97d8f2ba88f78..8b66c60e705469c2c05eff69c74092515b9bcb3f 100644 --- a/src/plat/allwinnerA20/config.cmake +++ b/src/plat/allwinnerA20/config.cmake @@ -22,7 +22,7 @@ if(KernelPlatformAllwinnerA20) list(APPEND KernelDTSList "src/plat/allwinnerA20/overlay-allwinnerA20.dts") declare_default_headers( - TIMER_FREQUENCY 24000000llu + TIMER_FREQUENCY 24000000 MAX_IRQ 122 NUM_PPI 32 TIMER drivers/timer/allwinner.h diff --git a/src/plat/am335x/config.cmake b/src/plat/am335x/config.cmake index 67f3200af4d903daece287c9824336c12fdc871a..c346c43555223767b47f0e58d2f2554d527bd4e6 100644 --- a/src/plat/am335x/config.cmake +++ b/src/plat/am335x/config.cmake @@ -44,7 +44,7 @@ if(KernelPlatformAM335X) drivers/irq/am335x.h # DMTIMER 2-7 have programmable CLKSRC. # Currently Kernel timer is DMTIMER4 using CLK_M_OSC. - TIMER_FREQUENCY 24000000llu + TIMER_FREQUENCY 24000000 CLK_MAGIC 2863311531llu CLK_SHIFT 36u KERNEL_WCET 10u diff --git a/src/plat/apq8064/config.cmake b/src/plat/apq8064/config.cmake index f381ca2f4260798bafa7342e21675d1221d143b2..67a01f5db2a346b145facfc718f2dd85a8a4ea22 100644 --- a/src/plat/apq8064/config.cmake +++ b/src/plat/apq8064/config.cmake @@ -23,7 +23,7 @@ if(KernelPlatformAPQ8064) list(APPEND KernelDTSList "src/plat/apq8064/overlay-apq8064.dts") declare_default_headers( - TIMER_FREQUENCY 7000000llu + TIMER_FREQUENCY 7000000 MAX_IRQ 283 NUM_PPI 32 TIMER drivers/timer/arm_generic.h diff --git a/src/plat/ariane/config.cmake b/src/plat/ariane/config.cmake index 08bd48e37fcbd257efd28c068849aedcddd5364f..c211d198fbd70e158d4c4e1cf228373a5614b5f9 100644 --- a/src/plat/ariane/config.cmake +++ b/src/plat/ariane/config.cmake @@ -16,7 +16,7 @@ if(KernelPlatformAriane) list(APPEND KernelDTSList "tools/dts/ariane.dts") list(APPEND KernelDTSList "src/plat/ariane/overlay-ariane.dts") declare_default_headers( - TIMER_FREQUENCY 25000000llu PLIC_MAX_NUM_INT 30 + TIMER_FREQUENCY 25000000 PLIC_MAX_NUM_INT 30 INTERRUPT_CONTROLLER drivers/irq/riscv_plic0.h ) else() diff --git a/src/plat/bcm2711/config.cmake b/src/plat/bcm2711/config.cmake index c27e2f4a38dd4d1f9f2ff2fa3e3560d62b99d7b6..2c6252859f5ff604942da299ee05060829bb8f86 100644 --- a/src/plat/bcm2711/config.cmake +++ b/src/plat/bcm2711/config.cmake @@ -34,7 +34,7 @@ if(KernelPlatformRpi4) # - CLK_MAGIC and CLK_SHIFT can be calculated with: # tools/reciprocal.py --divisor 54000000 declare_default_headers( - TIMER_FREQUENCY 54000000llu + TIMER_FREQUENCY 54000000 MAX_IRQ 216 NUM_PPI 32 TIMER drivers/timer/arm_generic.h diff --git a/src/plat/bcm2837/config.cmake b/src/plat/bcm2837/config.cmake index b63982e427bd79ce58756a48bceb19a07e95a551..cb5879e0ee1193801619e3ae766a95bceba3dee6 100644 --- a/src/plat/bcm2837/config.cmake +++ b/src/plat/bcm2837/config.cmake @@ -24,7 +24,7 @@ if(KernelPlatformRpi3) list(APPEND KernelDTSList "src/plat/bcm2837/overlay-rpi3.dts") declare_default_headers( - TIMER_FREQUENCY 19200000llu + TIMER_FREQUENCY 19200000 MAX_IRQ 127 NUM_PPI 32 TIMER drivers/timer/arm_generic.h diff --git a/src/plat/exynos4/config.cmake b/src/plat/exynos4/config.cmake index 1d22645dfd742d35f471b252246df20b220a23d7..40559d0d71024c7c4f7cfd8fc752ff2f0d49d916 100644 --- a/src/plat/exynos4/config.cmake +++ b/src/plat/exynos4/config.cmake @@ -17,7 +17,7 @@ if(KernelPlatformExynos4) list(APPEND KernelDTSList "tools/dts/exynos4.dts") list(APPEND KernelDTSList "src/plat/exynos4/overlay-exynos4.dts") declare_default_headers( - TIMER_FREQUENCY 24000000llu + TIMER_FREQUENCY 24000000 MAX_IRQ 159 NUM_PPI 32 TIMER drivers/timer/exynos4412-mct.h diff --git a/src/plat/exynos5/config.cmake b/src/plat/exynos5/config.cmake index b76e80fb7020b2a7e5ec0f6f1a89d21f99af0ea4..d6214ca3e7461caa938a642dc26eabdb51eb6fc4 100644 --- a/src/plat/exynos5/config.cmake +++ b/src/plat/exynos5/config.cmake @@ -58,7 +58,7 @@ if(KernelPlatExynos5) list(APPEND KernelDTSList "tools/dts/${KernelARMPlatform}.dts") list(APPEND KernelDTSList "src/plat/exynos5/overlay-${KernelARMPlatform}.dts") declare_default_headers( - TIMER_FREQUENCY 24000000llu + TIMER_FREQUENCY 24000000 MAX_IRQ 254 NUM_PPI 32 TIMER drivers/timer/arm_generic.h diff --git a/src/plat/fvp/config.cmake b/src/plat/fvp/config.cmake index b8bc76d9f7316cd58ef5254a49cf732a950cf63f..90e446bd65cde62ecb4c47c7b7784a0f37cc9cb4 100644 --- a/src/plat/fvp/config.cmake +++ b/src/plat/fvp/config.cmake @@ -16,7 +16,7 @@ if(KernelPlatformFVP) list(APPEND KernelDTSList "tools/dts/fvp.dts") list(APPEND KernelDTSList "src/plat/fvp/overlay-fvp.dts") declare_default_headers( - TIMER_FREQUENCY 100000000llu + TIMER_FREQUENCY 100000000 MAX_IRQ 207 INTERRUPT_CONTROLLER arch/machine/gic_v3.h TIMER drivers/timer/arm_generic.h diff --git a/src/plat/hifive/config.cmake b/src/plat/hifive/config.cmake index 258739c2f2f56ed502d2cfec0a01a3626a4d250f..7bd17be722c0119287fde04dd7c2a29e33c9b988 100644 --- a/src/plat/hifive/config.cmake +++ b/src/plat/hifive/config.cmake @@ -17,7 +17,7 @@ if(KernelPlatformHifive) list(APPEND KernelDTSList "tools/dts/hifive.dts") list(APPEND KernelDTSList "src/plat/hifive/overlay-hifive.dts") declare_default_headers( - TIMER_FREQUENCY 1000000llu PLIC_MAX_NUM_INT 53 + TIMER_FREQUENCY 1000000 PLIC_MAX_NUM_INT 53 INTERRUPT_CONTROLLER drivers/irq/riscv_plic0.h ) else() diff --git a/src/plat/hikey/config.cmake b/src/plat/hikey/config.cmake index 8511f9dce620c3ab94ee62a0ef6675f12c8793bd..666ca809342db80178af08868cea012cea5748b5 100644 --- a/src/plat/hikey/config.cmake +++ b/src/plat/hikey/config.cmake @@ -23,7 +23,7 @@ if(KernelPlatformHikey) list(APPEND KernelDTSList "tools/dts/hikey.dts") list(APPEND KernelDTSList "src/plat/hikey/overlay-hikey.dts") declare_default_headers( - TIMER_FREQUENCY 1200000llu + TIMER_FREQUENCY 1200000 MAX_IRQ 159 TIMER drivers/timer/arm_generic.h INTERRUPT_CONTROLLER arch/machine/gic_v2.h diff --git a/src/plat/imx31/config.cmake b/src/plat/imx31/config.cmake index 5a34645216b5c1bee85a982ec91660c7835bd7eb..16c8a90576422d695c27439d080a57482a5dd6af 100644 --- a/src/plat/imx31/config.cmake +++ b/src/plat/imx31/config.cmake @@ -19,10 +19,10 @@ if(KernelPlatformKZM) list(APPEND KernelDTSList "src/plat/imx31/overlay-kzm.dts") if(KernelIsMCS) list(APPEND KernelDTSList "src/plat/imx31/mcs-overlay-kzm.dts") - set(TimerFrequency 35000000llu) # 35MHz -- calculated by trial and error, roughly precise + set(TimerFrequency 35000000) # 35MHz -- calculated by trial and error, roughly precise set(TimerDriver drivers/timer/imx31-gpt.h) else() - set(TimerFrequency 32768llu) + set(TimerFrequency 32768) set(TimerDriver drivers/timer/imx31-epit.h) add_bf_source_old("KernelPlatformKZM" "imx31-epit.bf" "include" "drivers/timer") endif() diff --git a/src/plat/imx6/config.cmake b/src/plat/imx6/config.cmake index d0b3357d78359e85a42eb8a525429a16fd9d9e62..4a10554fdd984a55ee8641c081d300938fa06f3f 100644 --- a/src/plat/imx6/config.cmake +++ b/src/plat/imx6/config.cmake @@ -61,7 +61,7 @@ if(KernelPlatImx6) endif() declare_default_headers( - TIMER_FREQUENCY 498000000llu + TIMER_FREQUENCY 498000000 MAX_IRQ 159 INTERRUPT_CONTROLLER arch/machine/gic_v2.h NUM_PPI 32 diff --git a/src/plat/imx7/config.cmake b/src/plat/imx7/config.cmake index 0985bf3f47ac7e9a3989bd171f2b074949e148f2..4ba6e7c875d2a63f08b2663d8340d39b9b5ec431 100644 --- a/src/plat/imx7/config.cmake +++ b/src/plat/imx7/config.cmake @@ -18,7 +18,7 @@ if(KernelPlatImx7) list(APPEND KernelDTSList "tools/dts/imx7sabre.dts") list(APPEND KernelDTSList "src/plat/imx7/overlay-imx7sabre.dts") declare_default_headers( - TIMER_FREQUENCY 8000000llu + TIMER_FREQUENCY 8000000 MAX_IRQ 159 NUM_PPI 32 TIMER drivers/timer/arm_generic.h diff --git a/src/plat/imx8m-evk/config.cmake b/src/plat/imx8m-evk/config.cmake index cc99b983f2d5fe103cf03098adcf90b47944cfe3..7d80a293661dcd19f67893ca825787d9ad64e8e6 100644 --- a/src/plat/imx8m-evk/config.cmake +++ b/src/plat/imx8m-evk/config.cmake @@ -28,7 +28,7 @@ if(KernelPlatformImx8mq-evk OR KernelPlatformImx8mm-evk) list(APPEND KernelDTSList "src/plat/imx8m-evk/overlay-imx8m-32bit.dts") endif() declare_default_headers( - TIMER_FREQUENCY 8000000llu + TIMER_FREQUENCY 8000000 MAX_IRQ 160 TIMER drivers/timer/arm_generic.h INTERRUPT_CONTROLLER arch/machine/gic_v3.h diff --git a/src/plat/odroidc2/config.cmake b/src/plat/odroidc2/config.cmake index b37a4682c87b4b0e855c3e0c3d46ab400da62ccf..2ffb76643c970b194865520a8cd6633a0e173a3f 100644 --- a/src/plat/odroidc2/config.cmake +++ b/src/plat/odroidc2/config.cmake @@ -17,7 +17,7 @@ if(KernelPlatformOdroidc2) list(APPEND KernelDTSList "tools/dts/odroidc2.dts") list(APPEND KernelDTSList "src/plat/odroidc2/overlay-odroidc2.dts") declare_default_headers( - TIMER_FREQUENCY 24000000llu + TIMER_FREQUENCY 24000000 MAX_IRQ 250 NUM_PPI 32 TIMER drivers/timer/arm_generic.h diff --git a/src/plat/odroidc4/config.cmake b/src/plat/odroidc4/config.cmake index 2fa816884fc1ffc4252ad91ecd6db6ea948bcf78..a822ce49cf76d14f422bc288b64eb2cb25b37201 100644 --- a/src/plat/odroidc4/config.cmake +++ b/src/plat/odroidc4/config.cmake @@ -16,7 +16,7 @@ if(KernelPlatformOdroidc4) set(KernelArmMachFeatureModifiers "+crc" CACHE INTERNAL "") list(APPEND KernelDTSList "tools/dts/odroidc4.dts" "src/plat/odroidc4/overlay-odroidc4.dts") declare_default_headers( - TIMER_FREQUENCY 24000000llu + TIMER_FREQUENCY 24000000 MAX_IRQ 250 NUM_PPI 32 TIMER drivers/timer/arm_generic.h diff --git a/src/plat/omap3/config.cmake b/src/plat/omap3/config.cmake index f0392e44cd6798abc5b6f7a4673fd60c889a56d6..0bf16034c1f1f7afdcbc57b46bb73ca76c037a0f 100644 --- a/src/plat/omap3/config.cmake +++ b/src/plat/omap3/config.cmake @@ -18,7 +18,7 @@ if(KernelPlatformOMAP3) list(APPEND KernelDTSList "tools/dts/omap3.dts") list(APPEND KernelDTSList "src/plat/omap3/overlay-omap3.dts") declare_default_headers( - TIMER_FREQUENCY 13000000llu + TIMER_FREQUENCY 13000000 MAX_IRQ 95 INTERRUPT_CONTROLLER drivers/irq/omap3.h TIMER drivers/timer/omap3430.h diff --git a/src/plat/polarfire/config.cmake b/src/plat/polarfire/config.cmake index bb4932cd028579c588fefe3194b1f13b652d8cf9..9d282eccf28fad6f75487bc5b77e79629123caa9 100644 --- a/src/plat/polarfire/config.cmake +++ b/src/plat/polarfire/config.cmake @@ -15,7 +15,7 @@ if(KernelPlatformPolarfire) list(APPEND KernelDTSList "tools/dts/mpfs_icicle.dts") list(APPEND KernelDTSList "src/plat/polarfire/overlay-polarfire.dts") declare_default_headers( - TIMER_FREQUENCY 10000000llu PLIC_MAX_NUM_INT 186 + TIMER_FREQUENCY 10000000 PLIC_MAX_NUM_INT 186 INTERRUPT_CONTROLLER drivers/irq/riscv_plic0.h ) else() diff --git a/src/plat/qemu-arm-virt/config.cmake b/src/plat/qemu-arm-virt/config.cmake index 47d7b7ba8cff1e46538f47507949f8090ea00f0b..d9998395a608c3c03834d259c7465125687ebff4 100644 --- a/src/plat/qemu-arm-virt/config.cmake +++ b/src/plat/qemu-arm-virt/config.cmake @@ -83,7 +83,7 @@ if(KernelPlatformQEMUArmVirt) list(APPEND KernelDTSList "src/plat/qemu-arm-virt/overlay-reserve-vm-memory.dts") endif() declare_default_headers( - TIMER_FREQUENCY 62500000llu + TIMER_FREQUENCY 62500000 MAX_IRQ 159 NUM_PPI 32 TIMER drivers/timer/arm_generic.h diff --git a/src/plat/rocketchip/config.cmake b/src/plat/rocketchip/config.cmake index ae3cf939d2e9908e6c8e21eb418aa2a04480de1d..15e64089c167b3b07ac1cbd32e25add18a4097ad 100644 --- a/src/plat/rocketchip/config.cmake +++ b/src/plat/rocketchip/config.cmake @@ -15,7 +15,7 @@ if(KernelPlatformRocketchip) config_set(KernelOpenSBIPlatform OPENSBI_PLATFORM "generic") list(APPEND KernelDTSList "tools/dts/rocketchip.dts") declare_default_headers( - TIMER_FREQUENCY 10000000llu PLIC_MAX_NUM_INT 0 + TIMER_FREQUENCY 10000000 PLIC_MAX_NUM_INT 0 INTERRUPT_CONTROLLER arch/machine/plic.h ) else() diff --git a/src/plat/rockpro64/config.cmake b/src/plat/rockpro64/config.cmake index 9cb7814685e6aabbf463c91153f958894a3c926d..bceebd664e273fcfca1ef2f2343c37013783f580 100644 --- a/src/plat/rockpro64/config.cmake +++ b/src/plat/rockpro64/config.cmake @@ -18,7 +18,7 @@ if(KernelPlatformRockpro64) list(APPEND KernelDTSList "tools/dts/rockpro64.dts") list(APPEND KernelDTSList "src/plat/rockpro64/overlay-rockpro64.dts") declare_default_headers( - TIMER_FREQUENCY 24000000llu + TIMER_FREQUENCY 24000000 MAX_IRQ 181 NUM_PPI 32 KERNEL_WCET 10u diff --git a/src/plat/spike/config.cmake b/src/plat/spike/config.cmake index c83b9311f31f76c5a74f3b1b1291c872892c36db..87a9de46b2cb47498bbab1443f3f62067dac7545 100644 --- a/src/plat/spike/config.cmake +++ b/src/plat/spike/config.cmake @@ -26,7 +26,7 @@ if(KernelPlatformSpike) list(APPEND KernelDTSList "tools/dts/spike.dts") endif() declare_default_headers( - TIMER_FREQUENCY 10000000llu PLIC_MAX_NUM_INT 0 + TIMER_FREQUENCY 10000000 PLIC_MAX_NUM_INT 0 INTERRUPT_CONTROLLER arch/machine/plic.h ) else() diff --git a/src/plat/tk1/config.cmake b/src/plat/tk1/config.cmake index 91adc11a9b8e5665b3852f1de9861ac08f36a27d..21d1219acd6e12075acfa04573d8b0f62b3c87fd 100644 --- a/src/plat/tk1/config.cmake +++ b/src/plat/tk1/config.cmake @@ -24,7 +24,7 @@ if(KernelPlatformTK1) list(APPEND KernelDTSList "tools/dts/tk1.dts") list(APPEND KernelDTSList "src/plat/tk1/overlay-tk1.dts") declare_default_headers( - TIMER_FREQUENCY 12000000llu + TIMER_FREQUENCY 12000000 MAX_IRQ 191 INTERRUPT_CONTROLLER arch/machine/gic_v2.h NUM_PPI 32 diff --git a/src/plat/tx1/config.cmake b/src/plat/tx1/config.cmake index c731a4f0dda0c2ddcf3a6b8043d440f17d1f1624..e311b23be9de2edb487cfc8f0f80d81a07b76353 100644 --- a/src/plat/tx1/config.cmake +++ b/src/plat/tx1/config.cmake @@ -17,7 +17,7 @@ if(KernelPlatformTx1) list(APPEND KernelDTSList "tools/dts/tx1.dts") list(APPEND KernelDTSList "src/plat/tx1/overlay-tx1.dts") declare_default_headers( - TIMER_FREQUENCY 12000000llu + TIMER_FREQUENCY 12000000 MAX_IRQ 224 INTERRUPT_CONTROLLER arch/machine/gic_v2.h NUM_PPI 32 diff --git a/src/plat/tx2/config.cmake b/src/plat/tx2/config.cmake index 05a72f2f17510c2361f504de228d78bfa37de0ca..1b34fc022a42441caf7b1e2cae8f23422b96f94e 100644 --- a/src/plat/tx2/config.cmake +++ b/src/plat/tx2/config.cmake @@ -21,7 +21,7 @@ if(KernelPlatformTx2) list(APPEND KernelDTSList "tools/dts/tx2.dts") list(APPEND KernelDTSList "src/plat/tx2/overlay-tx2.dts") declare_default_headers( - TIMER_FREQUENCY 31250000llu + TIMER_FREQUENCY 31250000 MAX_IRQ 383 INTERRUPT_CONTROLLER arch/machine/gic_v2.h NUM_PPI 32 diff --git a/src/plat/zynq7000/config.cmake b/src/plat/zynq7000/config.cmake index 7ecf77a8bc2d5ca694ea05898f0f73b16c417876..1491dfb6cdea2d8da9217254d1cbacb60c5098af 100644 --- a/src/plat/zynq7000/config.cmake +++ b/src/plat/zynq7000/config.cmake @@ -25,7 +25,7 @@ if(KernelPlatformZynq7000) declare_default_headers( # This is the timer frequency that can pass tests (in particular # SCHED0011), but may not be the correct number. - TIMER_FREQUENCY 320000000llu + TIMER_FREQUENCY 320000000 MAX_IRQ 92 NUM_PPI 32 INTERRUPT_CONTROLLER arch/machine/gic_v2.h diff --git a/src/plat/zynqmp/config.cmake b/src/plat/zynqmp/config.cmake index 8dd41c9a007dbec575791fc43b848b124c41da33..e5b2f93faea125b8cc19747c7d4f7abf9ab39694 100644 --- a/src/plat/zynqmp/config.cmake +++ b/src/plat/zynqmp/config.cmake @@ -58,7 +58,7 @@ if(KernelPlatformZynqmp) endif() declare_default_headers( - TIMER_FREQUENCY 100000000llu + TIMER_FREQUENCY 100000000 MAX_IRQ 187 NUM_PPI 32 TIMER drivers/timer/arm_generic.h