coreboot January 2013

coreboot@coreboot.org

32 participants
607 discussions

New patch to review for coreboot: da023a4 cbmem utility: Find actual CBMEM area
by Stefan Reinauer 08 Jan '13

08 Jan '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2117 -gerrit commit da023a4f3c6a5bc89b1b0590fb8a28c4c67c0dbc Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Jan 7 16:26:10 2013 -0800 cbmem utility: Find actual CBMEM area without the need for a coreboot table entry for each of them. WIP. This will be used to extract code coverage data Change-Id: I2917710fb9d00c4533d81331a362bf0c40a30353 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbmem/cbmem.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 4c0bd68..269a29c 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -118,6 +118,7 @@ static void unmap_memory(void) static struct lb_cbmem_ref timestamps; static struct lb_cbmem_ref console; +static struct lb_memory_range cbmem; static int parse_cbtable(u64 address) { @@ -157,6 +158,22 @@ static int parse_cbtable(u64 address) lbr_p = (struct lb_record*) ((char *)lbtable + j); debug(" coreboot table entry 0x%02x\n", lbr_p->tag); switch (lbr_p->tag) { + case LB_TAG_MEMORY: { + int i = 0; + debug(" Found memory map.\n"); + struct lb_memory *memory = + (struct lb_memory *)lbr_p; + while ((char *)&memory->map[i] < ((char *)lbtable + + lbr_p->size)) { + if (memory->map[i].type == LB_MEM_TABLE) { + debug(" LB_MEM_TABLE found.\n"); + /* The last one found is CBMEM */ + cbmem = memory->map[i]; + } + i++; + } + continue; + } case LB_TAG_TIMESTAMPS: { debug("Found timestamp table\n"); timestamps = *(struct lb_cbmem_ref *) lbr_p; @@ -319,6 +336,39 @@ static void dump_console(void) unmap_memory(); } +#define CBMEM_MAGIC 0x434f5245 +#define MAX_CBMEM_ENTRIES 16 + +struct cbmem_entry { + uint32_t magic; + uint32_t id; + uint64_t base; + uint64_t size; +}; + +void dump_cbmem_toc(void) +{ + int i; + uint64_t start; + struct cbmem_entry *entries; + + if (cbmem.type != LB_MEM_TABLE) { + fprintf(stderr, "No coreboot table area found!\n"); + return; + } + + start = unpack_lb64(cbmem.start); + + entries = (struct cbmem_entry *)map_memory(start); + + for (i=0; i<MAX_CBMEM_ENTRIES; i++) { + if (entries[i].magic != CBMEM_MAGIC) + break; + printf("CBMEM entry %d %08x\n", + i, entries[i].id); + } + unmap_memory(); +} void print_version(void) { @@ -341,6 +391,7 @@ void print_usage(const char *name) printf("usage: %s [-vh?]\n", name); printf("\n" " -c | --console: print cbmem console\n" + " -l | --list: print cbmem table of contents\n" " -t | --timestamps: print timestamp information\n" " -V | --verbose: verbose (debugging) output\n" " -v | --version: print the version\n" @@ -356,24 +407,30 @@ int main(int argc, char** argv) int print_defaults = 1; int print_console = 0; + int print_list = 0; int print_timestamps = 0; int opt, option_index = 0; static struct option long_options[] = { {"console", 0, 0, 'c'}, + {"list", 0, 0, 'l'}, {"timestamps", 0, 0, 't'}, {"verbose", 0, 0, 'V'}, {"version", 0, 0, 'v'}, {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "ctVvh?", + while ((opt = getopt_long(argc, argv, "cltVvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'c': print_console = 1; print_defaults = 0; break; + case 'l': + print_list = 1; + print_defaults = 0; + break; case 't': print_timestamps = 1; print_defaults = 0; @@ -410,6 +467,9 @@ int main(int argc, char** argv) if (print_console) dump_console(); + if (print_list) + dump_cbmem_toc(); + if (print_defaults || print_timestamps) dump_timestamps();

1 0

Patch merged into coreboot/master: 19f8756 cbmem utility: Add option to dump cbmem console
by gerrit＠coreboot.org 08 Jan '13

08 Jan '13

the following patch was just integrated into master: commit 19f8756f0008cf74a472177642cc44f00c05934f Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Jan 7 13:37:12 2013 -0800 cbmem utility: Add option to dump cbmem console This adds an option to the cbmem utility to dump the cbmem console. To keep the utility backwards compatible, specifying -c disables printing of time stamps. To print both console and time stamps, run the utility with -ct Change-Id: Idd2dbf32c3c44f857c2f41e6c817c5ab13155d6f Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: http://review.coreboot.org/2114 Tested-by: build bot (Jenkins) Reviewed-by: Vadim Bendebury <vbendeb(a)chromium.org> Build-Tested: build bot (Jenkins) at Tue Jan 8 00:35:41 2013, giving +1 See http://review.coreboot.org/2114 for details. -gerrit

1 0

Adding support for Kobian 815ep FSX mobo (82815 + 82801BA + IT8712F) - is it a good first time coreboot project?
by Maciej Grela 08 Jan '13

08 Jan '13

Hi, I've been watching the developments of LinuxBIOS and coreboot projects for some time now and I wanted to get involved in coreboot because I think it's a cool project. I think, that trying to make my old simple mobo to work with coreboot would be a good first time task. All of the chips are supported as far as I can see on the webpage but looking at the status of 82815 I would have to port it to from v1 to v4, right? I have some embedded experience (microcontrollers) but no knowledge of coreboot code. Is porting northbridge support hard? Thanks for your answers. -- Maciej Grela

1 0

New patch to review for coreboot: d027fbc cbmem utility: unify debug output
by Stefan Reinauer 08 Jan '13

08 Jan '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2116 -gerrit commit d027fbc3cbf4c32d8e1dd13ab22632dd5b7dbab8 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Mon Jan 7 15:25:37 2013 -0800 cbmem utility: unify debug output ... and indent it to make output more comprehensible. Change-Id: If321f3233b31be14b2723175b781e5dd60dd72b6 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbmem/cbmem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 4c0bd68..59d0540 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -158,12 +158,12 @@ static int parse_cbtable(u64 address) debug(" coreboot table entry 0x%02x\n", lbr_p->tag); switch (lbr_p->tag) { case LB_TAG_TIMESTAMPS: { - debug("Found timestamp table\n"); + debug(" Found timestamp table.\n"); timestamps = *(struct lb_cbmem_ref *) lbr_p; continue; } case LB_TAG_CBMEM_CONSOLE: { - debug("Found cbmem console\n"); + debug(" Found cbmem console.\n"); console = *(struct lb_cbmem_ref *) lbr_p; continue; } @@ -174,6 +174,7 @@ static int parse_cbtable(u64 address) */ struct lb_forward lbf_p = *(struct lb_forward *) lbr_p; + debug(" Found forwarding entry.\n"); unmap_memory(); return parse_cbtable(lbf_p.forward); }

1 0

Patch set updated for coreboot: bd7fa41 cbmem utility: Add option to dump cbmem console
by Stefan Reinauer 08 Jan '13

08 Jan '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2114 -gerrit commit bd7fa41828941d78e4edfacb13a4132d731552ce Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Jan 7 13:37:12 2013 -0800 cbmem utility: Add option to dump cbmem console This adds an option to the cbmem utility to dump the cbmem console. To keep the utility backwards compatible, specifying -c disables printing of time stamps. To print both console and time stamps, run the utility with -ct Change-Id: Idd2dbf32c3c44f857c2f41e6c817c5ab13155d6f Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbmem/cbmem.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index df00684..4c0bd68 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -283,6 +283,43 @@ static void dump_timestamps(void) unmap_memory(); } +/* dump the cbmem console */ +static void dump_console(void) +{ + void *console_p; + char *console_c; + uint32_t size; + + if (console.tag != LB_TAG_CBMEM_CONSOLE) { + fprintf(stderr, "No console found in coreboot table.\n"); + return; + } + + console_p = map_memory((unsigned long)console.cbmem_addr); + /* The in-memory format of the console area is: + * u32 size + * u32 cursor + * char console[size] + * Hence we have to add 8 to get to the actual console string. + */ + size = *(uint32_t *)console_p; + console_c = malloc(size + 1); + if (!console_c) { + fprintf(stderr, "Not enough memory for console.\n"); + exit(1); + } + + memcpy(console_c, console_p + 8, size); + console_c[size] = 0; + + printf("%s", console_c); + + free(console_c); + + unmap_memory(); +} + + void print_version(void) { printf("cbmem v%s -- ", CBMEM_VERSION); @@ -303,6 +340,9 @@ void print_usage(const char *name) { printf("usage: %s [-vh?]\n", name); printf("\n" + " -c | --console: print cbmem console\n" + " -t | --timestamps: print timestamp information\n" + " -V | --verbose: verbose (debugging) output\n" " -v | --version: print the version\n" " -h | --help: print this help\n" "\n"); @@ -314,18 +354,30 @@ int main(int argc, char** argv) int j; static const int possible_base_addresses[] = { 0, 0xf0000 }; - int print_timestamps = 1; + int print_defaults = 1; + int print_console = 0; + int print_timestamps = 0; int opt, option_index = 0; static struct option long_options[] = { + {"console", 0, 0, 'c'}, + {"timestamps", 0, 0, 't'}, {"verbose", 0, 0, 'V'}, {"version", 0, 0, 'v'}, {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "Vvh?", + while ((opt = getopt_long(argc, argv, "ctVvh?", long_options, &option_index)) != EOF) { switch (opt) { + case 'c': + print_console = 1; + print_defaults = 0; + break; + case 't': + print_timestamps = 1; + print_defaults = 0; + break; case 'V': verbose = 1; break; @@ -355,7 +407,10 @@ int main(int argc, char** argv) break; } - if (print_timestamps) + if (print_console) + dump_console(); + + if (print_defaults || print_timestamps) dump_timestamps(); close(fd);

1 0

Patch set updated for coreboot: 8112407 cbmem utility: Add option to dump cbmem console
by Stefan Reinauer 08 Jan '13

08 Jan '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2114 -gerrit commit 81124070b8cac3a33411e4f0809976fa7f213f57 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Jan 7 13:37:12 2013 -0800 cbmem utility: Add option to dump cbmem console This adds an option to the cbmem utility to dump the cbmem console. To keep the utility backwards compatible, specifying -c disables printing of time stamps. To print both console and time stamps, run the utility with -ct Change-Id: Idd2dbf32c3c44f857c2f41e6c817c5ab13155d6f Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbmem/cbmem.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index df00684..bcbc9ce 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -283,6 +283,41 @@ static void dump_timestamps(void) unmap_memory(); } +/* dump the cbmem console */ +static void dump_console(void) +{ + void *console_p; + char *console_c; + uint32_t size; + + if (console.tag != LB_TAG_CBMEM_CONSOLE) { + fprintf(stderr, "No console found in coreboot table.\n"); + return; + } + + console_p = map_memory((unsigned long)console.cbmem_addr); + /* The in-memory format of the console area is: + * u32 size + * u32 cursor + * char console[size] + * Hence we have to add 8 to get to the actual console string. + */ + size = *(uint32_t *)console_p; + console_c = malloc(size + 1); + if (!console_c) { + fprintf(stderr, "Not enough memory for console.\n"); + exit(1); + } + + memcpy(console_c, console_p + 8, size); + console_c[size] = 0; + + printf("%s", console_c); + + unmap_memory(); +} + + void print_version(void) { printf("cbmem v%s -- ", CBMEM_VERSION); @@ -303,6 +338,9 @@ void print_usage(const char *name) { printf("usage: %s [-vh?]\n", name); printf("\n" + " -c | --console: print cbmem console\n" + " -t | --timestamps: print timestamp information\n" + " -V | --verbose: verbose (debugging) output\n" " -v | --version: print the version\n" " -h | --help: print this help\n" "\n"); @@ -314,18 +352,30 @@ int main(int argc, char** argv) int j; static const int possible_base_addresses[] = { 0, 0xf0000 }; - int print_timestamps = 1; + int print_defaults = 1; + int print_console = 0; + int print_timestamps = 0; int opt, option_index = 0; static struct option long_options[] = { + {"console", 0, 0, 'c'}, + {"timestamps", 0, 0, 't'}, {"verbose", 0, 0, 'V'}, {"version", 0, 0, 'v'}, {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "Vvh?", + while ((opt = getopt_long(argc, argv, "ctVvh?", long_options, &option_index)) != EOF) { switch (opt) { + case 'c': + print_console = 1; + print_defaults = 0; + break; + case 't': + print_timestamps = 1; + print_defaults = 0; + break; case 'V': verbose = 1; break; @@ -355,7 +405,10 @@ int main(int argc, char** argv) break; } - if (print_timestamps) + if (print_console) + dump_console(); + + if (print_defaults || print_timestamps) dump_timestamps(); close(fd);

1 0

Patch merged into coreboot/master: 1665bb3 cbmem utility: drop obsolete python based implementation
by gerrit＠coreboot.org 08 Jan '13

08 Jan '13

the following patch was just integrated into master: commit 1665bb3896e49f84a28e24176734f447f3a0899b Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Jan 7 13:39:43 2013 -0800 cbmem utility: drop obsolete python based implementation The first version of the cbmem utility was written in python, but it had issues with 64bit systems and other little hick ups. Since the C version has much fewer dependencies (no python needed on target system), and it works in all corner cases, drop the python version. Change-Id: Ida3d6c9bb46f6d826f45538e4ceaa4fc1e771ff5 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: http://review.coreboot.org/2115 Reviewed-by: Vadim Bendebury <vbendeb(a)chromium.org> Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Mon Jan 7 23:53:31 2013, giving +1 See http://review.coreboot.org/2115 for details. -gerrit

1 0

Patch set updated for coreboot: d64a48e cbmem utility: drop obsolete python based implementation
by Stefan Reinauer 07 Jan '13

07 Jan '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2115 -gerrit commit d64a48e7cb188200d124b11f53d47681489f91b8 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Jan 7 13:39:43 2013 -0800 cbmem utility: drop obsolete python based implementation The first version of the cbmem utility was written in python, but it had issues with 64bit systems and other little hick ups. Since the C version has much fewer dependencies (no python needed on target system), and it works in all corner cases, drop the python version. Change-Id: Ida3d6c9bb46f6d826f45538e4ceaa4fc1e771ff5 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbmem/cbmem.py | 259 ---------------------------------------------------- 1 file changed, 259 deletions(-) diff --git a/util/cbmem/cbmem.py b/util/cbmem/cbmem.py deleted file mode 100755 index 70ccc00..0000000 --- a/util/cbmem/cbmem.py +++ /dev/null @@ -1,259 +0,0 @@ -#!/usr/bin/python -# -# cbmem.py - Linux space CBMEM contents parser -# -# Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. -# -# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -''' -Parse and display CBMEM contents. - -This module is meant to run on systems with coreboot based firmware. - -When started, it determines the amount of DRAM installed on the system, and -then scans the top area of DRAM (right above the available memory size) -looking for the CBMEM base signature at locations aligned at 0x20000 -boundaries. - -Once it finds the CBMEM signature, the utility parses the contents, reporting -the section IDs/sizes and also reporting the contents of the tiemstamp and -console sections. -''' - -import mmap -import struct -import sys - -def get_phys_mem(addr, size): - '''Read size bytes from address addr by mmaping /dev/mem''' - - mf = open("/dev/mem") - delta = addr % 4096 - mm = mmap.mmap(mf.fileno(), size + delta, - mmap.MAP_PRIVATE, offset=(addr - delta)) - buf = mm.read(size + delta) - mf.close() - return buf[delta:] - -# This class and metaclass make it easier to define and access structures -# which live in physical memory. To use them, inherit from CStruct and define -# a class member called struct_members which is a tuple of pairs. The first -# item in the pair is the type format specifier that should be used with -# struct.unpack to read that member from memory. The second item is the name -# that member should have in the resulting object. - -class MetaCStruct(type): - def __init__(cls, name, bases, dct): - struct_members = dct["struct_members"] - cls.struct_fmt = "<" - for char, name in struct_members: - cls.struct_fmt += char - cls.struct_len = struct.calcsize(cls.struct_fmt) - super(MetaCStruct, cls).__init__(name, bases, dct) - -class CStruct(object): - __metaclass__ = MetaCStruct - struct_members = () - - def __init__(self, addr): - self.raw_memory = get_phys_mem(addr, self.struct_len) - values = struct.unpack(self.struct_fmt, self.raw_memory) - names = (name for char, name in self.struct_members) - for name, value in zip(names, values): - setattr(self, name, value) - -def normalize_timer(value, freq): - '''Convert timer reading into microseconds. - - Get the free running clock counter value, divide it by the clock frequency - and multiply by 1 million to get reading in microseconds. - - Then convert the value into an ASCII string with groups of three digits - separated by commas. - - Inputs: - value: int, the clock reading - freq: float, the clock frequency - - Returns: - A string presenting 'value' in microseconds. - ''' - - result = [] - value = int(value * 1000000.0 / freq) - svalue = '%d' % value - vlength = len(svalue) - remainder = vlength % 3 - if remainder: - result.append(svalue[0:remainder]) - while remainder < vlength: - result.append(svalue[remainder:remainder+3]) - remainder = remainder + 3 - return ','.join(result) - -def get_cpu_freq(): - '''Retrieve CPU frequency from sysfs. - - Use /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq as the source. - ''' - freq_str = open('/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq' - ).read() - # Convert reading into Hertz - return float(freq_str) * 1000.0 - -def process_timers(base): - '''Scan the array of timestamps found in CBMEM at address base. - - For each timestamp print the timer ID and the value in microseconds. - ''' - - class TimestampHeader(CStruct): - struct_members = ( - ("Q", "base_time"), - ("L", "max_entr"), - ("L", "entr") - ) - - class TimestampEntry(CStruct): - struct_members = ( - ("L", "timer_id"), - ("Q", "timer_value") - ) - - header = TimestampHeader(base) - print('\ntime base %d, total entries %d' % (header.base_time, header.entr)) - clock_freq = get_cpu_freq() - base = base + header.struct_len - prev_time = 0 - for i in range(header.entr): - timestamp = TimestampEntry(base) - print '%d:%s ' % (timestamp.timer_id, - normalize_timer(timestamp.timer_value, clock_freq)), - if prev_time: - print '(%s)' % normalize_timer( - timestamp.timer_value - prev_time, clock_freq), - prev_time = timestamp.timer_value - print - base = base + timestamp.struct_len - print - -def process_console(base): - '''Dump the console log buffer contents found at address base.''' - - class ConsoleHeader(CStruct): - struct_members = ( - ("L", "size"), - ("L", "cursor") - ) - - header = ConsoleHeader(base) - print 'cursor at %d\n' % header.cursor - - cons_addr = base + header.struct_len - cons_length = min(header.cursor, header.size) - cons_text = get_phys_mem(cons_addr, cons_length) - print cons_text - print '\n' - -def ipchksum(buf): - '''Checksumming function used on the coreboot tables. The buffer being - checksummed is summed up as if it was an array of 16 bit unsigned - integers. If there are an odd number of bytes, the last element is zero - extended.''' - - size = len(buf) - odd = size % 2 - fmt = "<%dH" % ((size - odd) / 2) - if odd: - fmt += "B" - shorts = struct.unpack(fmt, buf) - checksum = sum(shorts) - checksum = (checksum >> 16) + (checksum & 0xffff) - checksum += (checksum >> 16) - checksum = ~checksum & 0xffff - return checksum - -def parse_tables(base, length): - '''Find the coreboot tables in memory and process whatever we can.''' - - class CBTableHeader(CStruct): - struct_members = ( - ("4s", "signature"), - ("I", "header_bytes"), - ("I", "header_checksum"), - ("I", "table_bytes"), - ("I", "table_checksum"), - ("I", "table_entries") - ) - - class CBTableEntry(CStruct): - struct_members = ( - ("I", "tag"), - ("I", "size") - ) - - class CBTableForward(CBTableEntry): - struct_members = CBTableEntry.struct_members + ( - ("Q", "forward"), - ) - - class CBMemTab(CBTableEntry): - struct_members = CBTableEntry.struct_members + ( - ("L", "cbmem_tab"), - ) - - for addr in range(base, base + length, 16): - header = CBTableHeader(addr) - if header.signature == "LBIO": - break - else: - return -1 - - if header.header_bytes == 0: - return -1 - - if ipchksum(header.raw_memory) != 0: - print "Bad header checksum" - return -1 - - addr += header.header_bytes - table = get_phys_mem(addr, header.table_bytes) - if ipchksum(table) != header.table_checksum: - print "Bad table checksum" - return -1 - - for i in range(header.table_entries): - entry = CBTableEntry(addr) - if entry.tag == 0x11: # Forwarding entry - return parse_tables(CBTableForward(addr).forward, length) - elif entry.tag == 0x16: # Timestamps - process_timers(CBMemTab(addr).cbmem_tab) - elif entry.tag == 0x17: # CBMEM console - process_console(CBMemTab(addr).cbmem_tab) - - addr += entry.size - - return 0 - -def main(): - for base, length in (0x00000000, 0x1000), (0x000f0000, 0x1000): - if parse_tables(base, length): - break - else: - print "Didn't find the coreboot tables" - return 0 - -if __name__ == "__main__": - sys.exit(main())

1 0

New patch to review for coreboot: 1d064f3 cbmem utility: drop obsolete python version
by Stefan Reinauer 07 Jan '13

07 Jan '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2115 -gerrit commit 1d064f3d704f43df3f03b580076f17ce96275f42 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Jan 7 13:39:43 2013 -0800 cbmem utility: drop obsolete python version The first version of the cbmem utility was written in python, but it had issues with 64bit systems and other little hick ups. Since the C version has much fewer dependencies (no python needed on target system), and it works in all corner cases, drop the python version. Change-Id: Ida3d6c9bb46f6d826f45538e4ceaa4fc1e771ff5 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbmem/cbmem.py | 259 ---------------------------------------------------- 1 file changed, 259 deletions(-) diff --git a/util/cbmem/cbmem.py b/util/cbmem/cbmem.py deleted file mode 100755 index 70ccc00..0000000 --- a/util/cbmem/cbmem.py +++ /dev/null @@ -1,259 +0,0 @@ -#!/usr/bin/python -# -# cbmem.py - Linux space CBMEM contents parser -# -# Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. -# -# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -''' -Parse and display CBMEM contents. - -This module is meant to run on systems with coreboot based firmware. - -When started, it determines the amount of DRAM installed on the system, and -then scans the top area of DRAM (right above the available memory size) -looking for the CBMEM base signature at locations aligned at 0x20000 -boundaries. - -Once it finds the CBMEM signature, the utility parses the contents, reporting -the section IDs/sizes and also reporting the contents of the tiemstamp and -console sections. -''' - -import mmap -import struct -import sys - -def get_phys_mem(addr, size): - '''Read size bytes from address addr by mmaping /dev/mem''' - - mf = open("/dev/mem") - delta = addr % 4096 - mm = mmap.mmap(mf.fileno(), size + delta, - mmap.MAP_PRIVATE, offset=(addr - delta)) - buf = mm.read(size + delta) - mf.close() - return buf[delta:] - -# This class and metaclass make it easier to define and access structures -# which live in physical memory. To use them, inherit from CStruct and define -# a class member called struct_members which is a tuple of pairs. The first -# item in the pair is the type format specifier that should be used with -# struct.unpack to read that member from memory. The second item is the name -# that member should have in the resulting object. - -class MetaCStruct(type): - def __init__(cls, name, bases, dct): - struct_members = dct["struct_members"] - cls.struct_fmt = "<" - for char, name in struct_members: - cls.struct_fmt += char - cls.struct_len = struct.calcsize(cls.struct_fmt) - super(MetaCStruct, cls).__init__(name, bases, dct) - -class CStruct(object): - __metaclass__ = MetaCStruct - struct_members = () - - def __init__(self, addr): - self.raw_memory = get_phys_mem(addr, self.struct_len) - values = struct.unpack(self.struct_fmt, self.raw_memory) - names = (name for char, name in self.struct_members) - for name, value in zip(names, values): - setattr(self, name, value) - -def normalize_timer(value, freq): - '''Convert timer reading into microseconds. - - Get the free running clock counter value, divide it by the clock frequency - and multiply by 1 million to get reading in microseconds. - - Then convert the value into an ASCII string with groups of three digits - separated by commas. - - Inputs: - value: int, the clock reading - freq: float, the clock frequency - - Returns: - A string presenting 'value' in microseconds. - ''' - - result = [] - value = int(value * 1000000.0 / freq) - svalue = '%d' % value - vlength = len(svalue) - remainder = vlength % 3 - if remainder: - result.append(svalue[0:remainder]) - while remainder < vlength: - result.append(svalue[remainder:remainder+3]) - remainder = remainder + 3 - return ','.join(result) - -def get_cpu_freq(): - '''Retrieve CPU frequency from sysfs. - - Use /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq as the source. - ''' - freq_str = open('/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq' - ).read() - # Convert reading into Hertz - return float(freq_str) * 1000.0 - -def process_timers(base): - '''Scan the array of timestamps found in CBMEM at address base. - - For each timestamp print the timer ID and the value in microseconds. - ''' - - class TimestampHeader(CStruct): - struct_members = ( - ("Q", "base_time"), - ("L", "max_entr"), - ("L", "entr") - ) - - class TimestampEntry(CStruct): - struct_members = ( - ("L", "timer_id"), - ("Q", "timer_value") - ) - - header = TimestampHeader(base) - print('\ntime base %d, total entries %d' % (header.base_time, header.entr)) - clock_freq = get_cpu_freq() - base = base + header.struct_len - prev_time = 0 - for i in range(header.entr): - timestamp = TimestampEntry(base) - print '%d:%s ' % (timestamp.timer_id, - normalize_timer(timestamp.timer_value, clock_freq)), - if prev_time: - print '(%s)' % normalize_timer( - timestamp.timer_value - prev_time, clock_freq), - prev_time = timestamp.timer_value - print - base = base + timestamp.struct_len - print - -def process_console(base): - '''Dump the console log buffer contents found at address base.''' - - class ConsoleHeader(CStruct): - struct_members = ( - ("L", "size"), - ("L", "cursor") - ) - - header = ConsoleHeader(base) - print 'cursor at %d\n' % header.cursor - - cons_addr = base + header.struct_len - cons_length = min(header.cursor, header.size) - cons_text = get_phys_mem(cons_addr, cons_length) - print cons_text - print '\n' - -def ipchksum(buf): - '''Checksumming function used on the coreboot tables. The buffer being - checksummed is summed up as if it was an array of 16 bit unsigned - integers. If there are an odd number of bytes, the last element is zero - extended.''' - - size = len(buf) - odd = size % 2 - fmt = "<%dH" % ((size - odd) / 2) - if odd: - fmt += "B" - shorts = struct.unpack(fmt, buf) - checksum = sum(shorts) - checksum = (checksum >> 16) + (checksum & 0xffff) - checksum += (checksum >> 16) - checksum = ~checksum & 0xffff - return checksum - -def parse_tables(base, length): - '''Find the coreboot tables in memory and process whatever we can.''' - - class CBTableHeader(CStruct): - struct_members = ( - ("4s", "signature"), - ("I", "header_bytes"), - ("I", "header_checksum"), - ("I", "table_bytes"), - ("I", "table_checksum"), - ("I", "table_entries") - ) - - class CBTableEntry(CStruct): - struct_members = ( - ("I", "tag"), - ("I", "size") - ) - - class CBTableForward(CBTableEntry): - struct_members = CBTableEntry.struct_members + ( - ("Q", "forward"), - ) - - class CBMemTab(CBTableEntry): - struct_members = CBTableEntry.struct_members + ( - ("L", "cbmem_tab"), - ) - - for addr in range(base, base + length, 16): - header = CBTableHeader(addr) - if header.signature == "LBIO": - break - else: - return -1 - - if header.header_bytes == 0: - return -1 - - if ipchksum(header.raw_memory) != 0: - print "Bad header checksum" - return -1 - - addr += header.header_bytes - table = get_phys_mem(addr, header.table_bytes) - if ipchksum(table) != header.table_checksum: - print "Bad table checksum" - return -1 - - for i in range(header.table_entries): - entry = CBTableEntry(addr) - if entry.tag == 0x11: # Forwarding entry - return parse_tables(CBTableForward(addr).forward, length) - elif entry.tag == 0x16: # Timestamps - process_timers(CBMemTab(addr).cbmem_tab) - elif entry.tag == 0x17: # CBMEM console - process_console(CBMemTab(addr).cbmem_tab) - - addr += entry.size - - return 0 - -def main(): - for base, length in (0x00000000, 0x1000), (0x000f0000, 0x1000): - if parse_tables(base, length): - break - else: - print "Didn't find the coreboot tables" - return 0 - -if __name__ == "__main__": - sys.exit(main())

1 0

New patch to review for coreboot: 1560718 cbmem utility: Add option to dump cbmem console
by Stefan Reinauer 07 Jan '13

07 Jan '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2114 -gerrit commit 1560718f8d10dd0394e3df6f7bdc4fee54034ce5 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Jan 7 13:37:12 2013 -0800 cbmem utility: Add option to dump cbmem console This adds an option to the cbmem utility to dump the cbmem console. To keep the utility backwards compatible, specifying -c disables printing of time stamps. To print both console and time stamps, run the utility with -ct Change-Id: Idd2dbf32c3c44f857c2f41e6c817c5ab13155d6f Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbmem/cbmem.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index df00684..cc98e56 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -283,6 +283,29 @@ static void dump_timestamps(void) unmap_memory(); } +/* dump the cbmem console */ +static void dump_console(void) +{ + void *console_p; + + if (console.tag != LB_TAG_CBMEM_CONSOLE) { + fprintf(stderr, "No console found in coreboot table.\n"); + return; + } + + console_p = map_memory((unsigned long)console.cbmem_addr); + /* The in-memory format of the console area is: + * u32 size + * u32 cursor + * char console[size] + * Hence we have to add 8 to get to the actual console string. + */ + printf("%s", (char *)console_p + 8); + + unmap_memory(); +} + + void print_version(void) { printf("cbmem v%s -- ", CBMEM_VERSION); @@ -303,6 +326,9 @@ void print_usage(const char *name) { printf("usage: %s [-vh?]\n", name); printf("\n" + " -c | --console: verbose (debugging) output\n" + " -t | --timestamps: verbose (debugging) output\n" + " -V | --verbose: verbose (debugging) output\n" " -v | --version: print the version\n" " -h | --help: print this help\n" "\n"); @@ -314,18 +340,30 @@ int main(int argc, char** argv) int j; static const int possible_base_addresses[] = { 0, 0xf0000 }; - int print_timestamps = 1; + int print_defaults = 1; + int print_console = 0; + int print_timestamps = 0; int opt, option_index = 0; static struct option long_options[] = { + {"console", 0, 0, 'c'}, + {"timestamps", 0, 0, 't'}, {"verbose", 0, 0, 'V'}, {"version", 0, 0, 'v'}, {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "Vvh?", + while ((opt = getopt_long(argc, argv, "ctVvh?", long_options, &option_index)) != EOF) { switch (opt) { + case 'c': + print_console = 1; + print_defaults = 0; + break; + case 't': + print_timestamps = 1; + print_defaults = 0; + break; case 'V': verbose = 1; break; @@ -355,7 +393,10 @@ int main(int argc, char** argv) break; } - if (print_timestamps) + if (print_console) + dump_console(); + + if (print_defaults || print_timestamps) dump_timestamps(); close(fd);

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot January 2013