summaryrefslogtreecommitdiff
path: root/sys/altq
diff options
context:
space:
mode:
Diffstat (limited to 'sys/altq')
-rw-r--r--sys/altq/altq_subr.c141
-rw-r--r--sys/altq/altq_var.h40
2 files changed, 75 insertions, 106 deletions
diff --git a/sys/altq/altq_subr.c b/sys/altq/altq_subr.c
index 96556e6c41e..203e9350227 100644
--- a/sys/altq/altq_subr.c
+++ b/sys/altq/altq_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_subr.c,v 1.11 2002/11/26 03:44:53 kjc Exp $ */
+/* $OpenBSD: altq_subr.c,v 1.12 2002/11/29 07:51:54 kjc Exp $ */
/* $KAME: altq_subr.c,v 1.11 2002/01/11 08:11:49 kjc Exp $ */
/*
@@ -59,17 +59,9 @@
#include <altq/altq_conf.h>
/* machine dependent clock related includes */
-#ifdef __FreeBSD__
-#include "opt_cpu.h" /* for FreeBSD-2.2.8 to get i586_ctr_freq */
-#include <machine/clock.h>
-#endif
#if defined(__i386__)
+#include <machine/cpufunc.h> /* for pentium tsc */
#include <machine/specialreg.h> /* for CPUID_TSC */
-#ifdef __FreeBSD__
-#include <machine/md_var.h> /* for cpu_feature */
-#elif defined(__NetBSD__) || defined(__OpenBSD__)
-#include <machine/cpu.h> /* for cpu_feature */
-#endif
#endif /* __i386__ */
/*
@@ -1662,60 +1654,56 @@ write_dsfield(m, pktattr, dsfield)
* - 64-bit-long monotonically-increasing counter
* - frequency range is 100M-4GHz (CPU speed)
*/
+/* if pcc is not available or disabled, emulate 256MHz using microtime() */
+#define MACHCLK_SHIFT 8
+
+int machclk_usepcc;
u_int32_t machclk_freq = 0;
u_int32_t machclk_per_tick = 0;
-#if (defined(__i386__) || defined(__alpha__)) && !defined(ALTQ_NOPCC)
-
-#if defined(__FreeBSD__) && defined(SMP)
-#error SMP system! use ALTQ_NOPCC option.
-#endif
-
#ifdef __alpha__
-#ifdef __FreeBSD__
-extern u_int32_t cycles_per_sec; /* alpha cpu clock frequency */
-#elif defined(__NetBSD__) || defined(__OpenBSD__)
extern u_int64_t cycles_per_usec; /* alpha cpu clock frequency */
-#endif
#endif /* __alpha__ */
-#if defined(__i386__) && defined(__NetBSD__)
-extern u_int64_t cpu_tsc_freq;
-#endif
void
init_machclk(void)
{
- /* sanity check */
+ machclk_usepcc = 1;
+
+#if (!defined(__i386__) && !defined(__alpha__)) || defined(ALTQ_NOPCC)
+ machclk_usepcc = 0;
+#endif
+#if defined(__FreeBSD__) && defined(SMP)
+ machclk_usepcc = 0;
+#endif
+#if defined(__NetBSD__) && defined(MULTIPROCESSOR)
+ machclk_usepcc = 0;
+#endif
#ifdef __i386__
/* check if TSC is available */
- if ((cpu_feature & CPUID_TSC) == 0) {
- printf("altq: TSC isn't available! use ALTQ_NOPCC option.\n");
+ if (machclk_usepcc == 1 && (cpu_feature & CPUID_TSC) == 0)
+ machclk_usepcc = 0;
+#endif
+
+ if (machclk_usepcc == 0) {
+ /* emulate 256MHz using microtime() */
+ machclk_freq = 1000000 << MACHCLK_SHIFT;
+ machclk_per_tick = machclk_freq / hz;
+#ifdef ALTQ_DEBUG
+ printf("altq: emulate %uHz cpu clock\n", machclk_freq);
+#endif
return;
}
-#endif
/*
* if the clock frequency (of Pentium TSC or Alpha PCC) is
* accessible, just use it.
*/
-#ifdef __i386__
-#ifdef __FreeBSD__
-#if (__FreeBSD_version > 300000)
- machclk_freq = tsc_freq;
-#else
- machclk_freq = i586_ctr_freq;
-#endif
-#elif defined(__NetBSD__)
- machclk_freq = (u_int32_t)cpu_tsc_freq;
-#elif defined(__OpenBSD__) && (defined(I586_CPU) || defined(I686_CPU))
+#if defined(__i386__) && (defined(I586_CPU) || defined(I686_CPU))
machclk_freq = pentium_mhz * 1000000;
#endif
-#elif defined(__alpha__)
-#ifdef __FreeBSD__
- machclk_freq = cycles_per_sec;
-#elif defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__alpha__)
machclk_freq = (u_int32_t)(cycles_per_usec * 1000000);
-#endif
#endif /* __alpha__ */
/*
@@ -1746,33 +1734,50 @@ init_machclk(void)
#endif
}
-#ifdef __alpha__
-/*
- * make a 64bit counter value out of the 32bit alpha processor cycle counter.
- * read_machclk must be called within a half of its wrap-around cycle
- * (about 5 sec for 400MHz cpu) to properly detect a counter wrap-around.
- * tbr_timeout calls read_machclk once a second.
- */
-u_int64_t
-read_machclk(void)
+#if defined(__OpenBSD__) && defined(__i386__)
+static __inline u_int64_t
+rdtsc(void)
{
- static u_int32_t last_pcc, upper;
- u_int32_t pcc;
-
- pcc = (u_int32_t)alpha_rpcc();
- if (pcc <= last_pcc)
- upper++;
- last_pcc = pcc;
- return (((u_int64_t)upper << 32) + pcc);
+ u_int64_t rv;
+ __asm __volatile(".byte 0x0f, 0x31" : "=A" (rv));
+ return (rv);
}
-#endif /* __alpha__ */
-#else /* !i386 && !alpha */
-/* use microtime() for now */
-void
-init_machclk(void)
+#endif /* __OpenBSD__ && __i386__ */
+
+u_int64_t
+read_machclk(void)
{
- machclk_freq = 1000000 << MACHCLK_SHIFT;
- machclk_per_tick = machclk_freq / hz;
- printf("altq: emulate %uHz cpu clock\n", machclk_freq);
+ u_int64_t val;
+
+ if (machclk_usepcc) {
+#if defined(__i386__)
+ val = rdtsc();
+#elif defined(__alpha__)
+ static u_int32_t last_pcc, upper;
+ u_int32_t pcc;
+
+ /*
+ * for alpha, make a 64bit counter value out of the 32bit
+ * alpha processor cycle counter.
+ * read_machclk must be called within a half of its
+ * wrap-around cycle (about 5 sec for 400MHz cpu) to properly
+ * detect a counter wrap-around.
+ * tbr_timeout calls read_machclk once a second.
+ */
+ pcc = (u_int32_t)alpha_rpcc();
+ if (pcc <= last_pcc)
+ upper++;
+ last_pcc = pcc;
+ val = ((u_int64_t)upper << 32) + pcc;
+#else
+ panic("read_machclk");
+#endif
+ } else {
+ struct timeval tv;
+
+ microtime(&tv);
+ val = (((u_int64_t)(tv.tv_sec - boottime.tv_sec) * 1000000
+ + tv.tv_usec) << MACHCLK_SHIFT);
+ }
+ return (val);
}
-#endif /* !i386 && !alpha */
diff --git a/sys/altq/altq_var.h b/sys/altq/altq_var.h
index 30fa5357000..7f6610acd44 100644
--- a/sys/altq/altq_var.h
+++ b/sys/altq/altq_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_var.h,v 1.8 2002/11/26 03:44:53 kjc Exp $ */
+/* $OpenBSD: altq_var.h,v 1.9 2002/11/29 07:51:54 kjc Exp $ */
/* $KAME: altq_var.h,v 1.8 2001/02/09 09:44:41 kjc Exp $ */
/*
@@ -107,48 +107,12 @@ struct acc_classifier {
* machine dependent clock
* a 64bit high resolution time counter.
*/
+extern int machclk_usepcc;
extern u_int32_t machclk_freq;
extern u_int32_t machclk_per_tick;
extern void init_machclk(void);
-
-#if defined(__i386__) && !defined(I586_CPU) && !defined(I686_CPU)
-#ifndef ALTQ_NOPCC
-#define ALTQ_NOPCC /* TSC is not available, ALTQ_NOPCC needed */
-#endif
-#endif
-
-#if defined(__i386__) && !defined(ALTQ_NOPCC)
-/* for pentium tsc */
-#include <machine/cpufunc.h>
-
-#define read_machclk() rdtsc()
-#ifdef __OpenBSD__
-static __inline u_int64_t
-rdtsc(void)
-{
- u_int64_t rv;
- __asm __volatile(".byte 0x0f, 0x31" : "=A" (rv));
- return (rv);
-}
-#endif /* __OpenBSD__ */
-
-#elif defined(__alpha__) && !defined(ALTQ_NOPCC)
-/* for alpha rpcc */
extern u_int64_t read_machclk(void);
-#else /* !i386 && !alpha */
-/* emulate 256MHz using microtime() */
-#define MACHCLK_SHIFT 8
-static __inline u_int64_t
-read_machclk(void)
-{
- struct timeval tv;
- microtime(&tv);
- return (((u_int64_t)(tv.tv_sec - boottime.tv_sec) * 1000000
- + tv.tv_usec) << MACHCLK_SHIFT);
-}
-#endif /* !i386 && !alpha */
-
/*
* debug support
*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 22:33:56 +0000