coreboot March 2013

coreboot@coreboot.org

46 participants
782 discussions

Patch merged into coreboot/master: c2c9723 Show the device tree.
by gerrit＠coreboot.org 16 Mar '13

16 Mar '13

the following patch was just integrated into master: commit c2c97231e3f36e9d3f1ee8de2394220ec7beadeb Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Mar 15 15:57:13 2013 -0700 Show the device tree. This is a bit of a hack but it's very handy. It compiles in your static.c and then shows what coreboot would see when it is run. It uses your static.c and functions pulled from src/device/device_util.c. I've already used it to debug problems with the snow device tree. I'm waiting someone to tell me this is already written :-) Change-Id: Ia8c8a5d08d8757bec49eaf70473efa701bc56581 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Reviewed-on: http://review.coreboot.org/2767 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Build-Tested: build bot (Jenkins) at Sat Mar 16 04:13:12 2013, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Sat Mar 16 04:30:16 2013, giving +2 See http://review.coreboot.org/2767 for details. -gerrit

1 0

New patch to review for coreboot: 918a5c6 Add standard defines
by Ronald G. Minnich 16 Mar '13

16 Mar '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2769 -gerrit commit 918a5c64f503945a878831cd46a835926d97179b Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Mar 15 20:17:26 2013 -0700 Add standard defines Paul points out that some people like 1024*1024, others like 1048576, but in any case these are all open to typos. Define KiB, MiB, GiB, and TiB as in the standard so people can use them. Change-Id: Ic1b57e70d3e9b9e1c0242299741f71db91e7cd3f Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- src/include/stddef.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/include/stddef.h b/src/include/stddef.h index 888d497..c96c765 100644 --- a/src/include/stddef.h +++ b/src/include/stddef.h @@ -13,6 +13,13 @@ typedef unsigned int wint_t; #define NULL ((void *)0) +/* standard units. */ +#define KiB (1<<10) +#define MiB (1<<20) +#define GiB (1<<30) +/* could we ever run into this one? I hope we get this much memory! */ +#define TiB (1<<40) + #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #ifdef __PRE_RAM__

1 0

Patch merged into coreboot/master: 20ff75f google/snow: rename a file so that it is clear what board it is for
by gerrit＠coreboot.org 16 Mar '13

16 Mar '13

the following patch was just integrated into master: commit 20ff75f1fc302b83f4184526fbb082718b61501e Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Mar 15 14:40:40 2013 -0700 google/snow: rename a file so that it is clear what board it is for One might wonder what a board named 'build' does. Rename the file to build-snow. The fact that it is in a directory with google in the name should be enough to identify the vendor. Change-Id: I0b473cdce67d56fc6b92032b55180523eb337d66 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Reviewed-on: http://review.coreboot.org/2766 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Build-Tested: build bot (Jenkins) at Sat Mar 16 02:50:39 2013, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Sat Mar 16 03:00:15 2013, giving +2 See http://review.coreboot.org/2766 for details. -gerrit

1 0

Patch merged into coreboot/master: 039223a gitmodules: Ignore 3rdparty in "diff family"
by gerrit＠coreboot.org 16 Mar '13

16 Mar '13

the following patch was just integrated into master: commit 039223a4741d513c7ea3c9cc1bb84ad612773768 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sat Mar 16 00:05:09 2013 +0100 gitmodules: Ignore 3rdparty in "diff family" This should help avoid wrong 3rdparty commit ids creeping in. Change-Id: I2134ad1d3ad0237ef3f12baf4d4aafb02009e7bc Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/2768 Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Sat Mar 16 03:22:07 2013, giving +1 Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Sat Mar 16 00:45:48 2013, giving +2 See http://review.coreboot.org/2768 for details. -gerrit

1 0

Patch set updated for coreboot: 3167fae cbfstool: Extend "locate" command to support alignment and page-fitting.
by Hung-Te Lin 16 Mar '13

16 Mar '13

Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2730 -gerrit commit 3167fae8a84958cafaaaea16d01f1921eebc6416 Author: Hung-Te Lin <hungte(a)chromium.org> Date: Fri Mar 15 14:44:05 2013 +0800 cbfstool: Extend "locate" command to support alignment and page-fitting. cbfstool usage change: The "-a" parameter for "cbfstool locate" has changed to "-P/--page-size". "-a" for "cbfstool locate" is now for specifying base address alignment. The "locate" command was used to find a place to store ELF stage image in one memory page. Its argument "-a (alignment)" was actually specifying the page size instead of doing memory address alignment. This can be confusing when people are trying to put a blob in aligned location (ex, microcode needs to be aligned in 0x10), and see this: cbfstool coreboot.rom localte -f test.bin -n test -a 0x100 # output: 0x44, which does not look like aligned to 0x100. To support that and prevent confusion, we should rename the page-fitting argument to "-P/--page-size" and leave "-a/--alignment" for real alignment. Verified by manually testing a file (324 bytes) with alignment=0x10: cbfstool coreboot.rom locate -f test -n test -a 0x10 # output: 0x71fdd0 cbfstool coreboot.rom add -f test -n test -t raw -b 0x71fdd0 cbfstool coreboot.rom print -v -v # output: test 0x71fd80 raw 324 # output: cbfs_file=0x71fd80, offset=0x50, content_address=0x71fdd0+0x144 And verified to be compatible with old behavior by building i386/axus/tc320 (with page limitation 0x40000): cbfstool coreboot.rom locate -f romstage_null.bin -n romstage -P 0x40000 # output: 0x44 cbfstool coreboot.rom locate -f x.bin -n romstage -P 0x40000 -a 0x30 # output: 0x60 Change-Id: I0893adde51ebf46da1c34913f9c35507ed8ff731 Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> --- src/arch/armv7/Makefile.inc | 2 +- src/arch/x86/Makefile.inc | 2 +- util/cbfstool/cbfs_image.c | 56 ++++++++++++++++++++++++++++++--------------- util/cbfstool/cbfs_image.h | 6 +++-- util/cbfstool/cbfstool.c | 15 ++++++++---- 5 files changed, 54 insertions(+), 27 deletions(-) diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc index 39c115e..8601112 100644 --- a/src/arch/armv7/Makefile.inc +++ b/src/arch/armv7/Makefile.inc @@ -282,7 +282,7 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas $(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin @printf " generating base_xip.txt\n" rm -f $@ - $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \ + $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -P $(CONFIG_XIP_ROM_SIZE) > $@.tmp \ || { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; } mv $@.tmp $@ diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 0892efd..3c57701 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -387,7 +387,7 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas $(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin rm -f $@ - $(CBFSTOOL) $(obj)/coreboot.pre1 locate -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \ + $(CBFSTOOL) $(obj)/coreboot.pre1 locate -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -P $(CONFIG_XIP_ROM_SIZE) > $@.tmp \ || { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; } mv $@.tmp $@ diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 2cdbf23..03ea72b 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -773,7 +773,7 @@ int cbfs_create_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, return 0; } -/* Finds a place to hold whole stage data in same memory page. +/* Finds a place to hold whole data in same memory page. */ static int is_in_same_page(uint32_t start, uint32_t size, uint32_t page) { if (!page) @@ -781,24 +781,41 @@ static int is_in_same_page(uint32_t start, uint32_t size, uint32_t page) { return (start / page) == (start + size - 1) / page; } +static int is_in_range(uint32_t start, uint32_t end, uint32_t offset, + uint32_t size) { + return (offset >= start && offset + size <= end); +} + int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, - uint32_t size, uint32_t page_size) { + uint32_t size, uint32_t page_size, uint32_t align) { struct cbfs_file *entry; size_t need_len; - uint32_t addr, addr_next, addr2, addr3, header_len; - assert(size < page_size); + uint32_t addr, addr_next, addr2, addr3, offset, header_len; + + /* Default values: allow fitting anywhere in ROM. */ + if (!page_size) + page_size = ntohl(image->header->romsize); + if (!align) + align = 1; + + if (size > page_size) + ERROR("Input file size (%d) greater than page size (%d).\n", + size, page_size); if (page_size % ntohl(image->header->align)) - WARN("locate_entry: page does not align with CBFS image.\n"); + WARN("%s: Page size (%#x) not aligned with CBFS image (%#x).\n", + __func__, page_size, ntohl(image->header->align)); /* TODO Old cbfstool always assume input is a stage file (and adding * sizeof(cbfs_stage) for header. We should fix that by adding "-t" - * (type) param in future. For right now, follow old behavior. */ + * (type) param in future. For right now, we assume cbfs_stage is the + * largest structure and add it into header size. */ + assert(sizeof(struct cbfs_stage) >= sizeof(struct cbfs_payload)); header_len = (cbfs_calculate_file_header_size(name) + sizeof(struct cbfs_stage)); need_len = header_len + size; - // Merge empty entries to build get max available pages. + // Merge empty entries to build get max available space. cbfs_walk(image, cbfs_merge_empty_entry, NULL); /* Three cases of content location on memory page: @@ -817,9 +834,9 @@ int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, * | { free space . } PAGE 2, header can't fit in free * | shift-> <header><content> space, so we must use PAGE 3. * - * The returned address will be used to re-link stage file, and then - * assigned to add-stage command (-b), which will be then re-calculated - * by ELF loader and positioned by cbfs_add_entry. + * The returned address may be used to re-link stage file, and then + * assigned to add-stage command (-b) and be then re-calculated by ELF + * loader and positioned by cbfs_add_entry. */ for (entry = cbfs_find_first_entry(image); entry && cbfs_is_valid_entry(image, entry); @@ -834,23 +851,26 @@ int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, image, entry)); if (addr_next - addr < need_len) continue; - if (is_in_same_page(addr + header_len, size, page_size)) { + + offset = align_up(addr + header_len, align); + if (is_in_same_page(offset, size, page_size) && + is_in_range(addr, addr_next, offset, size)) { DEBUG("cbfs_locate_entry: FIT (PAGE1)."); - return addr + header_len; + return offset; } addr2 = align_up(addr, page_size); - if (addr2 < addr_next && addr_next - addr2 >= size && - addr2 - addr >= header_len) { + offset = align_up(addr2, align); + if (is_in_range(addr, addr_next, offset, size)) { DEBUG("cbfs_locate_entry: OVERLAP (PAGE2)."); - return addr2; + return offset; } addr3 = addr2 + page_size; - if (addr3 < addr_next && addr_next - addr3 >= size && - addr3 - addr >= header_len) { + offset = align_up(addr3, align); + if (is_in_range(addr, addr_next, offset, size)) { DEBUG("cbfs_locate_entry: OVERLAP+ (PAGE3)."); - return addr3; + return offset; } } return -1; diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 57bbfa1..e7a5d6b 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -76,10 +76,12 @@ int cbfs_remove_entry(struct cbfs_image *image, const char *name); int cbfs_create_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, size_t len, const char *name); -/* Finds a location to put given content in same memory page. +/* Finds a location to put given content by specified criteria: + * "page_size" limits the content to fit on same memory page, and + * "align" specified starting address alignment. * Returns a valid offset, or -1 on failure. */ int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, - uint32_t size, uint32_t page_size); + uint32_t size, uint32_t page_size, uint32_t align); /* Callback function used by cbfs_walk. * Returns 0 on success, or non-zero to stop further iteration. */ diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 97fd88d..7eca01d 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -50,6 +50,7 @@ static struct param { uint32_t entrypoint; uint32_t size; uint32_t alignment; + uint32_t pagesize; uint32_t offset; uint32_t top_aligned; comp_algo algo; @@ -355,12 +356,12 @@ static int cbfs_locate(void) } address = cbfs_locate_entry(&image, param.name, buffer.size, - param.alignment); + param.pagesize, param.alignment); buffer_delete(&buffer); if (address == -1) { - ERROR("'%s' can't fit in CBFS for align 0x%x.\n", - param.name, param.alignment); + ERROR("'%s' can't fit in CBFS for page-size %#x, align %#x.\n", + param.name, param.pagesize, param.alignment); cbfs_image_delete(&image); return 1; } @@ -421,7 +422,7 @@ static const struct command commands[] = { {"add-flat-binary", "f:n:l:e:c:b:vh?", cbfs_add_flat_binary}, {"remove", "n:vh?", cbfs_remove}, {"create", "s:B:b:H:a:o:m:vh?", cbfs_create}, - {"locate", "f:n:a:Tvh?", cbfs_locate}, + {"locate", "f:n:a:P:Tvh?", cbfs_locate}, {"print", "vh?", cbfs_print}, {"extract", "n:f:vh?", cbfs_extract}, }; @@ -437,6 +438,7 @@ static struct option long_options[] = { {"size", required_argument, 0, 's' }, {"bootblock", required_argument, 0, 'B' }, {"alignment", required_argument, 0, 'a' }, + {"page-size", required_argument, 0, 'P' }, {"offset", required_argument, 0, 'o' }, {"file", required_argument, 0, 'f' }, {"arch", required_argument, 0, 'm' }, @@ -468,7 +470,7 @@ static void usage(char *name) "Remove a component\n" " create -s size -B bootblock -m ARCH [-a align] [-o offset] " "Create a ROM file\n" - " locate -f FILE -n NAME [-a align] [-T] " + " locate -f FILE -n NAME [-P page-size] [-a align] [-T] " "Find a place for a file of that size\n" " print " "Show the contents of the ROM\n" @@ -572,6 +574,9 @@ int main(int argc, char **argv) case 'a': param.alignment = strtoul(optarg, NULL, 0); break; + case 'P': + param.pagesize = strtoul(optarg, NULL, 0); + break; case 'o': param.offset = strtoul(optarg, NULL, 0); break;

1 0

Patch set updated for coreboot: 3898e5b Show the device tree.
by Ronald G. Minnich 16 Mar '13

16 Mar '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2767 -gerrit commit 3898e5b6821040d466c46da18f9cab66011790cd Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Mar 15 15:57:13 2013 -0700 Show the device tree. This is a bit of a hack but it's very handy. It compiles in your static.c and then shows what coreboot would see when it is run. It uses your static.c and functions pulled from src/device/device_util.c. I've already used it to debug problems with the snow device tree. I'm waiting someone to tell me this is already written :-) Change-Id: Ia8c8a5d08d8757bec49eaf70473efa701bc56581 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- util/showdevicetree/showdt.c | 169 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/util/showdevicetree/showdt.c b/util/showdevicetree/showdt.c new file mode 100644 index 0000000..dc4e4d6 --- /dev/null +++ b/util/showdevicetree/showdt.c @@ -0,0 +1,169 @@ +/* + * Compile and dump the device tree + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ +#include <stdio.h> +/* you can't include string.h due to conflicts with coreboot prototypes. */ +void *memcpy(void *m1, void *m2, size_t s); + +struct device_operations default_dev_ops_root = { + .read_resources = NULL, + .set_resources = NULL, + .enable_resources = NULL, + .init = NULL, + .scan_bus = NULL, + .reset_bus = NULL, +}; + +extern struct device dev_root; +struct device *all_devices = &dev_root; + +const char mainboard_name[] = "showdt"; + +/* + * Warning: This function uses a static buffer. Don't call it more than once + * from the same print statement! + */ +const char *dev_path(device_t dev) +{ + static char buffer[DEVICE_PATH_MAX]; + + buffer[0] = '\0'; + if (!dev) { + memcpy(buffer, "<null>", 7); + } else { + switch(dev->path.type) { + case DEVICE_PATH_ROOT: + memcpy(buffer, "Root Device", 12); + break; + case DEVICE_PATH_PCI: +#if CONFIG_PCI_BUS_SEGN_BITS + sprintf(buffer, "PCI: %04x:%02x:%02x.%01x", + dev->bus->secondary >> 8, + dev->bus->secondary & 0xff, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#else + sprintf(buffer, "PCI: %02x:%02x.%01x", + dev->bus->secondary, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#endif + break; + case DEVICE_PATH_PNP: + sprintf(buffer, "PNP: %04x.%01x", + dev->path.pnp.port, dev->path.pnp.device); + break; + case DEVICE_PATH_I2C: + sprintf(buffer, "I2C: %02x:%02x", + dev->bus->secondary, + dev->path.i2c.device); + break; + case DEVICE_PATH_APIC: + sprintf(buffer, "APIC: %02x", + dev->path.apic.apic_id); + break; + case DEVICE_PATH_IOAPIC: + sprintf(buffer, "IOAPIC: %02x", + dev->path.ioapic.ioapic_id); + break; + case DEVICE_PATH_DOMAIN: + sprintf(buffer, "DOMAIN: %04x", + dev->path.domain.domain); + break; + case DEVICE_PATH_CPU_CLUSTER: + sprintf(buffer, "CPU_CLUSTER: %01x", + dev->path.cpu_cluster.cluster); + break; + case DEVICE_PATH_CPU: + sprintf(buffer, "CPU: %02x", dev->path.cpu.id); + break; + case DEVICE_PATH_CPU_BUS: + sprintf(buffer, "CPU_BUS: %02x", dev->path.cpu_bus.id); + break; + default: + printf("Unknown device path type: %d\n", + dev->path.type); + break; + } + } + return buffer; +} + + +void show_devs_tree(struct device *dev, int debug_level, int depth, int linknum) +{ + char depth_str[20] = ""; + int i; + struct device *sibling; + struct bus *link; + + for (i = 0; i < depth; i++) + depth_str[i] = ' '; + depth_str[i] = '\0'; + + printf("%s%s: enabled %d%s\n", + depth_str, dev_path(dev), dev->enabled, + dev->chip_ops ? ":has a chip":""); + + for (link = dev->link_list; link; link = link->next) { + for (sibling = link->children; sibling; + sibling = sibling->sibling) + show_devs_tree(sibling, debug_level, depth + 1, i); + } +} + +void show_all_devs_tree(int debug_level, const char *msg) +{ + printf("Show all devs in tree form...%s\n", msg); + + show_devs_tree(all_devices, debug_level, 0, -1); +} + +void show_devs_subtree(struct device *root, int debug_level, const char *msg) +{ + printf("Show all devs in subtree %s...%s\n", + dev_path(root), msg); + + printf("%s\n", msg); + show_devs_tree(root, debug_level, 0, -1); +} + +void show_all_devs(int debug_level, const char *msg) +{ + struct device *dev; + + printf("Show all devs...%s\n", msg); + for (dev = all_devices; dev; dev = dev->next) { + printf("%s: enabled %d%s\n", + dev_path(dev), dev->enabled, + dev->chip_ops ? ":has a chip":""); + } +} + +main() +{ + show_all_devs(1, ""); + show_all_devs_tree(1, ""); +} + +/* + * Example: (yank this and paste into M-x compile in emacs) + * or tail -2 showdt.c | head -1 |sh + * or whatever. + cc -I ../src -I ../src/include -I ../src/arch/armv7/include/ -include build/mainboard/google/snow/static.c showdt.c +*/

1 0

Patch set updated for coreboot: 070df40 Show the device tree.
by Ronald G. Minnich 16 Mar '13

16 Mar '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2767 -gerrit commit 070df4012fb9c38e9f48c7c1bd64d8eb2ae6ce00 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Mar 15 15:57:13 2013 -0700 Show the device tree. This is a bit of a hack but it's very handy. It compiles in your static.c and then shows what coreboot would see when it is run. It uses your static.c and functions pulled from src/device/device_util.c. I've already used it to debug problems with the snow device tree. I'm waiting someone to tell me this is already written :-) Change-Id: Ia8c8a5d08d8757bec49eaf70473efa701bc56581 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- util/showdevicetree/showdt.c | 167 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/util/showdevicetree/showdt.c b/util/showdevicetree/showdt.c new file mode 100644 index 0000000..1c6a740 --- /dev/null +++ b/util/showdevicetree/showdt.c @@ -0,0 +1,167 @@ +/* + * Compile and dump the device tree + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ +#include <stdio.h> +/* you can't include string.h due to conflicts with coreboot prototypes. */ +void *memcpy(void *m1, void *m2, size_t s); + +struct device_operations default_dev_ops_root = { + .read_resources = NULL, + .set_resources = NULL, + .enable_resources = NULL, + .init = NULL, + .scan_bus = NULL, + .reset_bus = NULL, +}; + +extern struct device dev_root; +struct device *all_devices = &dev_root; + +const char mainboard_name[] = "showdt"; + +/* + * Warning: This function uses a static buffer. Don't call it more than once + * from the same print statement! + */ +const char *dev_path(device_t dev) +{ + static char buffer[DEVICE_PATH_MAX]; + + buffer[0] = '\0'; + if (!dev) { + memcpy(buffer, "<null>", 7); + } else { + switch(dev->path.type) { + case DEVICE_PATH_ROOT: + memcpy(buffer, "Root Device", 12); + break; + case DEVICE_PATH_PCI: +#if CONFIG_PCI_BUS_SEGN_BITS + sprintf(buffer, "PCI: %04x:%02x:%02x.%01x", + dev->bus->secondary >> 8, + dev->bus->secondary & 0xff, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#else + sprintf(buffer, "PCI: %02x:%02x.%01x", + dev->bus->secondary, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#endif + break; + case DEVICE_PATH_PNP: + sprintf(buffer, "PNP: %04x.%01x", + dev->path.pnp.port, dev->path.pnp.device); + break; + case DEVICE_PATH_I2C: + sprintf(buffer, "I2C: %02x:%02x", + dev->bus->secondary, + dev->path.i2c.device); + break; + case DEVICE_PATH_APIC: + sprintf(buffer, "APIC: %02x", + dev->path.apic.apic_id); + break; + case DEVICE_PATH_IOAPIC: + sprintf(buffer, "IOAPIC: %02x", + dev->path.ioapic.ioapic_id); + break; + case DEVICE_PATH_DOMAIN: + sprintf(buffer, "DOMAIN: %04x", + dev->path.domain.domain); + break; + case DEVICE_PATH_CPU_CLUSTER: + sprintf(buffer, "CPU_CLUSTER: %01x", + dev->path.cpu_cluster.cluster); + break; + case DEVICE_PATH_CPU: + sprintf(buffer, "CPU: %02x", dev->path.cpu.id); + break; + case DEVICE_PATH_CPU_BUS: + sprintf(buffer, "CPU_BUS: %02x", dev->path.cpu_bus.id); + break; + default: + printf("Unknown device path type: %d\n", + dev->path.type); + break; + } + } + return buffer; +} + + +void show_devs_tree(struct device *dev, int debug_level, int depth, int linknum) +{ + char depth_str[20] = ""; + int i; + struct device *sibling; + struct bus *link; + + for (i = 0; i < depth; i++) + depth_str[i] = ' '; + depth_str[i] = '\0'; + + printf("%s%s: enabled %d\n", + depth_str, dev_path(dev), dev->enabled); + + for (link = dev->link_list; link; link = link->next) { + for (sibling = link->children; sibling; + sibling = sibling->sibling) + show_devs_tree(sibling, debug_level, depth + 1, i); + } +} + +void show_all_devs_tree(int debug_level, const char *msg) +{ + printf("Show all devs in tree form...%s\n", msg); + + show_devs_tree(all_devices, debug_level, 0, -1); +} + +void show_devs_subtree(struct device *root, int debug_level, const char *msg) +{ + printf("Show all devs in subtree %s...%s\n", + dev_path(root), msg); + + printf("%s\n", msg); + show_devs_tree(root, debug_level, 0, -1); +} + +void show_all_devs(int debug_level, const char *msg) +{ + struct device *dev; + + printf("Show all devs...%s\n", msg); + for (dev = all_devices; dev; dev = dev->next) { + printf("%s: enabled %d\n", + dev_path(dev), dev->enabled); + } +} + +main() +{ + show_all_devs(1, ""); + show_all_devs_tree(1, ""); +} + +/* + * Example: (yank this and paste into M-x compile in emacs) + * or tail -2 showdt.c | head -1 |sh + * or whatever. + cc -I ../src -I ../src/include -I ../src/arch/armv7/include/ -include build/mainboard/google/snow/static.c showdt.c +*/

1 0

Patch set updated for coreboot: 1ee46f4 Show the device tree.
by Ronald G. Minnich 16 Mar '13

16 Mar '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2767 -gerrit commit 1ee46f4c9a69a54d3dade3c0304efb23a7b4f4a9 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Mar 15 15:57:13 2013 -0700 Show the device tree. This is a bit of a hack but it's very handy. It compiles in your static.c and then shows what coreboot would see when it is run. It uses your static.c and functions pulled from src/device/device_util.c. I've already used it to debug problems with the snow device tree. I'm waiting someone to tell me this is already written :-) Change-Id: Ia8c8a5d08d8757bec49eaf70473efa701bc56581 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- 3rdparty | 2 +- util/showdevicetree/showdt.c | 153 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index ba8caa3..dac1a18 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit ba8caa30bd5ed6d89dbfd40e17c75c94d43804c6 +Subproject commit dac1a18d184976e4447b98479f0b7a172054b98f diff --git a/util/showdevicetree/showdt.c b/util/showdevicetree/showdt.c new file mode 100644 index 0000000..e6853d8 --- /dev/null +++ b/util/showdevicetree/showdt.c @@ -0,0 +1,153 @@ +#include <stdio.h> +/* you can't include string.h due to conflicts with coreboot prototypes. */ +void *memcpy(void *m1, void *m2, size_t s); + +struct device_operations default_dev_ops_root = { + .read_resources = NULL, + .set_resources = NULL, + .enable_resources = NULL, + .init = NULL, + .scan_bus = NULL, + .reset_bus = NULL, +}; + +extern struct device dev_root; +struct device *all_devices = &dev_root; + +const char mainboard_name[] = "showdt"; + +/* + * Warning: This function uses a static buffer. Don't call it more than once + * from the same print statement! + */ +const char *dev_path(device_t dev) +{ + static char buffer[DEVICE_PATH_MAX]; + + buffer[0] = '\0'; + if (!dev) { + memcpy(buffer, "<null>", 7); + } else { + switch(dev->path.type) { + case DEVICE_PATH_ROOT: + memcpy(buffer, "Root Device", 12); + break; + case DEVICE_PATH_PCI: +#if CONFIG_PCI_BUS_SEGN_BITS + sprintf(buffer, "PCI: %04x:%02x:%02x.%01x", + dev->bus->secondary >> 8, + dev->bus->secondary & 0xff, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#else + sprintf(buffer, "PCI: %02x:%02x.%01x", + dev->bus->secondary, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#endif + break; + case DEVICE_PATH_PNP: + sprintf(buffer, "PNP: %04x.%01x", + dev->path.pnp.port, dev->path.pnp.device); + break; + case DEVICE_PATH_I2C: + sprintf(buffer, "I2C: %02x:%02x", + dev->bus->secondary, + dev->path.i2c.device); + break; + case DEVICE_PATH_APIC: + sprintf(buffer, "APIC: %02x", + dev->path.apic.apic_id); + break; + case DEVICE_PATH_IOAPIC: + sprintf(buffer, "IOAPIC: %02x", + dev->path.ioapic.ioapic_id); + break; + case DEVICE_PATH_DOMAIN: + sprintf(buffer, "DOMAIN: %04x", + dev->path.domain.domain); + break; + case DEVICE_PATH_CPU_CLUSTER: + sprintf(buffer, "CPU_CLUSTER: %01x", + dev->path.cpu_cluster.cluster); + break; + case DEVICE_PATH_CPU: + sprintf(buffer, "CPU: %02x", dev->path.cpu.id); + break; + case DEVICE_PATH_CPU_BUS: + sprintf(buffer, "CPU_BUS: %02x", dev->path.cpu_bus.id); + break; + default: + printf("Unknown device path type: %d\n", + dev->path.type); + break; + } + } + return buffer; +} + + +void show_devs_tree(struct device *dev, int debug_level, int depth, int linknum) +{ + char depth_str[20] = ""; + int i; + struct device *sibling; + struct bus *link; + + for (i = 0; i < depth; i++) + depth_str[i] = ' '; + depth_str[i] = '\0'; + + printf( "%s%s: enabled %d\n", + depth_str, dev_path(dev), dev->enabled); + + for (link = dev->link_list; link; link = link->next) { + for (sibling = link->children; sibling; + sibling = sibling->sibling) + show_devs_tree(sibling, debug_level, depth + 1, i); + } +} + +void show_all_devs_tree(int debug_level, const char *msg) +{ + /* Bail if not printing to screen. */ + if (!printf( "Show all devs in tree form...%s\n", msg)) + return; + show_devs_tree(all_devices, debug_level, 0, -1); +} + +void show_devs_subtree(struct device *root, int debug_level, const char *msg) +{ + /* Bail if not printing to screen. */ + if (!printf( "Show all devs in subtree %s...%s\n", + dev_path(root), msg)) + return; + printf( "%s\n", msg); + show_devs_tree(root, debug_level, 0, -1); +} + +void show_all_devs(int debug_level, const char *msg) +{ + struct device *dev; + + /* Bail if not printing to screen. */ + printf("Show all devs...%s\n", msg); + for (dev = all_devices; dev; dev = dev->next) { + printf( "%s: enabled %d\n", + dev_path(dev), dev->enabled); + } +} + +main() +{ + show_all_devs(1, ""); + show_all_devs_tree(1, ""); + +} + +/* + * Example: (yank this and paste into M-x compile in emacs) + * or tail -2 showdt.c | head -1 |sh + * or whatever. + cc -I ../src -I ../src/include -I ../src/arch/armv7/include/ -include build/mainboard/google/snow/static.c showdt.c +*/

1 0

Patch set updated for coreboot: a70fd76 Show the device tree.
by Ronald G. Minnich 16 Mar '13

16 Mar '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2767 -gerrit commit a70fd76c5043ef36d20187f72e6a64fe0f1866fe Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Mar 15 15:57:13 2013 -0700 Show the device tree. This is a bit of a hack but it's very handy. It compiles in your static.c and then shows what coreboot would see when it is run. It uses your static.c and functions pulled from src/device/device_util.c. I've already used it to debug problems with the snow device tree. I'm waiting someone to tell me this is already written :-) Change-Id: Ia8c8a5d08d8757bec49eaf70473efa701bc56581 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- util/showdevicetree/showdt.c | 167 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/util/showdevicetree/showdt.c b/util/showdevicetree/showdt.c new file mode 100644 index 0000000..2e3f9de --- /dev/null +++ b/util/showdevicetree/showdt.c @@ -0,0 +1,167 @@ +/* + * Compile and dump the device tree + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ +#include <stdio.h> +/* you can't include string.h due to conflicts with coreboot prototypes. */ +void *memcpy(void *m1, void *m2, size_t s); + +struct device_operations default_dev_ops_root = { + .read_resources = NULL, + .set_resources = NULL, + .enable_resources = NULL, + .init = NULL, + .scan_bus = NULL, + .reset_bus = NULL, +}; + +extern struct device dev_root; +struct device *all_devices = &dev_root; + +const char mainboard_name[] = "showdt"; + +/* + * Warning: This function uses a static buffer. Don't call it more than once + * from the same print statement! + */ +const char *dev_path(device_t dev) +{ + static char buffer[DEVICE_PATH_MAX]; + + buffer[0] = '\0'; + if (!dev) { + memcpy(buffer, "<null>", 7); + } else { + switch(dev->path.type) { + case DEVICE_PATH_ROOT: + memcpy(buffer, "Root Device", 12); + break; + case DEVICE_PATH_PCI: +#if CONFIG_PCI_BUS_SEGN_BITS + sprintf(buffer, "PCI: %04x:%02x:%02x.%01x", + dev->bus->secondary >> 8, + dev->bus->secondary & 0xff, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#else + sprintf(buffer, "PCI: %02x:%02x.%01x", + dev->bus->secondary, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#endif + break; + case DEVICE_PATH_PNP: + sprintf(buffer, "PNP: %04x.%01x", + dev->path.pnp.port, dev->path.pnp.device); + break; + case DEVICE_PATH_I2C: + sprintf(buffer, "I2C: %02x:%02x", + dev->bus->secondary, + dev->path.i2c.device); + break; + case DEVICE_PATH_APIC: + sprintf(buffer, "APIC: %02x", + dev->path.apic.apic_id); + break; + case DEVICE_PATH_IOAPIC: + sprintf(buffer, "IOAPIC: %02x", + dev->path.ioapic.ioapic_id); + break; + case DEVICE_PATH_DOMAIN: + sprintf(buffer, "DOMAIN: %04x", + dev->path.domain.domain); + break; + case DEVICE_PATH_CPU_CLUSTER: + sprintf(buffer, "CPU_CLUSTER: %01x", + dev->path.cpu_cluster.cluster); + break; + case DEVICE_PATH_CPU: + sprintf(buffer, "CPU: %02x", dev->path.cpu.id); + break; + case DEVICE_PATH_CPU_BUS: + sprintf(buffer, "CPU_BUS: %02x", dev->path.cpu_bus.id); + break; + default: + printf("Unknown device path type: %d\n", + dev->path.type); + break; + } + } + return buffer; +} + + +void show_devs_tree(struct device *dev, int debug_level, int depth, int linknum) +{ + char depth_str[20] = ""; + int i; + struct device *sibling; + struct bus *link; + + for (i = 0; i < depth; i++) + depth_str[i] = ' '; + depth_str[i] = '\0'; + + printf("%s%s: enabled %d\n", + depth_str, dev_path(dev), dev->enabled); + + for (link = dev->link_list; link; link = link->next) { + for (sibling = link->children; sibling; + sibling = sibling->sibling) + show_devs_tree(sibling, debug_level, depth + 1, i); + } +} + +void show_all_devs_tree(int debug_level, const char *msg) +{ + printf("Show all devs in tree form...%s\n", msg); + + show_devs_tree(all_devices, debug_level, 0, -1); +} + +void show_devs_subtree(struct device *root, int debug_level, const char *msg) +{ + printf("Show all devs in subtree %s...%s\n", + dev_path(root), msg); + + printf("%s\n", msg); + show_devs_tree(root, debug_level, 0, -1); +} + +void show_all_devs(int debug_level, const char *msg) +{ + struct device *dev; + + printf("Show all devs...%s\n", msg); + for (dev = all_devices; dev; dev = dev->next) { + printf("%s: enabled %d\n", + dev_path(dev), dev->enabled); + } +} + +main() +{ + show_all_devs(1, ""); + show_all_devs_tree(1, ""); +} + +/* + * Example: (yank this and paste into M-x compile in emacs) + * or tail -2 showdt.c | head -1 |sh + * or whatever. + cc -I ../src -I ../src/include -I ../src/arch/armv7/include/ -include build/mainboard/google/snow/static.c showdt.c +*/

1 0

Patch set updated for coreboot: 373397a Show the device tree.
by Patrick Georgi 16 Mar '13

16 Mar '13

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2767 -gerrit commit 373397a52102607ed29848963de6c47edd568a4a Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Mar 15 15:57:13 2013 -0700 Show the device tree. This is a bit of a hack but it's very handy. It compiles in your static.c and then shows what coreboot would see when it is run. It uses your static.c and functions pulled from src/device/device_util.c. I've already used it to debug problems with the snow device tree. I'm waiting someone to tell me this is already written :-) Change-Id: Ia8c8a5d08d8757bec49eaf70473efa701bc56581 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- util/showdevicetree/showdt.c | 153 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/util/showdevicetree/showdt.c b/util/showdevicetree/showdt.c new file mode 100644 index 0000000..2c77f79 --- /dev/null +++ b/util/showdevicetree/showdt.c @@ -0,0 +1,153 @@ +#include <stdio.h> +/* you can't include string.h due to conflicts with coreboot prototypes. */ +void *memcpy(void *m1, void *m2, size_t s); + +struct device_operations default_dev_ops_root = { + .read_resources = NULL, + .set_resources = NULL, + .enable_resources = NULL, + .init = NULL, + .scan_bus = NULL, + .reset_bus = NULL, +}; + +extern struct device dev_root; +struct device *all_devices = &dev_root; + +const char mainboard_name[] = "showdt"; + +/* + * Warning: This function uses a static buffer. Don't call it more than once + * from the same print statement! + */ +const char *dev_path(device_t dev) +{ + static char buffer[DEVICE_PATH_MAX]; + + buffer[0] = '\0'; + if (!dev) { + memcpy(buffer, "<null>", 7); + } else { + switch(dev->path.type) { + case DEVICE_PATH_ROOT: + memcpy(buffer, "Root Device", 12); + break; + case DEVICE_PATH_PCI: +#if CONFIG_PCI_BUS_SEGN_BITS + sprintf(buffer, "PCI: %04x:%02x:%02x.%01x", + dev->bus->secondary >> 8, + dev->bus->secondary & 0xff, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#else + sprintf(buffer, "PCI: %02x:%02x.%01x", + dev->bus->secondary, + PCI_SLOT(dev->path.pci.devfn), + PCI_FUNC(dev->path.pci.devfn)); +#endif + break; + case DEVICE_PATH_PNP: + sprintf(buffer, "PNP: %04x.%01x", + dev->path.pnp.port, dev->path.pnp.device); + break; + case DEVICE_PATH_I2C: + sprintf(buffer, "I2C: %02x:%02x", + dev->bus->secondary, + dev->path.i2c.device); + break; + case DEVICE_PATH_APIC: + sprintf(buffer, "APIC: %02x", + dev->path.apic.apic_id); + break; + case DEVICE_PATH_IOAPIC: + sprintf(buffer, "IOAPIC: %02x", + dev->path.ioapic.ioapic_id); + break; + case DEVICE_PATH_DOMAIN: + sprintf(buffer, "DOMAIN: %04x", + dev->path.domain.domain); + break; + case DEVICE_PATH_CPU_CLUSTER: + sprintf(buffer, "CPU_CLUSTER: %01x", + dev->path.cpu_cluster.cluster); + break; + case DEVICE_PATH_CPU: + sprintf(buffer, "CPU: %02x", dev->path.cpu.id); + break; + case DEVICE_PATH_CPU_BUS: + sprintf(buffer, "CPU_BUS: %02x", dev->path.cpu_bus.id); + break; + default: + printf("Unknown device path type: %d\n", + dev->path.type); + break; + } + } + return buffer; +} + + +void show_devs_tree(struct device *dev, int debug_level, int depth, int linknum) +{ + char depth_str[20] = ""; + int i; + struct device *sibling; + struct bus *link; + + for (i = 0; i < depth; i++) + depth_str[i] = ' '; + depth_str[i] = '\0'; + + printf( "%s%s: enabled %d\n", + depth_str, dev_path(dev), dev->enabled); + + for (link = dev->link_list; link; link = link->next) { + for (sibling = link->children; sibling; + sibling = sibling->sibling) + show_devs_tree(sibling, debug_level, depth + 1, i); + } +} + +void show_all_devs_tree(int debug_level, const char *msg) +{ + /* Bail if not printing to screen. */ + if (!printf( "Show all devs in tree form...%s\n", msg)) + return; + show_devs_tree(all_devices, debug_level, 0, -1); +} + +void show_devs_subtree(struct device *root, int debug_level, const char *msg) +{ + /* Bail if not printing to screen. */ + if (!printf( "Show all devs in subtree %s...%s\n", + dev_path(root), msg)) + return; + printf( "%s\n", msg); + show_devs_tree(root, debug_level, 0, -1); +} + +void show_all_devs(int debug_level, const char *msg) +{ + struct device *dev; + + /* Bail if not printing to screen. */ + printf("Show all devs...%s\n", msg); + for (dev = all_devices; dev; dev = dev->next) { + printf( "%s: enabled %d\n", + dev_path(dev), dev->enabled); + } +} + +main() +{ + show_all_devs(1, ""); + show_all_devs_tree(1, ""); + +} + +/* + * Example: (yank this and paste into M-x compile in emacs) + * or tail -2 showdt.c | head -1 |sh + * or whatever. + cc -I ../src -I ../src/include -I ../src/arch/armv7/include/ -include build/mainboard/google/snow/static.c showdt.c +*/

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
79
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 March 2013