aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2017-12-31 09:24:41 +0000
committerColin Percival <cperciva@FreeBSD.org>2017-12-31 09:24:41 +0000
commitd5d7606c0c076237567d5fa706478c70a1189916 (patch)
treefd38db9736ff5060a4872c4093c39d295f8ddfd4
parent49a4e3b4b45f8d1fac11d9ce659d9c9193d00e3f (diff)
downloadsrc-d5d7606c0c076237567d5fa706478c70a1189916.tar.gz
src-d5d7606c0c076237567d5fa706478c70a1189916.zip
Notes
Diffstat
-rw-r--r--sys/arm/amlogic/aml8726/aml8726_timer.c2
-rw-r--r--sys/arm/arm/generic_timer.c2
-rw-r--r--sys/arm/arm/machdep.c2
-rw-r--r--sys/arm/arm/mpcore_timer.c2
-rw-r--r--sys/arm/at91/at91_machdep.c2
-rw-r--r--sys/arm/cavium/cns11xx/timer.c3
-rw-r--r--sys/arm/lpc/lpc_timer.c2
-rw-r--r--sys/arm/mv/timer.c2
-rw-r--r--sys/arm/ralink/rt1310_timer.c2
-rw-r--r--sys/arm/xscale/i8134x/i80321_timer.c2
-rw-r--r--sys/arm/xscale/ixp425/ixp425_timer.c2
-rw-r--r--sys/arm/xscale/pxa/pxa_timer.c2
-rw-r--r--sys/kern/subr_prf.c2
-rw-r--r--sys/mips/ingenic/jz4780_timer.c2
-rw-r--r--sys/mips/mips/tick.c2
-rw-r--r--sys/mips/nlm/tick.c2
-rw-r--r--sys/mips/rmi/tick.c2
-rw-r--r--sys/powerpc/powerpc/clock.c2
-rw-r--r--sys/riscv/riscv/timer.c2
-rw-r--r--sys/sparc64/sparc64/clock.c2
-rw-r--r--sys/x86/x86/delay.c6
21 files changed, 45 insertions, 2 deletions
diff --git a/sys/arm/amlogic/aml8726/aml8726_timer.c b/sys/arm/amlogic/aml8726/aml8726_timer.c
index 2fa4db8f398e..102b4757db6f 100644
--- a/sys/arm/amlogic/aml8726/aml8726_timer.c
+++ b/sys/arm/amlogic/aml8726/aml8726_timer.c
@@ -347,6 +347,7 @@ DELAY(int usec)
}
return;
}
+ TSENTER();
/*
* Some of the other timers in the source tree do this calculation as:
@@ -391,4 +392,5 @@ DELAY(int usec)
previous = now;
remaining -= delta;
}
+ TSEXIT();
}
diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c
index 9a28885077e0..5e9cabab14d1 100644
--- a/sys/arm/arm/generic_timer.c
+++ b/sys/arm/arm/generic_timer.c
@@ -526,6 +526,7 @@ DELAY(int usec)
{
int32_t counts;
+ TSENTER();
/*
* Check the timers are setup, if not just
* use a for loop for the meantime
@@ -540,6 +541,7 @@ DELAY(int usec)
cpufunc_nullop();
} else
arm_tmr_do_delay(usec, arm_tmr_sc);
+ TSEXIT();
}
#endif
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index e33252c14279..474fa82df587 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -347,7 +347,9 @@ void
DELAY(int usec)
{
+ TSENTER();
delay_impl(usec, delay_arg);
+ TSEXIT();
}
#endif
diff --git a/sys/arm/arm/mpcore_timer.c b/sys/arm/arm/mpcore_timer.c
index 0b0ac2a4149d..b9d372fd1a43 100644
--- a/sys/arm/arm/mpcore_timer.c
+++ b/sys/arm/arm/mpcore_timer.c
@@ -547,6 +547,7 @@ DELAY(int usec)
struct arm_tmr_softc *sc;
int32_t counts;
+ TSENTER();
/* Check the timers are setup, if not just use a for loop for the meantime */
if (arm_tmr_tc == NULL || arm_tmr_timecount.tc_frequency == 0) {
for (; usec > 0; usec--)
@@ -558,5 +559,6 @@ DELAY(int usec)
sc = arm_tmr_tc->tc_priv;
arm_tmr_delay(usec, sc);
}
+ TSEXIT();
}
#endif
diff --git a/sys/arm/at91/at91_machdep.c b/sys/arm/at91/at91_machdep.c
index 5f3dc7fc4459..5a0eb28194c1 100644
--- a/sys/arm/at91/at91_machdep.c
+++ b/sys/arm/at91/at91_machdep.c
@@ -672,8 +672,10 @@ void
DELAY(int n)
{
+ TSENTER();
if (soc_info.soc_data)
soc_info.soc_data->soc_delay(n);
+ TSEXIT();
}
void
diff --git a/sys/arm/cavium/cns11xx/timer.c b/sys/arm/cavium/cns11xx/timer.c
index e79a70ad0a44..c61af0f85ecd 100644
--- a/sys/arm/cavium/cns11xx/timer.c
+++ b/sys/arm/cavium/cns11xx/timer.c
@@ -122,6 +122,7 @@ DELAY(int usec)
;
return;
}
+ TSENTER();
val = read_timer_counter_noint();
nticks = (((APB_clock / 1000) * usec) / 1000) + 100;
@@ -135,7 +136,7 @@ DELAY(int usec)
val = val_temp;
}
-
+ TSEXIT();
}
/*
diff --git a/sys/arm/lpc/lpc_timer.c b/sys/arm/lpc/lpc_timer.c
index 0c0019eef657..4054877a2763 100644
--- a/sys/arm/lpc/lpc_timer.c
+++ b/sys/arm/lpc/lpc_timer.c
@@ -292,6 +292,7 @@ DELAY(int usec)
;
return;
}
+ TSENTER();
first = lpc_get_timecount(&lpc_timecounter);
while (val > 0) {
@@ -304,4 +305,5 @@ DELAY(int usec)
val -= (last - first);
first = last;
}
+ TSEXIT();
}
diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c
index e0ca2dee2189..be92f62040ca 100644
--- a/sys/arm/mv/timer.c
+++ b/sys/arm/mv/timer.c
@@ -272,6 +272,7 @@ DELAY(int usec)
__asm __volatile("nop" ::: "memory");
return;
}
+ TSENTER();
val = mv_get_timer(1);
nticks = ((MV_CLOCK_SRC / 1000000 + 1) * usec);
@@ -285,6 +286,7 @@ DELAY(int usec)
val = val_temp;
}
+ TSEXIT();
}
static uint32_t
diff --git a/sys/arm/ralink/rt1310_timer.c b/sys/arm/ralink/rt1310_timer.c
index 6834bbdc388d..a7203064a134 100644
--- a/sys/arm/ralink/rt1310_timer.c
+++ b/sys/arm/ralink/rt1310_timer.c
@@ -326,6 +326,7 @@ DELAY(int usec)
;
return;
}
+ TSENTER();
first = rt1310_get_timecount(&rt1310_timecounter);
while (val > 0) {
@@ -338,4 +339,5 @@ DELAY(int usec)
val -= (last - first);
first = last;
}
+ TSEXIT();
}
diff --git a/sys/arm/xscale/i8134x/i80321_timer.c b/sys/arm/xscale/i8134x/i80321_timer.c
index f67c31906753..5dc650568c0a 100644
--- a/sys/arm/xscale/i8134x/i80321_timer.c
+++ b/sys/arm/xscale/i8134x/i80321_timer.c
@@ -428,6 +428,7 @@ DELAY(int n)
{
uint32_t cur, last, delta, usecs;
+ TSENTER();
/*
* This works by polling the timer and counting the
* number of microseconds that go by.
@@ -451,6 +452,7 @@ DELAY(int n)
delta %= COUNTS_PER_USEC;
}
}
+ TSEXIT();
}
/*
diff --git a/sys/arm/xscale/ixp425/ixp425_timer.c b/sys/arm/xscale/ixp425/ixp425_timer.c
index b9122c1932a2..c0d9109d91d2 100644
--- a/sys/arm/xscale/ixp425/ixp425_timer.c
+++ b/sys/arm/xscale/ixp425/ixp425_timer.c
@@ -213,6 +213,7 @@ DELAY(int n)
if (n == 0)
return;
+ TSENTER();
/*
* Clamp the timeout at a maximum value (about 32 seconds with
@@ -233,6 +234,7 @@ DELAY(int n)
usecs -= (int)(last - first);
first = last;
}
+ TSEXIT();
}
/*
diff --git a/sys/arm/xscale/pxa/pxa_timer.c b/sys/arm/xscale/pxa/pxa_timer.c
index 4c093897f23a..b000f0271d96 100644
--- a/sys/arm/xscale/pxa/pxa_timer.c
+++ b/sys/arm/xscale/pxa/pxa_timer.c
@@ -214,10 +214,12 @@ DELAY(int usec)
;
return;
}
+ TSENTER();
val = pxa_timer_get_oscr();
val += (PXA_TIMER_FREQUENCY * usec) / 1000000;
while (pxa_timer_get_oscr() <= val);
+ TSEXIT();
}
uint32_t
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 312485e870fe..040125e3f734 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -276,6 +276,7 @@ _vprintf(int level, int flags, const char *fmt, va_list ap)
char bufr[PRINTF_BUFR_SIZE];
#endif
+ TSENTER();
pca.tty = NULL;
pca.pri = level;
pca.flags = flags;
@@ -303,6 +304,7 @@ _vprintf(int level, int flags, const char *fmt, va_list ap)
}
#endif
+ TSEXIT();
return (retval);
}
diff --git a/sys/mips/ingenic/jz4780_timer.c b/sys/mips/ingenic/jz4780_timer.c
index e3cd04f068b3..36e5eca1f793 100644
--- a/sys/mips/ingenic/jz4780_timer.c
+++ b/sys/mips/ingenic/jz4780_timer.c
@@ -283,6 +283,7 @@ DELAY(int usec)
}
return;
}
+ TSENTER();
/*
* Some of the other timers in the source tree do this calculation as:
@@ -327,6 +328,7 @@ DELAY(int usec)
previous = now;
remaining -= delta;
}
+ TSEXIT();
}
void
diff --git a/sys/mips/mips/tick.c b/sys/mips/mips/tick.c
index c415d7d1b2d5..74296a0bd6d8 100644
--- a/sys/mips/mips/tick.c
+++ b/sys/mips/mips/tick.c
@@ -197,6 +197,7 @@ DELAY(int n)
{
uint32_t cur, last, delta, usecs;
+ TSENTER();
/*
* This works by polling the timer and counting the number of
* microseconds that go by.
@@ -220,6 +221,7 @@ DELAY(int n)
delta %= cycles_per_usec;
}
}
+ TSEXIT();
}
static int
diff --git a/sys/mips/nlm/tick.c b/sys/mips/nlm/tick.c
index 5993c892865b..66d192445fb3 100644
--- a/sys/mips/nlm/tick.c
+++ b/sys/mips/nlm/tick.c
@@ -198,6 +198,7 @@ DELAY(int n)
{
uint32_t cur, last, delta, usecs;
+ TSENTER();
/*
* This works by polling the timer and counting the number of
* microseconds that go by.
@@ -221,6 +222,7 @@ DELAY(int n)
delta %= cycles_per_usec;
}
}
+ TSEXIT();
}
static int
diff --git a/sys/mips/rmi/tick.c b/sys/mips/rmi/tick.c
index f557ce731eea..0512e2363629 100644
--- a/sys/mips/rmi/tick.c
+++ b/sys/mips/rmi/tick.c
@@ -195,6 +195,7 @@ DELAY(int n)
{
uint32_t cur, last, delta, usecs;
+ TSENTER();
/*
* This works by polling the timer and counting the number of
* microseconds that go by.
@@ -218,6 +219,7 @@ DELAY(int n)
delta %= cycles_per_usec;
}
}
+ TSEXIT();
}
static int
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index 8dff4b61fc6d..62a0be553acb 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -305,9 +305,11 @@ DELAY(int n)
{
u_quad_t tb, ttb;
+ TSENTER();
tb = mftb();
ttb = tb + howmany(n * 1000, ns_per_tick);
while (tb < ttb)
tb = mftb();
+ TSEXIT();
}
diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c
index 0308ca50e6c8..00af244e55c1 100644
--- a/sys/riscv/riscv/timer.c
+++ b/sys/riscv/riscv/timer.c
@@ -261,6 +261,7 @@ DELAY(int usec)
cpufunc_nullop();
return;
}
+ TSENTER();
/* Get the number of times to count */
counts_per_usec = ((riscv_timer_timecount.tc_frequency / 1000000) + 1);
@@ -283,4 +284,5 @@ DELAY(int usec)
counts -= (int64_t)(last - first);
first = last;
}
+ TSEXIT();
}
diff --git a/sys/sparc64/sparc64/clock.c b/sys/sparc64/sparc64/clock.c
index bd6ea254b930..3da11a130c5a 100644
--- a/sys/sparc64/sparc64/clock.c
+++ b/sys/sparc64/sparc64/clock.c
@@ -45,6 +45,7 @@ DELAY(int usec)
if (usec < 0)
return;
+ TSENTER();
/*
* We avoid being migrated to another CPU with a possibly
@@ -57,5 +58,6 @@ DELAY(int usec)
cpu_spinwait();
sched_unpin();
+ TSEXIT();
}
diff --git a/sys/x86/x86/delay.c b/sys/x86/x86/delay.c
index 917a015b9036..d0900c4330b8 100644
--- a/sys/x86/x86/delay.c
+++ b/sys/x86/x86/delay.c
@@ -101,8 +101,12 @@ void
DELAY(int n)
{
- if (delay_tc(n))
+ TSENTER();
+ if (delay_tc(n)) {
+ TSEXIT();
return;
+ }
init_ops.early_delay(n);
+ TSEXIT();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-27 11:57:04 +0000