system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-07 00:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm: Add a userspace physical timer check

Browse source 
We currently use the same Arm generic time in both userspace and the
kernel. As we always enable userspace access to the virtual timer we
can tell userspace to use it.

Reviewed by:	imp
Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D41565
This commit is contained in:
Andrew Turner 2023-08-23 13:34:09 +01:00
parent edd28b857e
commit 7ad28b73ec
1 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
sys/arm/arm/generic_timer.c
View file

@ -110,7 +110,8 @@ struct arm_tmr_softc {
uint32_t clkfreq;
int irq_count;
struct eventtimer et;
bool physical;
bool physical_sys;
bool physical_user;
};
static struct arm_tmr_softc *arm_tmr_sc = NULL;
@ -271,7 +272,7 @@ setup_user_access(void *arg __unused)
/* Always enable the virtual timer */
cntkctl |= GT_CNTKCTL_PL0VCTEN;
/* Enable the physical timer if supported */
if (arm_tmr_sc->physical) {
if (arm_tmr_sc->physical_user) {
cntkctl |= GT_CNTKCTL_PL0PCTEN;
}
set_el1(cntkctl, cntkctl);
@ -333,7 +334,7 @@ static unsigned
arm_tmr_get_timecount(struct timecounter *tc)
{
return (arm_tmr_sc->get_cntxct(arm_tmr_sc->physical));
return (arm_tmr_sc->get_cntxct(arm_tmr_sc->physical_sys));
}
static int
@ -347,11 +348,11 @@ arm_tmr_start(struct eventtimer *et, sbintime_t first,
if (first != 0) {
counts = ((uint32_t)et->et_frequency * first) >> 32;
ctrl = get_ctrl(sc->physical);
ctrl = get_ctrl(sc->physical_sys);
ctrl &= ~GT_CTRL_INT_MASK;
ctrl |= GT_CTRL_ENABLE;
set_tval(counts, sc->physical);
set_ctrl(ctrl, sc->physical);
set_tval(counts, sc->physical_sys);
set_ctrl(ctrl, sc->physical_sys);
return (0);
}
@ -375,7 +376,7 @@ arm_tmr_stop(struct eventtimer *et)
struct arm_tmr_softc *sc;
sc = (struct arm_tmr_softc *)et->et_priv;
arm_tmr_disable(sc->physical);
arm_tmr_disable(sc->physical_sys);
return (0);
}
@ -387,10 +388,10 @@ arm_tmr_intr(void *arg)
int ctrl;
sc = (struct arm_tmr_softc *)arg;
ctrl = get_ctrl(sc->physical);
ctrl = get_ctrl(sc->physical_sys);
if (ctrl & GT_CTRL_INT_STAT) {
ctrl |= GT_CTRL_INT_MASK;
set_ctrl(ctrl, sc->physical);
set_ctrl(ctrl, sc->physical_sys);
}
if (sc->et.et_active)
@ -616,7 +617,7 @@ arm_tmr_attach(device_t dev)
phandle_t node;
pcell_t clock;
#endif
int error;
int error, user_phys;
int i, first_timer, last_timer;
sc = device_get_softc(dev);
@ -680,18 +681,28 @@ arm_tmr_attach(device_t dev)
* coordinated with the virtual machine manager.
*/
if (!HAS_PHYS) {
sc->physical = false;
sc->physical_sys = false;
first_timer = GT_VIRT;
last_timer = GT_VIRT;
} else
#endif
/* Otherwise set up the secure and non-secure physical timers. */
{
sc->physical = true;
sc->physical_sys = true;
first_timer = GT_PHYS_SECURE;
last_timer = GT_PHYS_NONSECURE;
}
/*
* The virtual timer is always available on arm and arm64, tell
* userspace to use it.
*/
sc->physical_user = false;
/* Allow use of the physical counter in userspace when available */
if (TUNABLE_INT_FETCH("hw.userspace_allow_phys_counter", &user_phys) &&
user_phys != 0)
sc->physical_user = sc->physical_sys;
arm_tmr_sc = sc;
/* Setup secure, non-secure and virtual IRQs handler */
@ -790,10 +801,10 @@ arm_tmr_do_delay(int usec, void *arg)
else
counts = usec * counts_per_usec;
first = sc->get_cntxct(sc->physical);
first = sc->get_cntxct(sc->physical_sys);
while (counts > 0) {
last = sc->get_cntxct(sc->physical);
last = sc->get_cntxct(sc->physical_sys);
counts -= (int32_t)(last - first);
first = last;
}
@ -830,7 +841,7 @@ arm_tmr_fill_vdso_timehands(struct vdso_timehands *vdso_th,
{
vdso_th->th_algo = VDSO_TH_ALGO_ARM_GENTIM;
vdso_th->th_physical = arm_tmr_sc->physical;
vdso_th->th_physical = arm_tmr_sc->physical_user;
bzero(vdso_th->th_res, sizeof(vdso_th->th_res));
return (1);
}