On Sun, Dec 04, 2022 at 05:10:27PM -0800, Philip Guenther wrote:
> Took a couple tries due to my farting around (and not wanting to leave the
> power-sucking hppa running when I couldn't monitor progress) but it
> completed a make kernel, make build, make release cycle with reboots.
>
> Ship it?
Thank you for testing!
I will commit this within the next day or two.
Index: sys/arch/hppa/dev/clock.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa/dev/clock.c,v
retrieving revision 1.32
diff -u -p -r1.32 clock.c
--- sys/arch/hppa/dev/clock.c 23 Feb 2021 04:44:30 -0000 1.32
+++ sys/arch/hppa/dev/clock.c 4 Dec 2022 01:40:22 -0000
@@ -29,6 +29,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
+#include <sys/clockintr.h>
+#include <sys/stdint.h>
#include <sys/timetc.h>
#include <dev/clock_subr.h>
@@ -41,10 +43,15 @@
#include <machine/cpufunc.h>
#include <machine/autoconf.h>
-u_long cpu_hzticks;
+uint64_t itmr_nsec_cycle_ratio;
+uint64_t itmr_nsec_max;
-int cpu_hardclock(void *);
u_int itmr_get_timecount(struct timecounter *);
+int itmr_intr(void *);
+void itmr_rearm(void *, uint64_t);
+void itmr_trigger(void);
+void itmr_trigger_masked(void);
+void itmr_trigger_wrapper(void *);
struct timecounter itmr_timecounter = {
.tc_get_timecount = itmr_get_timecount,
@@ -57,6 +64,11 @@ struct timecounter itmr_timecounter = {
.tc_user = 0,
};
+const struct intrclock itmr_intrclock = {
+ .ic_rearm = itmr_rearm,
+ .ic_trigger = itmr_trigger_wrapper
+};
+
extern todr_chip_handle_t todr_handle;
struct todr_chip_handle pdc_todr;
@@ -94,88 +106,43 @@ pdc_settime(struct todr_chip_handle *han
void
cpu_initclocks(void)
{
- struct cpu_info *ci = curcpu();
- u_long __itmr;
+ uint64_t itmr_freq = PAGE0->mem_10msec * 100;
pdc_todr.todr_gettime = pdc_gettime;
pdc_todr.todr_settime = pdc_settime;
todr_handle = &pdc_todr;
- cpu_hzticks = (PAGE0->mem_10msec * 100) / hz;
-
- itmr_timecounter.tc_frequency = PAGE0->mem_10msec * 100;
+ itmr_timecounter.tc_frequency = itmr_freq;
tc_init(&itmr_timecounter);
- mfctl(CR_ITMR, __itmr);
- ci->ci_itmr = __itmr;
- __itmr += cpu_hzticks;
- mtctl(__itmr, CR_ITMR);
-}
+ stathz = hz;
+ profhz = stathz * 10;
+ clockintr_init(CL_RNDSTAT);
-int
-cpu_hardclock(void *v)
-{
- struct cpu_info *ci = curcpu();
- u_long __itmr, delta, eta;
- int wrap;
- register_t eiem;
+ itmr_nsec_cycle_ratio = itmr_freq * (1ULL << 32) / 1000000000;
+ itmr_nsec_max = UINT64_MAX / itmr_nsec_cycle_ratio;
- /*
- * Invoke hardclock as many times as there has been cpu_hzticks
- * ticks since the last interrupt.
- */
- for (;;) {
- mfctl(CR_ITMR, __itmr);
- delta = __itmr - ci->ci_itmr;
- if (delta >= cpu_hzticks) {
- hardclock(v);
- ci->ci_itmr += cpu_hzticks;
- } else
- break;
- }
+ cpu_startclock();
+}
- /*
- * Program the next clock interrupt, making sure it will
- * indeed happen in the future. This is done with interrupts
- * disabled to avoid a possible race.
- */
- eta = ci->ci_itmr + cpu_hzticks;
- wrap = eta < ci->ci_itmr; /* watch out for a wraparound */
- __asm volatile("mfctl %%cr15, %0": "=r" (eiem));
- __asm volatile("mtctl %r0, %cr15");
- mtctl(eta, CR_ITMR);
- mfctl(CR_ITMR, __itmr);
- /*
- * If we were close enough to the next tick interrupt
- * value, by the time we have programmed itmr, it might
- * have passed the value, which would cause a complete
- * cycle until the next interrupt occurs. On slow
- * models, this would be a disaster (a complete cycle
- * taking over two minutes on a 715/33).
- *
- * We expect that it will only be necessary to postpone
- * the interrupt once. Thus, there are two cases:
- * - We are expecting a wraparound: eta < cpu_itmr.
- * itmr is in tracks if either >= cpu_itmr or < eta.
- * - We are not wrapping: eta > cpu_itmr.
- * itmr is in tracks if >= cpu_itmr and < eta (we need
- * to keep the >= cpu_itmr test because itmr might wrap
- * before eta does).
- */
- if ((wrap && !(eta > __itmr || __itmr >= ci->ci_itmr)) ||
- (!wrap && !(eta > __itmr && __itmr >= ci->ci_itmr))) {
- eta += cpu_hzticks;
- mtctl(eta, CR_ITMR);
- }
- __asm volatile("mtctl %0, %%cr15":: "r" (eiem));
+void
+cpu_startclock(void)
+{
+ clockintr_cpu_init(&itmr_intrclock);
+ clockintr_trigger();
+}
+int
+itmr_intr(void *v)
+{
+ clockintr_dispatch(v);
return (1);
}
void
setstatclockrate(int newhz)
{
- /* nothing we can do */
+ clockintr_setstatclockrate(newhz);
}
u_int
@@ -185,4 +152,78 @@ itmr_get_timecount(struct timecounter *t
mfctl(CR_ITMR, __itmr);
return (__itmr);
+}
+
+/*
+ * Program the next clock interrupt, making sure it will
+ * indeed happen in the future. This is done with interrupts
+ * disabled to avoid a possible race.
+ */
+void
+itmr_rearm(void *unused, uint64_t nsecs)
+{
+ uint32_t cycles, t0, t1, target;
+ register_t eiem, eirr;
+
+ if (nsecs > itmr_nsec_max)
+ nsecs = itmr_nsec_max;
+ cycles = (nsecs * itmr_nsec_cycle_ratio) >> 32;
+
+ eiem = hppa_intr_disable();
+ mfctl(CR_ITMR, t0);
+ target = t0 + cycles;
+ mtctl(target, CR_ITMR);
+ mfctl(CR_ITMR, t1);
+
+ /*
+ * If the interrupt isn't already pending we need to check if
+ * we missed. In general, we are checking whether ITMR had
+ * already passed the target value when we wrote the register.
+ * There are two cases.
+ *
+ * 1. If (t0 + cycles) did not overflow, we want t1 to be between
+ * t0 and target. If t0 <= t1 < target, we didn't miss.
+ *
+ * 2. If (t0 + cycles) overflowed, either t0 <= t1 or t1 < target
+ * are sufficient to show we didn't miss.
+ *
+ * Only try once. Fall back to itmr_trigger_masked() if we miss.
+ */
+ mfctl(CR_EIRR, eirr);
+ if (!ISSET(eirr, 1U << 31)) {
+ if (t0 <= target) {
+ if (target <= t1 || t1 < t0)
+ itmr_trigger_masked();
+ } else {
+ if (target <= t1 && t1 < t0)
+ itmr_trigger_masked();
+ }
+ }
+ hppa_intr_enable(eiem);
+}
+
+void
+itmr_trigger(void)
+{
+ register_t eiem;
+
+ eiem = hppa_intr_disable();
+ itmr_trigger_masked();
+ hppa_intr_enable(eiem);
+}
+
+/* Trigger our own ITMR interrupt by setting EIR{0}. */
+void
+itmr_trigger_masked(void)
+{
+ struct iomod *cpu = (struct iomod *)curcpu()->ci_hpa;
+
+ cpu->io_eir = 0;
+ __asm volatile ("sync" ::: "memory");
+}
+
+void
+itmr_trigger_wrapper(void *unused)
+{
+ itmr_trigger();
}
Index: sys/arch/hppa/dev/cpu.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa/dev/cpu.c,v
retrieving revision 1.43
diff -u -p -r1.43 cpu.c
--- sys/arch/hppa/dev/cpu.c 13 Mar 2022 08:04:38 -0000 1.43
+++ sys/arch/hppa/dev/cpu.c 4 Dec 2022 01:40:22 -0000
@@ -89,7 +89,7 @@ cpuattach(struct device *parent, struct
extern u_int cpu_ticksnum, cpu_ticksdenom;
extern u_int fpu_enable;
/* clock.c */
- extern int cpu_hardclock(void *);
+ extern int itmr_intr(void *);
/* ipi.c */
extern int hppa_ipi_intr(void *);
@@ -173,7 +173,7 @@ cpuattach(struct device *parent, struct
printf(", %u/%u D/I BTLBs",
pdc_btlb.finfo.num_i, pdc_btlb.finfo.num_d);
- cpu_intr_establish(IPL_CLOCK, 31, cpu_hardclock, NULL, "clock");
+ cpu_intr_establish(IPL_CLOCK, 31, itmr_intr, NULL, "clock");
#ifdef MULTIPROCESSOR
cpu_intr_establish(IPL_IPI, 30, hppa_ipi_intr, NULL, "ipi");
#endif
@@ -242,8 +242,6 @@ void
cpu_hatch(void)
{
struct cpu_info *ci = curcpu();
- extern u_long cpu_hzticks;
- u_long itmr;
int s;
/* Initialise IPIs. */
@@ -251,11 +249,8 @@ cpu_hatch(void)
/* Initialise clock. */
mtctl((1U << 31), CR_EIRR);
- mfctl(CR_ITMR, itmr);
- ci->ci_itmr = itmr;
- itmr += cpu_hzticks;
- mtctl(itmr, CR_ITMR);
ci->ci_mask |= (1U << 31);
+ cpu_startclock();
/* Enable interrupts. */
mtctl(ci->ci_mask, CR_EIEM);
Index: sys/arch/hppa/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/hppa/include/cpu.h,v
retrieving revision 1.96
diff -u -p -r1.96 cpu.h
--- sys/arch/hppa/include/cpu.h 25 Oct 2022 15:15:38 -0000 1.96
+++ sys/arch/hppa/include/cpu.h 4 Dec 2022 01:40:24 -0000
@@ -67,6 +67,7 @@
#ifndef _LOCORE
#ifdef _KERNEL
+#include <sys/clockintr.h>
#include <sys/device.h>
#include <sys/queue.h>
#include <sys/sched.h>
@@ -101,7 +102,6 @@ struct cpu_info {
volatile u_long ci_ipending;
volatile int ci_in_intr;
int ci_want_resched;
- u_long ci_itmr;
volatile u_long ci_ipi; /* IPIs pending. */
struct mutex ci_ipi_mtx;
@@ -114,7 +114,7 @@ struct cpu_info {
#ifdef GPROF
struct gmonparam *ci_gmon;
#endif
-
+ struct clockintr_queue ci_queue;
char ci_panicbuf[512];
} __attribute__((__aligned__(64)));
@@ -241,6 +241,7 @@ int copy_on_fault(void);
void proc_trampoline(void);
int cpu_dumpsize(void);
int cpu_dump(void);
+void cpu_startclock(void);
static inline unsigned int
cpu_rnd_messybits(void)
Index: sys/arch/hppa/include/_types.h
===================================================================
RCS file: /cvs/src/sys/arch/hppa/include/_types.h,v
retrieving revision 1.26
diff -u -p -r1.26 _types.h
--- sys/arch/hppa/include/_types.h 5 Mar 2018 01:15:25 -0000 1.26
+++ sys/arch/hppa/include/_types.h 4 Dec 2022 01:40:24 -0000
@@ -35,6 +35,8 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
+#define __HAVE_CLOCKINTR
+
#if defined(_KERNEL)
typedef struct label_t {
long val[19];
