1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 22:21:16 +02:00

udelay: only use OS time for delays, except on DOS

As proposed on the mailing list ("RFC: remove the calibrated delay
loop" [1]), this removes the calibrated delay loop and uses OS-based
timing functions for all delays because the calibrated delay loop can
delay for shorter times than intended.

When sleeping this now uses nanosleep() unconditionally, since usleep
was only used on DOS (where DJGPP lacks nanosleep).  When busy-looping,
it uses clock_gettime() with CLOCK_MONOTONIC or CLOCK_REALTIME depending
on availability, and gettimeofday() otherwise.

The calibrated delay loop is retained for DOS only, because timer
resolution on DJGPP is only about 50 milliseconds. Since typical delays
in flashrom are around 10 microseconds, using OS timing there would
regress performance by around 500x. The old implementation is reused
with some branches removed based on the knowledge that timer resolution
will not be better than about 50 milliseconds.

Tested by reading and writing flash on several Intel and AMD systems:

 * Lenovo P920 (Intel C620, read/verify only)
 * "nissa" chromebook (Intel Alder Lake-N)
 * "zork" chromebook (AMD Zen+)

[1]: https://mail.coreboot.org/hyperkitty/list/flashrom@flashrom.org/thread/HFH6UHPAKA4JDL4YKPSQPO72KXSSRGME/

Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Change-Id: I7ac5450d194a475143698d65d64d8bcd2fd25e3f
Reviewed-on: https://review.coreboot.org/c/flashrom/+/81545
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
This commit is contained in:
Peter Marheine
2024-03-27 10:54:01 +11:00
parent a79ec2425e
commit 183208b5cb
10 changed files with 268 additions and 178 deletions

View File

@ -25,6 +25,7 @@ test_srcs = files(
'selfcheck.c',
'io_real.c',
'erase_func_algo.c',
'udelay.c',
)
if not programmer.get('dummy').get('active')

View File

@ -504,6 +504,11 @@ int main(int argc, char *argv[])
};
ret |= cmocka_run_group_tests_name("chip.c tests", chip_tests, NULL, NULL);
const struct CMUnitTest delay_tests[] = {
cmocka_unit_test(udelay_test_short),
};
ret |= cmocka_run_group_tests_name("udelay.c tests", delay_tests, NULL, NULL);
size_t n_erase_tests;
struct CMUnitTest *erase_func_algo_tests = get_erase_func_algo_tests(&n_erase_tests);
ret |= _cmocka_run_group_tests("erase_func_algo.c tests", erase_func_algo_tests, n_erase_tests, NULL, NULL);

View File

@ -110,4 +110,7 @@ struct CMUnitTest *get_erase_func_algo_tests(size_t *num_tests);
void erase_function_algo_test_success(void **state);
void write_function_algo_test_success(void **state);
/* udelay.c */
void udelay_test_short(void **state);
#endif /* TESTS_H */

51
tests/udelay.c Normal file
View File

@ -0,0 +1,51 @@
/*
* This file is part of the flashrom project.
*
* Copyright 2024 Google LLC
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <include/test.h>
#include <stdint.h>
#include <sys/time.h>
#include <time.h>
#include "programmer.h"
#include "tests.h"
static uint64_t now_us(void) {
#if HAVE_CLOCK_GETTIME == 1
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
return (ts.tv_nsec / 1000) + (ts.tv_sec * 1000000);
#else
struct timeval tv;
gettimeofday(&tv, NULL);
return tv.tv_usec + (tv.tv_sec * 1000000);
#endif
}
/*
* A short delay should delay for at least as long as requested,
* and more than 10x as long would be worrisome.
*
* This test could fail spuriously on a heavily-loaded system, or if we need
* to use gettimeofday() and a time change (such as DST) occurs during the
* test.
*/
void udelay_test_short(void **state) {
uint64_t start = now_us();
default_delay(100);
uint64_t elapsed = now_us() - start;
assert_in_range(elapsed, 100, 1000);
}