August 2015 - coreboot-gerrit - mail.coreboot.org

Patch set updated for coreboot: timestamp: add tick frequency to exported table
by Aaron Durbin Aug. 30, 2015

Aug. 30, 2015

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11470 -gerrit commit 15fe2663768cf219af6da861c326ea7042896116 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sun Aug 30 21:19:55 2015 -0500 timestamp: add tick frequency to exported table Add the timestamp tick frequency within the timestamp table so the cbmem utility doesn't try to figure it out on its own. Those paths still exist for x86 systems which don't provide tsc_freq_mhz(). All other non-x86 systems use the monotonic timer which has a 1us granularity or 1MHz. One of the main reasons is that Linux is reporting /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq as the true turbo frequency on turbo enables machines. This change also fixes the p-state values honored in cpufreq for turbo machines in that turbo p-pstates were reported as 100MHz greater than nominal. BUG=chrome-os-partner:44669 BRANCH=firmware-strago-7287.B TEST=Built and booted on glados. Confirmed table frequency honored. Change-Id: I763fe2d9a7b01d0ef5556e5abff36032062f5801 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/arch/x86/timestamp.c | 13 +++++++++++ src/include/cpu/x86/tsc.h | 3 +-- src/include/timestamp.h | 5 ++++- src/lib/timestamp.c | 10 +++++++++ util/cbmem/cbmem.c | 57 ++++++++++++++++++++++++++--------------------- 5 files changed, 60 insertions(+), 28 deletions(-) diff --git a/src/arch/x86/timestamp.c b/src/arch/x86/timestamp.c index 9df505a..d308146 100644 --- a/src/arch/x86/timestamp.c +++ b/src/arch/x86/timestamp.c @@ -24,3 +24,16 @@ uint64_t timestamp_get(void) { return rdtscll(); } + +unsigned long __attribute__((weak)) tsc_freq_mhz(void) +{ + /* Default to not knowing TSC frequency. cbmem will have to fallback + * on trying to determine it in userspace. */ + return 0; +} + +int timestamp_tick_freq_mhz(void) +{ + /* Chipsets that have a constant TSC provide this value correctly. */ + return tsc_freq_mhz(); +} diff --git a/src/include/cpu/x86/tsc.h b/src/include/cpu/x86/tsc.h index 71d253b..5cf4644 100644 --- a/src/include/cpu/x86/tsc.h +++ b/src/include/cpu/x86/tsc.h @@ -60,8 +60,7 @@ static inline uint64_t tsc_to_uint64(tsc_t tstamp) } #endif -#if CONFIG_TSC_CONSTANT_RATE +/* Provided by CPU/chipset code for the TSC rate in MHz. */ unsigned long tsc_freq_mhz(void); -#endif #endif /* CPU_X86_TSC_H */ diff --git a/src/include/timestamp.h b/src/include/timestamp.h index 54d69ce..be33b0a 100644 --- a/src/include/timestamp.h +++ b/src/include/timestamp.h @@ -29,7 +29,8 @@ struct timestamp_entry { struct timestamp_table { uint64_t base_time; - uint32_t max_entries; + uint16_t max_entries; + uint16_t tick_freq_mhz; uint32_t num_entries; struct timestamp_entry entries[0]; /* Variable number of entries */ } __attribute__((packed)); @@ -114,5 +115,7 @@ void timestamp_add_now(enum timestamp_id id); /* Implemented by the architecture code */ uint64_t timestamp_get(void); uint64_t get_initial_timestamp(void); +/* Returns timestamp tick frequency in MHz. */ +int timestamp_tick_freq_mhz(void); #endif diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index ca25093..21b3d29 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -278,6 +278,10 @@ static void timestamp_sync_cache_to_cbmem(int is_recovery) if (ts_cbmem_table->base_time == 0) ts_cbmem_table->base_time = ts_cache_table->base_time; + /* Seed the timestamp tick frequency in ramstage. */ + if (ENV_RAMSTAGE) + ts_cbmem_table->tick_freq_mhz = timestamp_tick_freq_mhz(); + /* Cache no longer required. */ ts_cache_table->num_entries = 0; ts_cache->cache_state = TIMESTAMP_CACHE_NOT_NEEDED; @@ -299,3 +303,9 @@ uint64_t __attribute__((weak)) timestamp_get(void) return mono_time_diff_microseconds(&t1, &t2); } + +/* Like timestamp_get() above this matches up with microsecond granularity. */ +int __attribute__((weak)) timestamp_tick_freq_mhz(void) +{ + return 1; +} diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 6526384..0e2f125 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -304,7 +304,7 @@ static int parse_cbtable(u64 address, size_t table_size) * read CPU frequency from a sysfs file, return an frequency in Kilohertz as * an int or exit on any error. */ -static u64 get_cpu_freq_KHz(void) +static unsigned long arch_tick_frequency(void) { FILE *cpuf; char freqs[100]; @@ -338,44 +338,49 @@ static u64 get_cpu_freq_KHz(void) freqs, freq_file); exit(1); } - -/* On x86 platforms timestamps are stored - * in CPU cycles (from rdtsc). Hence the - * timestamp divider is the CPU frequency - * in MHz. - */ -u64 arch_convert_raw_ts_entry(u64 ts) -{ - static u64 cpu_freq_mhz = 0; - - if (!cpu_freq_mhz) - cpu_freq_mhz = get_cpu_freq_KHz() / 1000; - - return ts / cpu_freq_mhz; -} - #elif defined(__OpenBSD__) && (defined(__i386__) || defined(__x86_64__)) -u64 arch_convert_raw_ts_entry(u64 ts) +static unsigned long arch_tick_frequency(void) { int mib[2] = { CTL_HW, HW_CPUSPEED }; static int value = 0; size_t value_len = sizeof(value); + /* Return 1 MHz when sysctl fails. */ if ((value == 0) && (sysctl(mib, 2, &value, &value_len, NULL, 0) == -1)) - return ts; + return 1; - return ts / value; + return value; } #else +static unsigned long arch_tick_frequency(void) +{ + /* 1 MHz = 1us. */ + return 1; +} +#endif + +static unsigned long tick_freq_mhz; + +static void timestamp_set_tick_freq(unsigned long table_tick_freq_mhz) +{ + tick_freq_mhz = table_tick_freq_mhz; + + /* Honor table frequency. */ + if (tick_freq_mhz) + return; + + tick_freq_mhz = arch_tick_frequency(); + + if (!tick_freq_mhz) { + fprintf(stderr, "Cannot determine timestamp tick frequency.\n"); + exit(1); + } +} -/* On non-x86 platforms the timestamp entries - * are not in clock cycles but in usecs - */ u64 arch_convert_raw_ts_entry(u64 ts) { - return ts; + return ts / tick_freq_mhz; } -#endif /* * Print an integer in 'normalized' form - with commas separating every three @@ -521,6 +526,8 @@ static void dump_timestamps(void) size = sizeof(*tst_p); tst_p = map_memory_size((unsigned long)timestamps.cbmem_addr, size); + timestamp_set_tick_freq(tst_p->tick_freq_mhz); + printf("%d entries total:\n\n", tst_p->num_entries); size += tst_p->num_entries * sizeof(tst_p->entries[0]);

1 0

Patch set updated for coreboot: util/cbmem: add -T option for machine parseable timestamps
by Aaron Durbin Aug. 30, 2015

Aug. 30, 2015

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11471 -gerrit commit b80dd1490a2bf7a9cfb27d0753554b487bc83316 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sun Aug 30 22:00:12 2015 -0500 util/cbmem: add -T option for machine parseable timestamps In order to make analysis easier provide an option (-T) to print timestamps in a parseable format: ID<tab>raw timestamp<tab>time from previous entry<tab>description BUG=chrome-os-partner:44669 BRANCH=firmware-strago-7287.B TEST=Built and tested on glados. Used the following script: cbmem -T | awk 'BEGIN { FS="\t" } { tot += $3 } END { print tot }' Change-Id: I06dc0487d1462b6a78924130f0ad74b0d787d3f8 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- util/cbmem/cbmem.c | 79 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 0e2f125..afb83f5 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -481,19 +481,42 @@ static const struct timestamp_id_to_name { { TS_FSP_AFTER_FINALIZE, "returning from FspNotify(ReadyToBoot)" } }; -uint64_t timestamp_print_entry(uint32_t id, uint64_t stamp, uint64_t prev_stamp) +static const char *timestamp_name(uint32_t id) { int i; - const char *name; - uint64_t step_time; - name = "<unknown>"; for (i = 0; i < ARRAY_SIZE(timestamp_ids); i++) { - if (timestamp_ids[i].id == id) { - name = timestamp_ids[i].name; - break; - } + if (timestamp_ids[i].id == id) + return timestamp_ids[i].name; } + return "<unknown>"; +} + +static uint64_t timestamp_print_parseable_entry(uint32_t id, uint64_t stamp, + uint64_t prev_stamp) +{ + const char *name; + uint64_t step_time; + + name = timestamp_name(id); + + step_time = arch_convert_raw_ts_entry(stamp - prev_stamp); + + /* ID<tab>absolute time<tab>relative time<tab>description */ + printf("%d\t", id); + printf("%llu\t", (long long)arch_convert_raw_ts_entry(stamp)); + printf("%llu\t", (long long)step_time); + printf("%s\n", name); + + return step_time; +} + +uint64_t timestamp_print_entry(uint32_t id, uint64_t stamp, uint64_t prev_stamp) +{ + const char *name; + uint64_t step_time; + + name = timestamp_name(id); printf("%4d:", id); printf("%-50s", name); @@ -510,7 +533,7 @@ uint64_t timestamp_print_entry(uint32_t id, uint64_t stamp, uint64_t prev_stamp) } /* dump the timestamp table */ -static void dump_timestamps(void) +static void dump_timestamps(int mach_readable) { int i; struct timestamp_table *tst_p; @@ -528,7 +551,8 @@ static void dump_timestamps(void) timestamp_set_tick_freq(tst_p->tick_freq_mhz); - printf("%d entries total:\n\n", tst_p->num_entries); + if (!mach_readable) + printf("%d entries total:\n\n", tst_p->num_entries); size += tst_p->num_entries * sizeof(tst_p->entries[0]); unmap_memory(); @@ -536,7 +560,11 @@ static void dump_timestamps(void) /* Report the base time within the table. */ prev_stamp = 0; - timestamp_print_entry(0, tst_p->base_time, prev_stamp); + if (mach_readable) + timestamp_print_parseable_entry(0, tst_p->base_time, + prev_stamp); + else + timestamp_print_entry(0, tst_p->base_time, prev_stamp); prev_stamp = tst_p->base_time; total_time = 0; @@ -546,14 +574,21 @@ static void dump_timestamps(void) /* Make all timestamps absolute. */ stamp = tse->entry_stamp + tst_p->base_time; - total_time += timestamp_print_entry(tse->entry_id, + if (mach_readable) + total_time += + timestamp_print_parseable_entry(tse->entry_id, + stamp, prev_stamp); + else + total_time += timestamp_print_entry(tse->entry_id, stamp, prev_stamp); prev_stamp = stamp; } - printf("\nTotal Time: "); - print_norm(total_time); - printf("\n"); + if (!mach_readable) { + printf("\nTotal Time: "); + print_norm(total_time); + printf("\n"); + } unmap_memory(); } @@ -918,13 +953,14 @@ static void print_version(void) static void print_usage(const char *name) { - printf("usage: %s [-cCltxVvh?]\n", name); + printf("usage: %s [-cCltTxVvh?]\n", name); printf("\n" " -c | --console: print cbmem console\n" " -C | --coverage: dump coverage information\n" " -l | --list: print cbmem table of contents\n" " -x | --hexdump: print hexdump of cbmem area\n" " -t | --timestamps: print timestamp information\n" + " -T | --parseable-timestamps: print parseable timestamps\n" " -V | --verbose: verbose (debugging) output\n" " -v | --version: print the version\n" " -h | --help: print this help\n" @@ -1055,6 +1091,7 @@ int main(int argc, char** argv) int print_list = 0; int print_hexdump = 0; int print_timestamps = 0; + int machine_readable_timestamps = 0; int opt, option_index = 0; static struct option long_options[] = { @@ -1062,13 +1099,14 @@ int main(int argc, char** argv) {"coverage", 0, 0, 'C'}, {"list", 0, 0, 'l'}, {"timestamps", 0, 0, 't'}, + {"parseable-timestamps", 0, 0, 'T'}, {"hexdump", 0, 0, 'x'}, {"verbose", 0, 0, 'V'}, {"version", 0, 0, 'v'}, {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "cCltxVvh?", + while ((opt = getopt_long(argc, argv, "cCltTxVvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'c': @@ -1091,6 +1129,11 @@ int main(int argc, char** argv) print_timestamps = 1; print_defaults = 0; break; + case 'T': + print_timestamps = 1; + machine_readable_timestamps = 1; + print_defaults = 0; + break; case 'V': verbose = 1; break; @@ -1190,7 +1233,7 @@ int main(int argc, char** argv) dump_cbmem_hex(); if (print_defaults || print_timestamps) - dump_timestamps(); + dump_timestamps(machine_readable_timestamps); close(mem_fd); return 0;

1 0

New patch to review for coreboot: buildgcc: Show the exit status of wget if downloading fails.
by Zheng Bao Aug. 30, 2015

Aug. 30, 2015

Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11472 -gerrit commit 77bace3bc92f5f4af81b2560d1632206c06019d5 Author: zbao <fishbaozi(a)gmail.com> Date: Sun Aug 30 23:35:16 2015 -0400 buildgcc: Show the exit status of wget if downloading fails. Change-Id: Ie3a44c6db9c9c186c52b4743334266ec5411ba8a Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com> --- util/crossgcc/buildgcc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index f4522ed..49e41e5 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -193,16 +193,20 @@ download() { FILE=$(basename $archive) printf " * $FILE " - test -f tarballs/$FILE && check_sum $FILE && printf "(cached)" || ( + if test -f tarballs/$FILE && check_sum $FILE ; then + printf "(cached)" + else printf "(downloading from $archive)" rm -f tarballs/$FILE cd tarballs wget --no-check-certificate -q $archive + wgetret=$? cd .. compute_sum $FILE - ) + fi + if [ ! -f tarballs/$FILE ]; then - printf "\n${RED}Failed to download $FILE.${NC}\n" + printf "\n${RED}Failed to download $FILE. Wget returns $wgetret. See 'man wget'.${NC}\n" exit 1 fi printf "\n"

1 0

Patch set updated for coreboot: armv7/arm64: remove timestamp.c
by Aaron Durbin Aug. 30, 2015

Aug. 30, 2015

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11468 -gerrit commit 1c0ef23336f77161d7726c9cb8b984eb4ff4a0e4 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sun Aug 30 15:41:54 2015 -0500 armv7/arm64: remove timestamp.c The src/lib/timestamp.c already has an implementation using timer_monotonic_get() for timestamp_get(). Use that instead of duplicating the logic. BUG=chrome-os-partner:44669 BRANCH=None TEST=None Change-Id: If17be86143f217445bd64d67ceee4355fa482d39 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/arch/arm/armv7/Makefile.inc | 6 ------ src/arch/arm/armv7/timestamp.c | 28 ---------------------------- src/arch/arm64/Makefile.inc | 5 ----- src/arch/arm64/timestamp.c | 28 ---------------------------- 4 files changed, 67 deletions(-) diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc index a46ef87..089ef79 100644 --- a/src/arch/arm/armv7/Makefile.inc +++ b/src/arch/arm/armv7/Makefile.inc @@ -59,8 +59,6 @@ bootblock-y += cache_m.c endif # CONFIG_ARCH_BOOTBLOCK_ARMV7 -bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c - ################################################################################ ## verification stage ################################################################################ @@ -85,8 +83,6 @@ verstage-S-ccopts += $(armv7-m_asm_flags) endif # CONFIG_ARCH_VERSTAGE_ARMV7_M -verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c - ################################################################################ ## ROM stage ################################################################################ @@ -96,7 +92,6 @@ romstage-y += cpu.S romstage-y += exception.c romstage-y += exception_asm.S romstage-y += mmu.c -romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-c-ccopts += $(armv7-a_flags) romstage-S-ccopts += $(armv7-a_asm_flags) @@ -117,7 +112,6 @@ ramstage-y += cpu.S ramstage-y += exception.c ramstage-y += exception_asm.S ramstage-y += mmu.c -ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c ramstage-c-ccopts += $(armv7-a_flags) ramstage-S-ccopts += $(armv7-a_asm_flags) diff --git a/src/arch/arm/armv7/timestamp.c b/src/arch/arm/armv7/timestamp.c deleted file mode 100644 index 1b3138f..0000000 --- a/src/arch/arm/armv7/timestamp.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2013 Google Inc. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc. - */ - -#include <timestamp.h> -#include <timer.h> - -uint64_t timestamp_get(void) -{ - struct mono_time timestamp; - timer_monotonic_get(&timestamp); - return (uint64_t)timestamp.microseconds; -} diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index 3e14f8b..a625c7a 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -64,7 +64,6 @@ bootblock-y += cpu-stubs.c bootblock-y += stages.c bootblock-y += eabi_compat.c bootblock-y += transition.c transition_asm.S -bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c bootblock-y += memset.S bootblock-y += memcpy.S @@ -95,7 +94,6 @@ verstage-y += ../../lib/memset.c verstage-y += ../../lib/memcpy.c verstage-y += ../../lib/memmove.c verstage-y += stages.c -verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c endif # CONFIG_ARCH_VERSTAGE_ARM64 @@ -115,7 +113,6 @@ romstage-y += eabi_compat.c romstage-y += memset.S romstage-y += memcpy.S romstage-y += memmove.S -romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-y += transition.c transition_asm.S rmodules_arm64-y += memset.S @@ -169,8 +166,6 @@ secmon-y += memset.S secmon-y += memmove.S secmon-y += memcpy.S -ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c - ramstage-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard.c) # Build the ramstage diff --git a/src/arch/arm64/timestamp.c b/src/arch/arm64/timestamp.c deleted file mode 100644 index 2962c7f..0000000 --- a/src/arch/arm64/timestamp.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc. - */ - -#include <timestamp.h> -#include <timer.h> - -uint64_t timestamp_get(void) -{ - struct mono_time timestamp; - timer_monotonic_get(&timestamp); - return (uint64_t)timestamp.microseconds; -}

1 0

Patch set updated for coreboot: imgtec/pistachio: remove timestamp_get() implementation
by Aaron Durbin Aug. 30, 2015

Aug. 30, 2015

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11469 -gerrit commit 2075cabb576153287e1ad785d0df7ec796017fb8 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sun Aug 30 16:04:13 2015 -0500 imgtec/pistachio: remove timestamp_get() implementation As pistachio already provides timer_monotonic_get() let the generic timestamp_get() use that instead of having around another implementation of timestamp_get(). BUG=chrome-os-partner:44669 BRANCH=None TEST=None Change-Id: Iaa6db49f0055b7c2ef116f41453f838093e516e0 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/soc/imgtec/pistachio/monotonic_timer.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/soc/imgtec/pistachio/monotonic_timer.c b/src/soc/imgtec/pistachio/monotonic_timer.c index 4f3aba9..0d74ae5 100644 --- a/src/soc/imgtec/pistachio/monotonic_timer.c +++ b/src/soc/imgtec/pistachio/monotonic_timer.c @@ -53,10 +53,5 @@ static int get_count_mhz_freq(void) void timer_monotonic_get(struct mono_time *mt) { - mt->microseconds = (long)timestamp_get(); -} - -uint64_t timestamp_get(void) -{ - return read_c0_count()/get_count_mhz_freq(); + mono_time_set_usecs(mt, read_c0_count() / get_count_mhz_freq()); }

1 0

Patch set updated for coreboot: timestamp: add tick frequency to exported table
by Aaron Durbin Aug. 30, 2015

Aug. 30, 2015

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11470 -gerrit commit cbc16c1875d011ea5501cd7f0840253ec697ebd8 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sun Aug 30 21:19:55 2015 -0500 timestamp: add tick frequency to exported table Add the timestamp tick frequency within the timestamp table so the cbmem utility doesn't try to figure it out on its own. Those paths still exist for x86 systems which don't provide tsc_freq_mhz(). All other non-x86 systems use the monotonic timer which has a 1us granularity or 1MHz. One of the main reasons is that Linux is reporting /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq as the true turbo frequency on turbo enables machines. This change also fixes the p-state values honored in cpufreq for turbo machines in that turbo p-pstates were reported as 100MHz greater than nominal. BUG=chrome-os-partner:44669 BRANCH=firmware-strago-7287.B TEST=Built and booted on glados. Confirmed table frequency honored. Change-Id: I763fe2d9a7b01d0ef5556e5abff36032062f5801 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/arch/x86/timestamp.c | 13 +++++++++++ src/include/cpu/x86/tsc.h | 3 +-- src/include/timestamp.h | 5 ++++- src/lib/timestamp.c | 10 +++++++++ util/cbmem/cbmem.c | 57 ++++++++++++++++++++++++++--------------------- 5 files changed, 60 insertions(+), 28 deletions(-) diff --git a/src/arch/x86/timestamp.c b/src/arch/x86/timestamp.c index 9df505a..d308146 100644 --- a/src/arch/x86/timestamp.c +++ b/src/arch/x86/timestamp.c @@ -24,3 +24,16 @@ uint64_t timestamp_get(void) { return rdtscll(); } + +unsigned long __attribute__((weak)) tsc_freq_mhz(void) +{ + /* Default to not knowing TSC frequency. cbmem will have to fallback + * on trying to determine it in userspace. */ + return 0; +} + +int timestamp_tick_freq_mhz(void) +{ + /* Chipsets that have a constant TSC provide this value correctly. */ + return tsc_freq_mhz(); +} diff --git a/src/include/cpu/x86/tsc.h b/src/include/cpu/x86/tsc.h index 71d253b..5cf4644 100644 --- a/src/include/cpu/x86/tsc.h +++ b/src/include/cpu/x86/tsc.h @@ -60,8 +60,7 @@ static inline uint64_t tsc_to_uint64(tsc_t tstamp) } #endif -#if CONFIG_TSC_CONSTANT_RATE +/* Provided by CPU/chipset code for the TSC rate in MHz. */ unsigned long tsc_freq_mhz(void); -#endif #endif /* CPU_X86_TSC_H */ diff --git a/src/include/timestamp.h b/src/include/timestamp.h index 54d69ce..be33b0a 100644 --- a/src/include/timestamp.h +++ b/src/include/timestamp.h @@ -29,7 +29,8 @@ struct timestamp_entry { struct timestamp_table { uint64_t base_time; - uint32_t max_entries; + uint16_t max_entries; + uint16_t tick_freq_mhz; uint32_t num_entries; struct timestamp_entry entries[0]; /* Variable number of entries */ } __attribute__((packed)); @@ -114,5 +115,7 @@ void timestamp_add_now(enum timestamp_id id); /* Implemented by the architecture code */ uint64_t timestamp_get(void); uint64_t get_initial_timestamp(void); +/* Returns timestamp tick frequency in MHz. */ +int timestamp_tick_freq_mhz(void); #endif diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index ca25093..21b3d29 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -278,6 +278,10 @@ static void timestamp_sync_cache_to_cbmem(int is_recovery) if (ts_cbmem_table->base_time == 0) ts_cbmem_table->base_time = ts_cache_table->base_time; + /* Seed the timestamp tick frequency in ramstage. */ + if (ENV_RAMSTAGE) + ts_cbmem_table->tick_freq_mhz = timestamp_tick_freq_mhz(); + /* Cache no longer required. */ ts_cache_table->num_entries = 0; ts_cache->cache_state = TIMESTAMP_CACHE_NOT_NEEDED; @@ -299,3 +303,9 @@ uint64_t __attribute__((weak)) timestamp_get(void) return mono_time_diff_microseconds(&t1, &t2); } + +/* Like timestamp_get() above this matches up with microsecond granularity. */ +int __attribute__((weak)) timestamp_tick_freq_mhz(void) +{ + return 1; +} diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 6526384..4f3dd1f 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -304,7 +304,7 @@ static int parse_cbtable(u64 address, size_t table_size) * read CPU frequency from a sysfs file, return an frequency in Kilohertz as * an int or exit on any error. */ -static u64 get_cpu_freq_KHz(void) +static unsigned long arch_tick_frquency(void) { FILE *cpuf; char freqs[100]; @@ -338,44 +338,49 @@ static u64 get_cpu_freq_KHz(void) freqs, freq_file); exit(1); } - -/* On x86 platforms timestamps are stored - * in CPU cycles (from rdtsc). Hence the - * timestamp divider is the CPU frequency - * in MHz. - */ -u64 arch_convert_raw_ts_entry(u64 ts) -{ - static u64 cpu_freq_mhz = 0; - - if (!cpu_freq_mhz) - cpu_freq_mhz = get_cpu_freq_KHz() / 1000; - - return ts / cpu_freq_mhz; -} - #elif defined(__OpenBSD__) && (defined(__i386__) || defined(__x86_64__)) -u64 arch_convert_raw_ts_entry(u64 ts) +static unsigned long arch_tick_frquency(void) { int mib[2] = { CTL_HW, HW_CPUSPEED }; static int value = 0; size_t value_len = sizeof(value); + /* Return 1 MHz when sysctl fails. */ if ((value == 0) && (sysctl(mib, 2, &value, &value_len, NULL, 0) == -1)) - return ts; + return 1; - return ts / value; + return value; } #else +static unsigned long arch_tick_frquency(void) +{ + /* 1 MHz = 1us. */ + return 1; +} +#endif + +static unsigned long tick_freq_mhz; + +static void timestamp_set_tick_freq(unsigned long table_tick_freq_mhz) +{ + tick_freq_mhz = table_tick_freq_mhz; + + /* Honor table frequency. */ + if (tick_freq_mhz) + return; + + tick_freq_mhz = arch_tick_frquency(); + + if (!tick_freq_mhz) { + fprintf(stderr, "Cannot determine timestamp tick frequency.\n"); + exit(1); + } +} -/* On non-x86 platforms the timestamp entries - * are not in clock cycles but in usecs - */ u64 arch_convert_raw_ts_entry(u64 ts) { - return ts; + return ts / tick_freq_mhz; } -#endif /* * Print an integer in 'normalized' form - with commas separating every three @@ -521,6 +526,8 @@ static void dump_timestamps(void) size = sizeof(*tst_p); tst_p = map_memory_size((unsigned long)timestamps.cbmem_addr, size); + timestamp_set_tick_freq(tst_p->tick_freq_mhz); + printf("%d entries total:\n\n", tst_p->num_entries); size += tst_p->num_entries * sizeof(tst_p->entries[0]);

1 0

Patch set updated for coreboot: util/cbmem: add -T option for machine parseable timestamps
by Aaron Durbin Aug. 30, 2015

Aug. 30, 2015

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11471 -gerrit commit 0ad600fac1d73ea25699e7b93083a69e148d43ae Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sun Aug 30 22:00:12 2015 -0500 util/cbmem: add -T option for machine parseable timestamps In order to make analysis easier provide an option (-T) to print timestamps in a parseable format: ID<tab>raw timestamp<tab>time from previous entry<tab>description BUG=chrome-os-partner:44669 BRANCH=firmware-strago-7287.B TEST=Built and tested on glados. Used the following script: cbmem -T | awk 'BEGIN { FS="\t" } { tot += $3 } END { print tot }' Change-Id: I06dc0487d1462b6a78924130f0ad74b0d787d3f8 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- util/cbmem/cbmem.c | 79 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 4f3dd1f..3f89278 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -481,19 +481,42 @@ static const struct timestamp_id_to_name { { TS_FSP_AFTER_FINALIZE, "returning from FspNotify(ReadyToBoot)" } }; -uint64_t timestamp_print_entry(uint32_t id, uint64_t stamp, uint64_t prev_stamp) +static const char *timestamp_name(uint32_t id) { int i; - const char *name; - uint64_t step_time; - name = "<unknown>"; for (i = 0; i < ARRAY_SIZE(timestamp_ids); i++) { - if (timestamp_ids[i].id == id) { - name = timestamp_ids[i].name; - break; - } + if (timestamp_ids[i].id == id) + return timestamp_ids[i].name; } + return "<unknown>"; +} + +static uint64_t timestamp_print_parseable_entry(uint32_t id, uint64_t stamp, + uint64_t prev_stamp) +{ + const char *name; + uint64_t step_time; + + name = timestamp_name(id); + + step_time = arch_convert_raw_ts_entry(stamp - prev_stamp); + + /* ID<tab>absolute time<tab>relative time<tab>description */ + printf("%d\t", id); + printf("%llu\t", (long long)arch_convert_raw_ts_entry(stamp)); + printf("%llu\t", (long long)step_time); + printf("%s\n", name); + + return step_time; +} + +uint64_t timestamp_print_entry(uint32_t id, uint64_t stamp, uint64_t prev_stamp) +{ + const char *name; + uint64_t step_time; + + name = timestamp_name(id); printf("%4d:", id); printf("%-50s", name); @@ -510,7 +533,7 @@ uint64_t timestamp_print_entry(uint32_t id, uint64_t stamp, uint64_t prev_stamp) } /* dump the timestamp table */ -static void dump_timestamps(void) +static void dump_timestamps(int mach_readable) { int i; struct timestamp_table *tst_p; @@ -528,7 +551,8 @@ static void dump_timestamps(void) timestamp_set_tick_freq(tst_p->tick_freq_mhz); - printf("%d entries total:\n\n", tst_p->num_entries); + if (!mach_readable) + printf("%d entries total:\n\n", tst_p->num_entries); size += tst_p->num_entries * sizeof(tst_p->entries[0]); unmap_memory(); @@ -536,7 +560,11 @@ static void dump_timestamps(void) /* Report the base time within the table. */ prev_stamp = 0; - timestamp_print_entry(0, tst_p->base_time, prev_stamp); + if (mach_readable) + timestamp_print_parseable_entry(0, tst_p->base_time, + prev_stamp); + else + timestamp_print_entry(0, tst_p->base_time, prev_stamp); prev_stamp = tst_p->base_time; total_time = 0; @@ -546,14 +574,21 @@ static void dump_timestamps(void) /* Make all timestamps absolute. */ stamp = tse->entry_stamp + tst_p->base_time; - total_time += timestamp_print_entry(tse->entry_id, + if (mach_readable) + total_time += + timestamp_print_parseable_entry(tse->entry_id, + stamp, prev_stamp); + else + total_time += timestamp_print_entry(tse->entry_id, stamp, prev_stamp); prev_stamp = stamp; } - printf("\nTotal Time: "); - print_norm(total_time); - printf("\n"); + if (!mach_readable) { + printf("\nTotal Time: "); + print_norm(total_time); + printf("\n"); + } unmap_memory(); } @@ -918,13 +953,14 @@ static void print_version(void) static void print_usage(const char *name) { - printf("usage: %s [-cCltxVvh?]\n", name); + printf("usage: %s [-cCltTxVvh?]\n", name); printf("\n" " -c | --console: print cbmem console\n" " -C | --coverage: dump coverage information\n" " -l | --list: print cbmem table of contents\n" " -x | --hexdump: print hexdump of cbmem area\n" " -t | --timestamps: print timestamp information\n" + " -T | --parseable-timestamps: print parseable timestamps\n" " -V | --verbose: verbose (debugging) output\n" " -v | --version: print the version\n" " -h | --help: print this help\n" @@ -1055,6 +1091,7 @@ int main(int argc, char** argv) int print_list = 0; int print_hexdump = 0; int print_timestamps = 0; + int machine_readable_timestamps = 0; int opt, option_index = 0; static struct option long_options[] = { @@ -1062,13 +1099,14 @@ int main(int argc, char** argv) {"coverage", 0, 0, 'C'}, {"list", 0, 0, 'l'}, {"timestamps", 0, 0, 't'}, + {"parseable-timestamps", 0, 0, 'T'}, {"hexdump", 0, 0, 'x'}, {"verbose", 0, 0, 'V'}, {"version", 0, 0, 'v'}, {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "cCltxVvh?", + while ((opt = getopt_long(argc, argv, "cCltTxVvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'c': @@ -1091,6 +1129,11 @@ int main(int argc, char** argv) print_timestamps = 1; print_defaults = 0; break; + case 'T': + print_timestamps = 1; + machine_readable_timestamps = 1; + print_defaults = 0; + break; case 'V': verbose = 1; break; @@ -1190,7 +1233,7 @@ int main(int argc, char** argv) dump_cbmem_hex(); if (print_defaults || print_timestamps) - dump_timestamps(); + dump_timestamps(machine_readable_timestamps); close(mem_fd); return 0;

1 0

Patch set updated for coreboot: timestamp: add tick frequency to exported table
by Aaron Durbin Aug. 30, 2015

Aug. 30, 2015

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11470 -gerrit commit 3a405064552db36dc66dfe8c31ba0e160c9fd34e Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sun Aug 30 21:19:55 2015 -0500 timestamp: add tick frequency to exported table Add the timestamp tick frequency within the timestamp table so the cbmem utility doesn't try to figure it out on its own. Those paths still exist for x86 systems which don't provide tsc_freq_mhz(). All other non-x86 systems use the monotonic timer which has a 1us granularity or 1MHz. One of the main reasons is that Linux is reporting /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq as the true turbo frequency on turbo enables machines. This change also fixes the p-state values honored in cpufreq for turbo machines in that turbo p-pstates were reported as 100MHz greater than nominal. BUG=chrome-os-partner:44669 BRANCH=firmware-strago-7287.B TEST=Built and booted on glados. Confirmed table frequency honored. Change-Id: I763fe2d9a7b01d0ef5556e5abff36032062f5801 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/arch/x86/timestamp.c | 13 +++++++++++ src/include/cpu/x86/tsc.h | 3 +-- src/include/timestamp.h | 5 ++++- src/lib/timestamp.c | 10 +++++++++ util/cbmem/cbmem.c | 57 ++++++++++++++++++++++++++--------------------- 5 files changed, 60 insertions(+), 28 deletions(-) diff --git a/src/arch/x86/timestamp.c b/src/arch/x86/timestamp.c index 9df505a..d308146 100644 --- a/src/arch/x86/timestamp.c +++ b/src/arch/x86/timestamp.c @@ -24,3 +24,16 @@ uint64_t timestamp_get(void) { return rdtscll(); } + +unsigned long __attribute__((weak)) tsc_freq_mhz(void) +{ + /* Default to not knowing TSC frequency. cbmem will have to fallback + * on trying to determine it in userspace. */ + return 0; +} + +int timestamp_tick_freq_mhz(void) +{ + /* Chipsets that have a constant TSC provide this value correctly. */ + return tsc_freq_mhz(); +} diff --git a/src/include/cpu/x86/tsc.h b/src/include/cpu/x86/tsc.h index 71d253b..5cf4644 100644 --- a/src/include/cpu/x86/tsc.h +++ b/src/include/cpu/x86/tsc.h @@ -60,8 +60,7 @@ static inline uint64_t tsc_to_uint64(tsc_t tstamp) } #endif -#if CONFIG_TSC_CONSTANT_RATE +/* Provided by CPU/chipset code for the TSC rate in MHz. */ unsigned long tsc_freq_mhz(void); -#endif #endif /* CPU_X86_TSC_H */ diff --git a/src/include/timestamp.h b/src/include/timestamp.h index 54d69ce..be33b0a 100644 --- a/src/include/timestamp.h +++ b/src/include/timestamp.h @@ -29,7 +29,8 @@ struct timestamp_entry { struct timestamp_table { uint64_t base_time; - uint32_t max_entries; + uint16_t max_entries; + uint16_t tick_freq_mhz; uint32_t num_entries; struct timestamp_entry entries[0]; /* Variable number of entries */ } __attribute__((packed)); @@ -114,5 +115,7 @@ void timestamp_add_now(enum timestamp_id id); /* Implemented by the architecture code */ uint64_t timestamp_get(void); uint64_t get_initial_timestamp(void); +/* Returns timestamp tick frequency in MHz. */ +int timestamp_tick_freq_mhz(void); #endif diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index ca25093..21b3d29 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -278,6 +278,10 @@ static void timestamp_sync_cache_to_cbmem(int is_recovery) if (ts_cbmem_table->base_time == 0) ts_cbmem_table->base_time = ts_cache_table->base_time; + /* Seed the timestamp tick frequency in ramstage. */ + if (ENV_RAMSTAGE) + ts_cbmem_table->tick_freq_mhz = timestamp_tick_freq_mhz(); + /* Cache no longer required. */ ts_cache_table->num_entries = 0; ts_cache->cache_state = TIMESTAMP_CACHE_NOT_NEEDED; @@ -299,3 +303,9 @@ uint64_t __attribute__((weak)) timestamp_get(void) return mono_time_diff_microseconds(&t1, &t2); } + +/* Like timestamp_get() above this matches up with microsecond granularity. */ +int __attribute__((weak)) timestamp_tick_freq_mhz(void) +{ + return 1; +} diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 6526384..4f3dd1f 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -304,7 +304,7 @@ static int parse_cbtable(u64 address, size_t table_size) * read CPU frequency from a sysfs file, return an frequency in Kilohertz as * an int or exit on any error. */ -static u64 get_cpu_freq_KHz(void) +static unsigned long arch_tick_frquency(void) { FILE *cpuf; char freqs[100]; @@ -338,44 +338,49 @@ static u64 get_cpu_freq_KHz(void) freqs, freq_file); exit(1); } - -/* On x86 platforms timestamps are stored - * in CPU cycles (from rdtsc). Hence the - * timestamp divider is the CPU frequency - * in MHz. - */ -u64 arch_convert_raw_ts_entry(u64 ts) -{ - static u64 cpu_freq_mhz = 0; - - if (!cpu_freq_mhz) - cpu_freq_mhz = get_cpu_freq_KHz() / 1000; - - return ts / cpu_freq_mhz; -} - #elif defined(__OpenBSD__) && (defined(__i386__) || defined(__x86_64__)) -u64 arch_convert_raw_ts_entry(u64 ts) +static unsigned long arch_tick_frquency(void) { int mib[2] = { CTL_HW, HW_CPUSPEED }; static int value = 0; size_t value_len = sizeof(value); + /* Return 1 MHz when sysctl fails. */ if ((value == 0) && (sysctl(mib, 2, &value, &value_len, NULL, 0) == -1)) - return ts; + return 1; - return ts / value; + return value; } #else +static unsigned long arch_tick_frquency(void) +{ + /* 1 MHz = 1us. */ + return 1; +} +#endif + +static unsigned long tick_freq_mhz; + +static void timestamp_set_tick_freq(unsigned long table_tick_freq_mhz) +{ + tick_freq_mhz = table_tick_freq_mhz; + + /* Honor table frequency. */ + if (tick_freq_mhz) + return; + + tick_freq_mhz = arch_tick_frquency(); + + if (!tick_freq_mhz) { + fprintf(stderr, "Cannot determine timestamp tick frequency.\n"); + exit(1); + } +} -/* On non-x86 platforms the timestamp entries - * are not in clock cycles but in usecs - */ u64 arch_convert_raw_ts_entry(u64 ts) { - return ts; + return ts / tick_freq_mhz; } -#endif /* * Print an integer in 'normalized' form - with commas separating every three @@ -521,6 +526,8 @@ static void dump_timestamps(void) size = sizeof(*tst_p); tst_p = map_memory_size((unsigned long)timestamps.cbmem_addr, size); + timestamp_set_tick_freq(tst_p->tick_freq_mhz); + printf("%d entries total:\n\n", tst_p->num_entries); size += tst_p->num_entries * sizeof(tst_p->entries[0]);

1 0

Patch set updated for coreboot: imgtec/pistachio: remove timestamp_get() implementation
by Aaron Durbin Aug. 30, 2015

Aug. 30, 2015

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11469 -gerrit commit a4c8868a2e4453e3263ed7cad8caa1f625e5d169 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sun Aug 30 16:04:13 2015 -0500 imgtec/pistachio: remove timestamp_get() implementation As pistachio already provides timer_monotonic_get() let the generic timestamp_get() use that instead of having around another implementation of timestamp_get(). BUG=chrome-os-partner:44669 BRANCH=None TEST=None Change-Id: Iaa6db49f0055b7c2ef116f41453f838093e516e0 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/soc/imgtec/pistachio/monotonic_timer.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/soc/imgtec/pistachio/monotonic_timer.c b/src/soc/imgtec/pistachio/monotonic_timer.c index 4f3aba9..0d74ae5 100644 --- a/src/soc/imgtec/pistachio/monotonic_timer.c +++ b/src/soc/imgtec/pistachio/monotonic_timer.c @@ -53,10 +53,5 @@ static int get_count_mhz_freq(void) void timer_monotonic_get(struct mono_time *mt) { - mt->microseconds = (long)timestamp_get(); -} - -uint64_t timestamp_get(void) -{ - return read_c0_count()/get_count_mhz_freq(); + mono_time_set_usecs(mt, read_c0_count() / get_count_mhz_freq()); }

1 0

Patch set updated for coreboot: util/cbmem: add -T option for machine parseable timestamps
by Aaron Durbin Aug. 30, 2015

Aug. 30, 2015

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11471 -gerrit commit e195102fe6ee2ed0a2263752b504fac75b503143 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sun Aug 30 22:00:12 2015 -0500 util/cbmem: add -T option for machine parseable timestamps In order to make analysis easier provide an option (-T) to print timestamps in a parseable format: ID<tab>raw timestamp<tab>time from previous entry<tab>description BUG=chrome-os-partner:44669 BRANCH=firmware-strago-7287.B TEST=Built and tested on glados. Used the following script: cbmem -T | awk 'BEGIN { FS="\t" } { tot += $3 } END { print tot }' Change-Id: I06dc0487d1462b6a78924130f0ad74b0d787d3f8 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- util/cbmem/cbmem.c | 79 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 6526384..3695d54 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -476,19 +476,42 @@ static const struct timestamp_id_to_name { { TS_FSP_AFTER_FINALIZE, "returning from FspNotify(ReadyToBoot)" } }; -uint64_t timestamp_print_entry(uint32_t id, uint64_t stamp, uint64_t prev_stamp) +static const char *timestamp_name(uint32_t id) { int i; - const char *name; - uint64_t step_time; - name = "<unknown>"; for (i = 0; i < ARRAY_SIZE(timestamp_ids); i++) { - if (timestamp_ids[i].id == id) { - name = timestamp_ids[i].name; - break; - } + if (timestamp_ids[i].id == id) + return timestamp_ids[i].name; } + return "<unknown>"; +} + +static uint64_t timestamp_print_parseable_entry(uint32_t id, uint64_t stamp, + uint64_t prev_stamp) +{ + const char *name; + uint64_t step_time; + + name = timestamp_name(id); + + step_time = arch_convert_raw_ts_entry(stamp - prev_stamp); + + /* ID<tab>absolute time<tab>relative time<tab>description */ + printf("%d\t", id); + printf("%llu\t", (long long)arch_convert_raw_ts_entry(stamp)); + printf("%llu\t", (long long)step_time); + printf("%s\n", name); + + return step_time; +} + +uint64_t timestamp_print_entry(uint32_t id, uint64_t stamp, uint64_t prev_stamp) +{ + const char *name; + uint64_t step_time; + + name = timestamp_name(id); printf("%4d:", id); printf("%-50s", name); @@ -505,7 +528,7 @@ uint64_t timestamp_print_entry(uint32_t id, uint64_t stamp, uint64_t prev_stamp) } /* dump the timestamp table */ -static void dump_timestamps(void) +static void dump_timestamps(int mach_readable) { int i; struct timestamp_table *tst_p; @@ -521,7 +544,8 @@ static void dump_timestamps(void) size = sizeof(*tst_p); tst_p = map_memory_size((unsigned long)timestamps.cbmem_addr, size); - printf("%d entries total:\n\n", tst_p->num_entries); + if (!mach_readable) + printf("%d entries total:\n\n", tst_p->num_entries); size += tst_p->num_entries * sizeof(tst_p->entries[0]); unmap_memory(); @@ -529,7 +553,11 @@ static void dump_timestamps(void) /* Report the base time within the table. */ prev_stamp = 0; - timestamp_print_entry(0, tst_p->base_time, prev_stamp); + if (mach_readable) + timestamp_print_parseable_entry(0, tst_p->base_time, + prev_stamp); + else + timestamp_print_entry(0, tst_p->base_time, prev_stamp); prev_stamp = tst_p->base_time; total_time = 0; @@ -539,14 +567,21 @@ static void dump_timestamps(void) /* Make all timestamps absolute. */ stamp = tse->entry_stamp + tst_p->base_time; - total_time += timestamp_print_entry(tse->entry_id, + if (mach_readable) + total_time += + timestamp_print_parseable_entry(tse->entry_id, + stamp, prev_stamp); + else + total_time += timestamp_print_entry(tse->entry_id, stamp, prev_stamp); prev_stamp = stamp; } - printf("\nTotal Time: "); - print_norm(total_time); - printf("\n"); + if (!mach_readable) { + printf("\nTotal Time: "); + print_norm(total_time); + printf("\n"); + } unmap_memory(); } @@ -911,13 +946,14 @@ static void print_version(void) static void print_usage(const char *name) { - printf("usage: %s [-cCltxVvh?]\n", name); + printf("usage: %s [-cCltTxVvh?]\n", name); printf("\n" " -c | --console: print cbmem console\n" " -C | --coverage: dump coverage information\n" " -l | --list: print cbmem table of contents\n" " -x | --hexdump: print hexdump of cbmem area\n" " -t | --timestamps: print timestamp information\n" + " -T | --parseable-timestamps: print parseable timestamps\n" " -V | --verbose: verbose (debugging) output\n" " -v | --version: print the version\n" " -h | --help: print this help\n" @@ -1048,6 +1084,7 @@ int main(int argc, char** argv) int print_list = 0; int print_hexdump = 0; int print_timestamps = 0; + int machine_readable_timestamps = 0; int opt, option_index = 0; static struct option long_options[] = { @@ -1055,13 +1092,14 @@ int main(int argc, char** argv) {"coverage", 0, 0, 'C'}, {"list", 0, 0, 'l'}, {"timestamps", 0, 0, 't'}, + {"parseable-timestamps", 0, 0, 'T'}, {"hexdump", 0, 0, 'x'}, {"verbose", 0, 0, 'V'}, {"version", 0, 0, 'v'}, {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "cCltxVvh?", + while ((opt = getopt_long(argc, argv, "cCltTxVvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'c': @@ -1084,6 +1122,11 @@ int main(int argc, char** argv) print_timestamps = 1; print_defaults = 0; break; + case 'T': + print_timestamps = 1; + machine_readable_timestamps = 1; + print_defaults = 0; + break; case 'V': verbose = 1; break; @@ -1183,7 +1226,7 @@ int main(int argc, char** argv) dump_cbmem_hex(); if (print_defaults || print_timestamps) - dump_timestamps(); + dump_timestamps(machine_readable_timestamps); close(mem_fd); return 0;

1 0