Date: Fri, 8 Feb 2013 12:53:30 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246551 - in projects/calloutng/sys: amd64/amd64 dev/acpica i386/i386 ia64/ia64 kern pc98/pc98 powerpc/powerpc powerpc/ps3 powerpc/wii sys Message-ID: <201302081253.r18CrUCf095051@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Fri Feb 8 12:53:29 2013 New Revision: 246551 URL: http://svnweb.freebsd.org/changeset/base/246551 Log: Use sbintime_t to represent expected sleep time instead of measuring it in microseconds. Suggested by: phk Modified: projects/calloutng/sys/amd64/amd64/machdep.c projects/calloutng/sys/dev/acpica/acpi_cpu.c projects/calloutng/sys/i386/i386/machdep.c projects/calloutng/sys/ia64/ia64/machdep.c projects/calloutng/sys/kern/kern_clocksource.c projects/calloutng/sys/pc98/pc98/machdep.c projects/calloutng/sys/powerpc/powerpc/cpu.c projects/calloutng/sys/powerpc/ps3/platform_ps3.c projects/calloutng/sys/powerpc/wii/platform_wii.c projects/calloutng/sys/sys/proc.h projects/calloutng/sys/sys/systm.h Modified: projects/calloutng/sys/amd64/amd64/machdep.c ============================================================================== --- projects/calloutng/sys/amd64/amd64/machdep.c Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/amd64/amd64/machdep.c Fri Feb 8 12:53:29 2013 (r246551) @@ -658,7 +658,7 @@ cpu_halt(void) halt(); } -void (*cpu_idle_hook)(int) = NULL; /* ACPI idle hook. */ +void (*cpu_idle_hook)(sbintime_t) = NULL; /* ACPI idle hook. */ static int cpu_ident_amdc1e = 0; /* AMD C1E supported. */ static int idle_mwait = 1; /* Use MONITOR/MWAIT for short idle. */ TUNABLE_INT("machdep.idle_mwait", &idle_mwait); @@ -670,7 +670,7 @@ SYSCTL_INT(_machdep, OID_AUTO, idle_mwai #define STATE_SLEEPING 0x2 static void -cpu_idle_acpi(int us) +cpu_idle_acpi(sbintime_t sbt) { int *state; @@ -682,14 +682,14 @@ cpu_idle_acpi(int us) if (sched_runnable()) enable_intr(); else if (cpu_idle_hook) - cpu_idle_hook(us); + cpu_idle_hook(sbt); else __asm __volatile("sti; hlt"); *state = STATE_RUNNING; } static void -cpu_idle_hlt(int us) +cpu_idle_hlt(sbintime_t sbt) { int *state; @@ -730,7 +730,7 @@ cpu_idle_hlt(int us) #define MWAIT_C4 0x30 static void -cpu_idle_mwait(int us) +cpu_idle_mwait(sbintime_t sbt) { int *state; @@ -753,7 +753,7 @@ cpu_idle_mwait(int us) } static void -cpu_idle_spin(int us) +cpu_idle_spin(sbintime_t sbt) { int *state; int i; @@ -802,13 +802,13 @@ cpu_probe_amdc1e(void) } } -void (*cpu_idle_fn)(int) = cpu_idle_acpi; +void (*cpu_idle_fn)(sbintime_t) = cpu_idle_acpi; void cpu_idle(int busy) { uint64_t msr; - int us = -1; + sbintime_t sbt = -1; CTR2(KTR_SPARE2, "cpu_idle(%d) at %d", busy, curcpu); @@ -826,7 +826,7 @@ cpu_idle(int busy) /* If we have time - switch timers into idle mode. */ if (!busy) { critical_enter(); - us = cpu_idleclock(); + sbt = cpu_idleclock(); } /* Apply AMD APIC timer C1E workaround. */ @@ -837,7 +837,7 @@ cpu_idle(int busy) } /* Call main idle method. */ - cpu_idle_fn(us); + cpu_idle_fn(sbt); /* Switch timers mack into active mode. */ if (!busy) { Modified: projects/calloutng/sys/dev/acpica/acpi_cpu.c ============================================================================== --- projects/calloutng/sys/dev/acpica/acpi_cpu.c Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/dev/acpica/acpi_cpu.c Fri Feb 8 12:53:29 2013 (r246551) @@ -168,7 +168,7 @@ static int acpi_cpu_cx_cst(struct acpi_c static void acpi_cpu_startup(void *arg); static void acpi_cpu_startup_cx(struct acpi_cpu_softc *sc); static void acpi_cpu_cx_list(struct acpi_cpu_softc *sc); -static void acpi_cpu_idle(int us); +static void acpi_cpu_idle(sbintime_t sbt); static void acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_cpu_quirks(void); static int acpi_cpu_usage_sysctl(SYSCTL_HANDLER_ARGS); @@ -954,13 +954,13 @@ acpi_cpu_startup_cx(struct acpi_cpu_soft * interrupts are re-enabled. */ static void -acpi_cpu_idle(int us) +acpi_cpu_idle(sbintime_t sbt) { struct acpi_cpu_softc *sc; struct acpi_cx *cx_next; uint64_t cputicks; uint32_t start_time, end_time; - int bm_active, cx_next_idx, i; + int bm_active, cx_next_idx, i, us; /* * Look up our CPU id to get our softc. If it's NULL, we'll use C1 @@ -980,7 +980,9 @@ acpi_cpu_idle(int us) } /* Find the lowest state that has small enough latency. */ - us = min(us, sc->cpu_prev_sleep); + us = sc->cpu_prev_sleep; + if (sbt >= 0 && us > sbt / SBT_1US) + us = sbt / SBT_1US; cx_next_idx = 0; if (cpu_disable_deep_sleep) i = min(sc->cpu_cx_lowest, sc->cpu_non_c3); Modified: projects/calloutng/sys/i386/i386/machdep.c ============================================================================== --- projects/calloutng/sys/i386/i386/machdep.c Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/i386/i386/machdep.c Fri Feb 8 12:53:29 2013 (r246551) @@ -1220,7 +1220,7 @@ cpu_halt(void) int scheduler_running; static void -cpu_idle_hlt(int us) +cpu_idle_hlt(sbintime_t sbt) { scheduler_running = 1; @@ -1241,7 +1241,7 @@ cpu_halt(void) #endif -void (*cpu_idle_hook)(int) = NULL; /* ACPI idle hook. */ +void (*cpu_idle_hook)(sbintime_t) = NULL; /* ACPI idle hook. */ static int cpu_ident_amdc1e = 0; /* AMD C1E supported. */ static int idle_mwait = 1; /* Use MONITOR/MWAIT for short idle. */ TUNABLE_INT("machdep.idle_mwait", &idle_mwait); @@ -1253,7 +1253,7 @@ SYSCTL_INT(_machdep, OID_AUTO, idle_mwai #define STATE_SLEEPING 0x2 static void -cpu_idle_acpi(int us) +cpu_idle_acpi(sbintime_t sbt) { int *state; @@ -1265,7 +1265,7 @@ cpu_idle_acpi(int us) if (sched_runnable()) enable_intr(); else if (cpu_idle_hook) - cpu_idle_hook(us); + cpu_idle_hook(sbt); else __asm __volatile("sti; hlt"); *state = STATE_RUNNING; @@ -1273,7 +1273,7 @@ cpu_idle_acpi(int us) #ifndef XEN static void -cpu_idle_hlt(int us) +cpu_idle_hlt(sbintime_t sbt) { int *state; @@ -1315,7 +1315,7 @@ cpu_idle_hlt(int us) #define MWAIT_C4 0x30 static void -cpu_idle_mwait(int us) +cpu_idle_mwait(sbintime_t sbt) { int *state; @@ -1338,7 +1338,7 @@ cpu_idle_mwait(int us) } static void -cpu_idle_spin(int us) +cpu_idle_spin(sbintime_t sbt) { int *state; int i; @@ -1388,9 +1388,9 @@ cpu_probe_amdc1e(void) } #ifdef XEN -void (*cpu_idle_fn)(int) = cpu_idle_hlt; +void (*cpu_idle_fn)(sbintime_t) = cpu_idle_hlt; #else -void (*cpu_idle_fn)(int) = cpu_idle_acpi; +void (*cpu_idle_fn)(sbintime_t) = cpu_idle_acpi; #endif void @@ -1399,7 +1399,7 @@ cpu_idle(int busy) #ifndef XEN uint64_t msr; #endif - int us = -1; + sbintime_t sbt = -1; CTR2(KTR_SPARE2, "cpu_idle(%d) at %d", busy, curcpu); @@ -1419,7 +1419,7 @@ cpu_idle(int busy) /* If we have time - switch timers into idle mode. */ if (!busy) { critical_enter(); - us = cpu_idleclock(); + sbt = cpu_idleclock(); } #ifndef XEN @@ -1432,7 +1432,7 @@ cpu_idle(int busy) #endif /* Call main idle method. */ - cpu_idle_fn(us); + cpu_idle_fn(sbt); /* Switch timers mack into active mode. */ if (!busy) { Modified: projects/calloutng/sys/ia64/ia64/machdep.c ============================================================================== --- projects/calloutng/sys/ia64/ia64/machdep.c Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/ia64/ia64/machdep.c Fri Feb 8 12:53:29 2013 (r246551) @@ -155,7 +155,7 @@ extern vm_offset_t ksym_start, ksym_end; struct msgbuf *msgbufp = NULL; /* Other subsystems (e.g., ACPI) can hook this later. */ -void (*cpu_idle_hook)(int) = NULL; +void (*cpu_idle_hook)(sbintime_t) = NULL; struct kva_md_info kmi; @@ -392,11 +392,11 @@ void cpu_idle(int busy) { register_t ie; - int us = -1; + sbintime_t sbt = -1; if (!busy) { critical_enter(); - us = cpu_idleclock(); + sbt = cpu_idleclock(); } ie = intr_disable(); @@ -405,7 +405,7 @@ cpu_idle(int busy) if (sched_runnable()) ia64_enable_intr(); else if (cpu_idle_hook != NULL) { - (*cpu_idle_hook)(us); + (*cpu_idle_hook)(sbt); /* The hook must enable interrupts! */ } else { ia64_call_pal_static(PAL_HALT_LIGHT, 0, 0, 0); Modified: projects/calloutng/sys/kern/kern_clocksource.c ============================================================================== --- projects/calloutng/sys/kern/kern_clocksource.c Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/kern/kern_clocksource.c Fri Feb 8 12:53:29 2013 (r246551) @@ -766,7 +766,7 @@ cpu_stopprofclock(void) /* * Switch to idle mode (all ticks handled). */ -int +sbintime_t cpu_idleclock(void) { struct bintime now, t; @@ -795,8 +795,7 @@ cpu_idleclock(void) loadtimer(&now, 0); ET_HW_UNLOCK(state); bintime_sub(&t, &now); - return (t.sec > (INT_MAX >> 20) ? INT_MAX : - ((t.sec < 0) ? 0 : ((t.sec << 20) + (t.frac >> 44)))); + return (MAX(bintime2sbintime(t), 0)); } /* Modified: projects/calloutng/sys/pc98/pc98/machdep.c ============================================================================== --- projects/calloutng/sys/pc98/pc98/machdep.c Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/pc98/pc98/machdep.c Fri Feb 8 12:53:29 2013 (r246551) @@ -1145,7 +1145,7 @@ SYSCTL_INT(_machdep, OID_AUTO, idle_mwai #define STATE_SLEEPING 0x2 static void -cpu_idle_hlt(int us) +cpu_idle_hlt(sbintime_t sbt) { int *state; @@ -1186,7 +1186,7 @@ cpu_idle_hlt(int us) #define MWAIT_C4 0x30 static void -cpu_idle_mwait(int us) +cpu_idle_mwait(sbintime_t sbt) { int *state; @@ -1209,7 +1209,7 @@ cpu_idle_mwait(int us) } static void -cpu_idle_spin(int us) +cpu_idle_spin(sbintime_t sbt) { int *state; int i; @@ -1229,12 +1229,12 @@ cpu_idle_spin(int us) } } -void (*cpu_idle_fn)(int) = cpu_idle_hlt; +void (*cpu_idle_fn)(sbintime_t) = cpu_idle_hlt; void cpu_idle(int busy) { - int us = -1; + sbintime_t sbt = -1; CTR2(KTR_SPARE2, "cpu_idle(%d) at %d", busy, curcpu); @@ -1252,11 +1252,11 @@ cpu_idle(int busy) /* If we have time - switch timers into idle mode. */ if (!busy) { critical_enter(); - us = cpu_idleclock(); + sbt = cpu_idleclock(); } /* Call main idle method. */ - cpu_idle_fn(us); + cpu_idle_fn(sbt); /* Switch timers mack into active mode. */ if (!busy) { Modified: projects/calloutng/sys/powerpc/powerpc/cpu.c ============================================================================== --- projects/calloutng/sys/powerpc/powerpc/cpu.c Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/powerpc/powerpc/cpu.c Fri Feb 8 12:53:29 2013 (r246551) @@ -79,9 +79,9 @@ static void cpu_970_setup(int cpuid, uin static void cpu_booke_setup(int cpuid, uint16_t vers); int powerpc_pow_enabled; -void (*cpu_idle_hook)(int) = NULL; -static void cpu_idle_60x(int); -static void cpu_idle_booke(int); +void (*cpu_idle_hook)(sbintime_t) = NULL; +static void cpu_idle_60x(sbintime_t); +static void cpu_idle_booke(sbintime_t); struct cputab { const char *name; @@ -516,7 +516,7 @@ cpu_feature_bit(SYSCTL_HANDLER_ARGS) void cpu_idle(int busy) { - int us = -1; + sbintime_t sbt = -1; #ifdef INVARIANTS if ((mfmsr() & PSL_EE) != PSL_EE) { @@ -532,9 +532,9 @@ cpu_idle(int busy) if (cpu_idle_hook != NULL) { if (!busy) { critical_enter(); - us = cpu_idleclock(); + sbt = cpu_idleclock(); } - cpu_idle_hook(us); + cpu_idle_hook(sbt); if (!busy) { cpu_activeclock(); critical_exit(); @@ -552,7 +552,7 @@ cpu_idle_wakeup(int cpu) } static void -cpu_idle_60x(int us) +cpu_idle_60x(sbintime_t sbt) { register_t msr; uint16_t vers; @@ -587,7 +587,7 @@ cpu_idle_60x(int us) } static void -cpu_idle_booke(int us) +cpu_idle_booke(sbintime_t sbt) { register_t msr; Modified: projects/calloutng/sys/powerpc/ps3/platform_ps3.c ============================================================================== --- projects/calloutng/sys/powerpc/ps3/platform_ps3.c Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/powerpc/ps3/platform_ps3.c Fri Feb 8 12:53:29 2013 (r246551) @@ -70,7 +70,7 @@ static int ps3_smp_start_cpu(platform_t, static struct cpu_group *ps3_smp_topo(platform_t); #endif static void ps3_reset(platform_t); -static void ps3_cpu_idle(int); +static void ps3_cpu_idle(sbintime_t); static platform_method_t ps3_methods[] = { PLATFORMMETHOD(platform_probe, ps3_probe), @@ -245,7 +245,7 @@ ps3_real_maxaddr(platform_t plat) } static void -ps3_cpu_idle(int us) +ps3_cpu_idle(sbintime_t sbt) { lv1_pause(0); } Modified: projects/calloutng/sys/powerpc/wii/platform_wii.c ============================================================================== --- projects/calloutng/sys/powerpc/wii/platform_wii.c Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/powerpc/wii/platform_wii.c Fri Feb 8 12:53:29 2013 (r246551) @@ -60,7 +60,7 @@ static void wii_mem_regions(platform_t, int *, struct mem_region **, int *); static unsigned long wii_timebase_freq(platform_t, struct cpuref *cpuref); static void wii_reset(platform_t); -static void wii_cpu_idle(int); +static void wii_cpu_idle(sbintime_t); static platform_method_t wii_methods[] = { PLATFORMMETHOD(platform_probe, wii_probe), @@ -155,6 +155,6 @@ wii_reset(platform_t plat) } static void -wii_cpu_idle(int us) +wii_cpu_idle(sbintime_t sbt) { } Modified: projects/calloutng/sys/sys/proc.h ============================================================================== --- projects/calloutng/sys/sys/proc.h Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/sys/proc.h Fri Feb 8 12:53:29 2013 (r246551) @@ -907,7 +907,7 @@ void tidhash_add(struct thread *); void tidhash_remove(struct thread *); void cpu_idle(int); int cpu_idle_wakeup(int); -extern void (*cpu_idle_hook)(int); /* Hook to machdep CPU idler. */ +extern void (*cpu_idle_hook)(sbintime_t); /* Hook to machdep CPU idler. */ void cpu_switch(struct thread *, struct thread *, struct mtx *); void cpu_throw(struct thread *, struct thread *) __dead2; void unsleep(struct thread *); Modified: projects/calloutng/sys/sys/systm.h ============================================================================== --- projects/calloutng/sys/sys/systm.h Fri Feb 8 11:19:43 2013 (r246550) +++ projects/calloutng/sys/sys/systm.h Fri Feb 8 12:53:29 2013 (r246551) @@ -266,7 +266,7 @@ void startprofclock(struct proc *); void stopprofclock(struct proc *); void cpu_startprofclock(void); void cpu_stopprofclock(void); -int cpu_idleclock(void); +sbintime_t cpu_idleclock(void); void cpu_activeclock(void); extern int cpu_can_deep_sleep; extern int cpu_disable_deep_sleep;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302081253.r18CrUCf095051>