Patrick Georgi (patrick@georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3891
-gerrit
commit d3ddc8bd65837a203831171caf48b9e6e7750737 Author: Nico Huber nico.huber@secunet.com Date: Wed Jun 26 12:28:32 2013 +0200
libpayload: Add a simple timeout API
Most timeouts in libpayload are currently implemented with loops that delay program execution by a specific time in each iteration. Like:
int timeout = 100; while (check_what_we_are_waiting_for() && timeout) { explicit_mdelay(1); --timeout; }
This pattern relies on the assumption that any per-iteration call to a (most likely lower-level) function doesn't delay the execution by itself. That's never true but works well as long as the explicit delays are long enough... Stop! We don't want them to be long! as this would cause higher latencies.
The obvious solution is to wait until a point in time instead. So, add a simple API for that now and port misbehaving timeout loops when they start to bother. The example above would become:
deadline_t timeout = new_timeout_ms(100); while (check_what_we_are_waiting_for() && !timeout_mdelay(timeout, 1)) ;
Change-Id: I19dcab5be7d81b5cf26167512a7089b275196d7a Signed-off-by: Nico Huber nico.huber@secunet.com --- payloads/libpayload/include/libpayload.h | 1 + payloads/libpayload/include/timeout.h | 149 +++++++++++++++++++++++++++++++ payloads/libpayload/libc/time.c | 17 ++++ 3 files changed, 167 insertions(+)
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index f23fb87..12f5957 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -63,6 +63,7 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
#define LITTLE_ENDIAN 1234 #define BIG_ENDIAN 4321 diff --git a/payloads/libpayload/include/timeout.h b/payloads/libpayload/include/timeout.h new file mode 100644 index 0000000..278f5e4 --- /dev/null +++ b/payloads/libpayload/include/timeout.h @@ -0,0 +1,149 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2013 secunet Security Networks AG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _LIBPAYLOAD_TIMEOUT_H +#define _LIBPAYLOAD_TIMEOUT_H + +#include <libpayload.h> +#include <stdint.h> + +#define NSECS_PER_SEC 1000000000L +#define USECS_PER_SEC 1000000L +#define MSECS_PER_SEC 1000 + +typedef const uint64_t deadline_t; + +/* For a TSC, 0 won't be reached within years. How about non-x86 platforms? */ +#define NEVER_TIMEOUT ((deadline_t)0) + +/** + * Starts a new timeout from now + * + * @param ns nanoseconds to timeout after + */ +static inline deadline_t new_timeout_ns(const unsigned long ns) +{ + return timer_raw_value() + + DIV_ROUND_UP((uint64_t)ns * timer_hz(), NSECS_PER_SEC); +} + +/** + * Starts a new timeout from now + * + * @param us microseconds to timeout after + */ +static inline deadline_t new_timeout_us(const unsigned long us) +{ + return timer_raw_value() + + DIV_ROUND_UP((uint64_t)us * timer_hz(), USECS_PER_SEC); +} + +/** + * Starts a new timeout from now + * + * @param ms milliseconds to timeout after + */ +static inline deadline_t new_timeout_ms(const unsigned long ms) +{ + return timer_raw_value() + + DIV_ROUND_UP((uint64_t)ms * timer_hz(), MSECS_PER_SEC); +} + +/** + * Starts a new timeout from now + * + * @param s seconds to timeout after + */ +static inline deadline_t new_timeout_s(const unsigned long s) +{ + return timer_raw_value() + ((uint64_t)s * timer_hz()); +} + +/** + * Checks if a deadline has expired + * + * @param dl the deadline to check + * @return 1 if dl has expired, 0 if not + */ +static inline int timed_out(deadline_t dl) +{ + return timer_raw_value() >= dl; +} + +int delay_until(deadline_t delay_end, deadline_t); + +/** + * Delay for a specified time but break at a deadline + * + * @param dl deadline to satisfy + * @param ns number of nanoseconds to delay for + * @return -1 if dl has already expired, 0 if not + */ +static inline int timeout_ndelay(deadline_t dl, unsigned long ns) +{ + return delay_until(new_timeout_ns(ns), dl); +} + +/** + * Delay for a specified time but break at a deadline + * + * @param dl deadline to satisfy + * @param us number of microseconds to delay for + * @return -1 if dl has already expired, 0 if not + */ +static inline int timeout_udelay(deadline_t dl, unsigned long us) +{ + return delay_until(new_timeout_us(us), dl); +} + +/** + * Delay for a specified time but break at a deadline + * + * @param dl deadline to satisfy + * @param ms number of milliseconds to delay for + * @return -1 if dl has already expired, 0 if not + */ +static inline int timeout_mdelay(deadline_t dl, const unsigned long ms) +{ + return delay_until(new_timeout_ms(ms), dl); +} + +/** + * Delay for a specified time but break at a deadline + * + * @param dl deadline to satisfy + * @param s number of seconds to delay for + * @return -1 if dl has already expired, 0 if not + */ +static inline int timeout_delay(deadline_t dl, const unsigned long s) +{ + return delay_until(new_timeout_s(s), dl); +} + +#endif diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c index 7b6bf47..421ef24 100644 --- a/payloads/libpayload/libc/time.c +++ b/payloads/libpayload/libc/time.c @@ -37,6 +37,7 @@ #ifdef CONFIG_ARCH_X86 #include <arch/rdtsc.h> #endif +#include <timeout.h>
extern u32 cpu_khz;
@@ -189,3 +190,19 @@ void delay(unsigned int s) { _delay((uint64_t)s * timer_hz()); } + +/** + * Delay until a specified point in time but break at a deadline + * + * @param delay_end point in time to delay until + * @param dl deadline to satisfy + * @return -1 if dl has already expired, 0 if not + */ +int delay_until(deadline_t delay_end, deadline_t dl) +{ + if (timed_out(dl)) + return -1; + deadline_t de = MIN(delay_end, dl); + while (timer_raw_value() < de) ; + return 0; +}
-
Patrick Georgi