d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limit where we disable the Arm generic timer

Browse Source 
Only disable the Arm generic timer on arm64 when entering the kernel
through EL2. There is no guarantee it will be enabled if we are running
under a hypervisor.

Sponsored by:	Arm Ltd
This commit is contained in:
Andrew Turner 2023-02-02 16:26:25 +00:00
parent 03d6e03851
commit 22e4897422
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arm/arm/generic_timer.c
View File

@ -54,15 +54,13 @@ __FBSDID("$FreeBSD$");
#include <sys/smp.h>
#include <sys/vdso.h>
#include <sys/watchdog.h>
#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
#include <machine/machdep.h>
#include <machine/md_var.h>
#if defined(__arm__)
#include <machine/machdep.h> /* For arm_set_delay */
#endif
#if defined(__aarch64__)
#include <machine/undefined.h>
#endif
@ -138,11 +136,13 @@ static struct timecounter arm_tmr_timecount = {
#define get_el1(x) cp15_## x ##_get()
#define set_el0(x, val) cp15_## x ##_set(val)
#define set_el1(x, val) cp15_## x ##_set(val)
#define HAS_PHYS true
#else /* __aarch64__ */
#define get_el0(x) READ_SPECIALREG(x ##_el0)
#define get_el1(x) READ_SPECIALREG(x ##_el1)
#define set_el0(x, val) WRITE_SPECIALREG(x ##_el0, val)
#define set_el1(x, val) WRITE_SPECIALREG(x ##_el1, val)
#define HAS_PHYS has_hyp()
#endif
static int
@ -521,8 +521,8 @@ arm_tmr_attach(device_t dev)
if (sc->res[GT_VIRT] != NULL)
arm_tmr_disable(false);
/* And the physical */
if (sc->res[GT_PHYS_SECURE] != NULL ||
sc->res[GT_PHYS_NONSECURE] != NULL)
if ((sc->res[GT_PHYS_SECURE] != NULL ||
sc->res[GT_PHYS_NONSECURE] != NULL) && HAS_PHYS)
arm_tmr_disable(true);
arm_tmr_timecount.tc_frequency = sc->clkfreq;