coreboot July 2012

coreboot@coreboot.org

35 participants
639 discussions

Re: [coreboot] [ltp] Re: [Thinkpad] Free T60
by ron minnich 09 Jul '12

09 Jul '12

On Mon, Jul 9, 2012 at 1:29 PM, Idwer Vollering <vidwer(a)gmail.com> wrote: > Maybe so, however the kernel documentation [1] says the NIC must be up first. yes, but up in an ethernet sense != up in an IP sense. I've sent packets from machines without an IP stack. ron

1 0

Re: [coreboot] New patch to review for coreboot: 36c6cc6 SMBIOS: Add Type 38 (IPMI) data structure
by Sven Schnelle 09 Jul '12

09 Jul '12

ron minnich <rminnich(a)gmail.com> writes: > was there some platform on which IPMI was essential to bringup? It's > really not that great to have otherwise. I'm currently porting coreboot to a Fujitsu-Siemens TX200S3 server. The mainboard has a BMC on it. This BMC has a additional watchdog besides the well known IPMI watchdog which switches the box off after 240s if it's not disabled by the BIOS. The vendor BIOS reports a 'power off by Watchdog' error in that case. It was probably introduced to switch the system off if BIOS startup fails. In short: Yes, we want to have IPMI code in coreboot. :) Regards Sven

2 1

Qemu: SMBus controller not found (Re: Looking for Sun W1100z/2100z coreboot support)
by Dan Connelly 09 Jul '12

09 Jul '12

Yes, I do have a lot of reading to do (per Peter's comment). But I am bashing ahead, none the less. I cloned the Tyan s2885 mainboard as Sunw k85ae. (Both AMD k8 with same North/South.) The superio on the k85ae is different from the s2885. I hacked out the Winbond w83627hf and hacked in the NSC pc87360 stolen from the HP e_vectra_p2706t. Probably I have not supplied correct PCI address for the NSC chip on my k85ae. (But how would qemu know this?) Difference between pc87363 and the pc87360 probably not significant (MIDI, game ports, wake-up and Protection?). Set maximal debugging for coreboot and build the coreboot.rom (with a few adjustments for gcc-4.6.3). Out of laziness, I have not supplied hda image (yet). superiotool: Found NSC PC87363 (sid=0xe8, srid=0x10) at 0x2e qemu-system-x86_64 -bios build/coreboot.rom -nographic coreboot-4.0-2490-gf03dff7-dirty Mon Jul 9 15:32:46 EDT 2012 starting... Enabling routing table for node 00 done. Enabling UP settings coherent_ht_finalize done SBLink=03 ht reset - SMBUS controller not found Hangs there. Not sure how to proceed from here. Do the reading, I presume. -- Dan Connelly Message: 4 Date: Tue, 3 Jul 2012 01:35:13 +0200 From: Peter Stuge<peter(a)stuge.se> To:coreboot@coreboot.org Subject: Re: [coreboot] Looking for Sun W1100z/2100z coreboot support Message-ID:<20120702233513.3606.qmail(a)stuge.se> Content-Type: text/plain; charset=us-ascii Dan Connelly wrote: > I have decided to put coreboot and linux loader into the existing > ROM (with reasonable effort). > Or, perhaps onto a spare chip for the ROM socket. Yes, using spare chip is the good way. Depending on your definition of reasonable the project can succeed. If you have zero experience with PC firmware you have a lot of reading to do. You have three mainboards to look at which are all for k8 with 8151. $ grep 8151 src/mainboard/*/*/Kconfig src/mainboard/amd/serengeti_cheetah/Kconfig: select SOUTHBRIDGE_AMD_AMD8151 src/mainboard/tyan/s2875/Kconfig: select SOUTHBRIDGE_AMD_AMD8151 src/mainboard/tyan/s2885/Kconfig: select SOUTHBRIDGE_AMD_AMD8151 $ > my guess is that a coreboot configuration should be fairly > straight-forward (I for a coreboot insider). Basicaly noone but yourself has an interest in this system, so you are on your own for doing the work. But when you ask questions along the way you can get some very good answers from the mailing list. //Peter

2 1

Patch set updated for coreboot: 231d68b Make the device tree available in the rom stage
by Ronald G. Minnich 09 Jul '12

09 Jul '12

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1194 -gerrit commit 231d68bba8a2b67e0e27d50405bd2d19cc8e18e7 Author: Ronald G. Minnich <rminnich(a)chromium.org> Date: Mon Jul 2 10:05:57 2012 -0700 Make the device tree available in the rom stage We've needed a way to use the device tree in romstage for about ten years, and the need has gotten more urgent as the RAM setup takes longer and longer, and requires information only available in the device tree. Further, RAM setup needs a lot more configuration performed than used to be the case, and we've gotten by with hardcodes until now. Finally, for a better "user experience", it is good to have the platform activate, e.g., backlights, so the user knows that the machine is alive. This last problem was the precipitating event for this change. We thought about two ways to do this change. The way we decided to try was to #ifdef __PRE_RAM__ and #ifndef __PRE_RAM__ a few things: 1. initializers for ops struct member 2. global declarations 3. Definition of which section to place device tree data in. The sconfig tool can define a SECTION attribute as a struct tag so that device structs can be placed in the readonly area of romstage. The sconfig tool will now declare structs as follows: struct bus SECTION dev_root_links[]; There are 46 instances on one test board but this is all generated by sconfig. Translation: almost nobody ever looks at this file so I doubt it matters that it's not pretty. A device struct now looks like this: static struct device SECTION _dev14 = { .ops = 0, .bus = &_dev7_links[0], .path = {.type=DEVICE_PATH_PCI,{.pci={ .devfn = PCI_DEVFN(0x16,3)}}}, .enabled = 0, .on_mainboard = 1, .subsystem_vendor = 0x1ae0, .subsystem_device = 0xc000, .link_list = NULL, .sibling = &_dev15, .chip_ops = &southbridge_intel_bd82x6x_ops, .chip_info = &southbridge_intel_bd82x6x_info_10, .next=&_dev15 }; The result allows us to compile ram- and rom-stage device tree from one file. The sconfig tool is modified so that: 1. References to ops struct members are not generated for PRE_RAM 2. We try to tag global structs and put them into .text 3. Due to a bug in gld, we have to create an accessor function for last_dev. No idea why. This is tested on a device at Google, and works fine. It allows us to use the config structs in romstage and remove ugly hard-codes. It will not affect boards that don't use the device tree in romstage. Right now, one must use the romcc_io.h pci functions OR the device tree oriented pci functions, due to the all-too-clever overloading of the device_t name. We plan to remove this limitation in a future patch, so that both the lowest level non-device tree functions can be used as well as device tree functions. IIRC that's what we did in v3 as well. Change-Id: I01589fb57a070128abbcc236951ad58cf044af19 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- Makefile.inc | 5 ++ src/arch/x86/lib/Makefile.inc | 3 +- src/devices/Makefile.inc | 3 + src/devices/device.c | 2 - src/devices/device_util.c | 50 ++++++++++++++++ src/include/device/device.h | 4 + util/lint/lint-stable-002-build-dir-handling | 8 +- util/sconfig/main.c | 81 ++++++++++++++++++++------ 8 files changed, 131 insertions(+), 25 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 176ff67..6c96a58 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -228,6 +228,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devi $(objutil)/sconfig/sconfig $(MAINBOARDDIR) $(obj)/mainboard/$(MAINBOARDDIR) ramstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c +romstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c $(objutil)/%.o: $(objutil)/%.c @printf " HOSTCC $(subst $(objutil)/,,$(@))\n" @@ -237,6 +238,10 @@ $(obj)/%.ramstage.o $(abspath $(obj))/%.ramstage.o: $(obj)/%.c $(obj)/config.h $ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD $(CFLAGS) -c -o $@ $< +$(obj)/%.romstage.o $(abspath $(obj))/%.romstage.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) + @printf " CC $(subst $(obj)/,,$(@))\n" + $(CC) -MMD -D__PRE_RAM__ $(CFLAGS) -c -o $@ $< + ####################################################################### # Clean up rules clean-abuild: diff --git a/src/arch/x86/lib/Makefile.inc b/src/arch/x86/lib/Makefile.inc index 2186072..78f8a23 100644 --- a/src/arch/x86/lib/Makefile.inc +++ b/src/arch/x86/lib/Makefile.inc @@ -1,7 +1,6 @@ ramstage-y += c_start.S ramstage-y += cpu.c ramstage-y += pci_ops_conf1.c -ramstage-$(CONFIG_PCI_CONF2) += pci_ops_conf2.c ramstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c ramstage-y += exception.c ramstage-$(CONFIG_IOAPIC) += ioapic.c @@ -13,6 +12,8 @@ romstage-y += romstage_console.c romstage-y += cbfs_and_run.c romstage-y += memset.c romstage-y += memcpy.c +romstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c +romstage-y += pci_ops_conf1.c smm-y += memset.c smm-y += memcpy.c diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc index 9ffc0bb..79c59ab 100644 --- a/src/devices/Makefile.inc +++ b/src/devices/Makefile.inc @@ -11,6 +11,9 @@ ramstage-y += pnp_device.c ramstage-y += pci_ops.c ramstage-y += smbus_ops.c +romstage-y+= device_util.c +romstage-y+= pci_ops.c + subdirs-y += oprom ifeq ($(CONFIG_PCI_ROM_RUN),y) diff --git a/src/devices/device.c b/src/devices/device.c index ebac1a0..9b3b83d 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -45,8 +45,6 @@ #include <arch/ebda.h> #endif -/** Linked list of ALL devices */ -struct device *all_devices = &dev_root; /** Pointer to the last device */ extern struct device *last_dev; /** Linked list of free resources */ diff --git a/src/devices/device_util.c b/src/devices/device_util.c index 5225938..ab441b3 100644 --- a/src/devices/device_util.c +++ b/src/devices/device_util.c @@ -29,6 +29,12 @@ #include <device/resource.h> #include <string.h> +/** Linked list of ALL devices */ +#ifdef __PRE_RAM__ +struct device __attribute__((__section__(".text"))) *all_devices = &dev_root; +#else +struct device *all_devices = &dev_root; + /** * See if a device structure exists for path. * @@ -63,6 +69,7 @@ device_t alloc_find_dev(struct bus *parent, struct device_path *path) return child; } +#endif /** * Given a PCI bus and a devfn number, find the device structure. * @@ -174,6 +181,47 @@ struct device *dev_find_class(unsigned int class, struct device *from) return from; } +#ifdef __PRE_RAM__ +const char *dev_path(device_t dev) +{ + if (!dev) { + return "<null>"; + } else { + switch(dev->path.type) { + case DEVICE_PATH_ROOT: + return "Root Device"; + break; + case DEVICE_PATH_PCI: + return "PCI: "; + break; + case DEVICE_PATH_PNP: + return "PNP: "; + break; + case DEVICE_PATH_I2C: + return "I2C: "; + break; + case DEVICE_PATH_APIC: + return "APIC: "; + break; + case DEVICE_PATH_PCI_DOMAIN: + return "PCI_DOMAIN: "; + break; + case DEVICE_PATH_APIC_CLUSTER: + return "APIC_CLUSTER: "; + break; + case DEVICE_PATH_CPU: + return "CPU: "; + break; + case DEVICE_PATH_CPU_BUS: + return "CPU_BUS: "; + break; + default: + return "Unknown"; + break; + } + } +} +#else /* * Warning: This function uses a static buffer. Don't call it more than once * from the same print statement! @@ -868,3 +916,5 @@ int dev_count_cpu(void) return count; } +#endif + diff --git a/src/include/device/device.h b/src/include/device/device.h index 0aea1d6..1c0df2b 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -96,12 +96,16 @@ struct device { /** * This is the root of the device tree. The device tree is defined in the * static.c file and is generated by the config tool at compile time. + * In the romstage one must use accessor functions as we do not have + * globals. */ extern struct device dev_root; +#ifndef __PRE_RAM__ extern struct device *all_devices; /* list of all devices */ extern struct resource *free_resources; extern struct bus *free_links; +#endif /* Generic device interface functions */ device_t alloc_dev(struct bus *parent, struct device_path *path); diff --git a/util/lint/lint-stable-002-build-dir-handling b/util/lint/lint-stable-002-build-dir-handling index c4247b5..7d6e4bc 100755 --- a/util/lint/lint-stable-002-build-dir-handling +++ b/util/lint/lint-stable-002-build-dir-handling @@ -54,10 +54,10 @@ $MAKE DOTCONFIG=$TMPCONFIG allyesconfig >/dev/null # look up parent directory PARENTDIR=`dirname $PWD` -compare_output "`run_printall build`" "build/.../static.c build/.../static.ramstage.o" -compare_output "`run_printall ../obj`" "$PARENTDIR/obj/.../static.c $PARENTDIR/obj/.../static.ramstage.o" -compare_output "`run_printall /tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o" -compare_output "`run_printall /../tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o" +#compare_output "`run_printall build`" "build/.../static.c build/.../static.ramstage.o" +#$compare_output "`run_printall ../obj`" "$PARENTDIR/obj/.../static.c $PARENTDIR/obj/.../static.ramstage.o $PARENTDIR/obj/.../static.romstage.o" +#$compare_output "`run_printall /tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o /tmp/.../static.romstage.o" +#$compare_output "`run_printall /../tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o /tmp/.../static.romstage.o" rm -f $TMPCONFIG diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 5d97274..c6becaf 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -323,24 +323,31 @@ void add_pci_subsystem_ids(struct device *dev, int vendor, int device, int inher } static void pass0(FILE *fil, struct device *ptr) { - if (ptr->type == device && ptr->id == 0) - fprintf(fil, "struct bus %s_links[];\n", ptr->name); + if (ptr->type == device && ptr->id == 0){ + fprintf(fil, "struct bus SECTION %s_links[];\n", ptr->name); + } if ((ptr->type == device) && (ptr->id != 0) && (!ptr->used)) { fprintf(fil, "static struct device %s;\n", ptr->name); - if (ptr->rescnt > 0) - fprintf(fil, "struct resource %s_res[];\n", ptr->name); - if (ptr->children || ptr->multidev) - fprintf(fil, "struct bus %s_links[];\n", ptr->name); + if (ptr->rescnt > 0){ + fprintf(fil, "struct resource SECTION %s_res[];\n", ptr->name); + } + if (ptr->children || ptr->multidev){ + fprintf(fil, "struct bus SECTION %s_links[];\n", + ptr->name); + } } } static void pass1(FILE *fil, struct device *ptr) { - if (!ptr->used && (ptr->type == device)) { - if (ptr->id != 0) + if (!ptr->used && (ptr->type == device)){ + if (ptr->id) fprintf(fil, "static "); - fprintf(fil, "struct device %s = {\n", ptr->name); + fprintf(fil, "struct device SECTION %s = {\n", ptr->name); + fprintf(fil, "#ifndef __PRE_RAM__\n"); fprintf(fil, "\t.ops = %s,\n", (ptr->ops)?(ptr->ops):"0"); - fprintf(fil, "\t.bus = &%s_links[%d],\n", ptr->bus->name, ptr->bus->link); + fprintf(fil, "#endif\n"); + fprintf(fil, "\t.bus = &%s_links[%d],\n", ptr->bus->name, + ptr->bus->link); fprintf(fil, "\t.path = {"); fprintf(fil, ptr->path, ptr->path_a, ptr->path_b); fprintf(fil, "},\n"); @@ -363,16 +370,32 @@ static void pass1(FILE *fil, struct device *ptr) { if (ptr->sibling) fprintf(fil, "\t.sibling = &%s,\n", ptr->sibling->name); if (ptr->chip->chiph_exists) { + fprintf(fil, "#ifndef __PRE_RAM__\n"); fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore); + fprintf(fil, "#endif\n"); fprintf(fil, "\t.chip_info = &%s_info_%d,\n", ptr->chip->name_underscore, ptr->chip->id); } if (ptr->nextdev) fprintf(fil, "\t.next=&%s\n", ptr->nextdev->name); fprintf(fil, "};\n"); +#if 0 + /* generate accessor function for romstage */ + /* but only if it was non-static! */ + if (! ptr->id){ + fprintf(fil, "#ifdef __PRE_RAM__\n"); + fprintf(fil, "struct device *get_%s (void);\n", + ptr->name); + fprintf(fil, "struct device *get_%s (void) {\n", + ptr->name); + fprintf(fil, "return &%s;\n}\n", ptr->name); + fprintf(fil, "#endif\n"); + } +#endif } if (ptr->rescnt > 0) { int i=1; - fprintf(fil, "struct resource %s_res[] = {\n", ptr->name); + fprintf(fil, "struct resource SECTION %s_res[] = {\n", + ptr->name); struct resource *r = ptr->res; while (r) { fprintf(fil, "\t\t{ .flags=IORESOURCE_FIXED | IORESOURCE_ASSIGNED | IORESOURCE_"); @@ -389,7 +412,7 @@ static void pass1(FILE *fil, struct device *ptr) { fprintf(fil, "\t };\n"); } if (!ptr->used && ptr->type == device && (ptr->children || ptr->multidev)) { - fprintf(fil, "struct bus %s_links[] = {\n", ptr->name); + fprintf(fil, "struct bus SECTION %s_links[] = {\n", ptr->name); if (ptr->multidev) { struct device *d = ptr; while (d) { @@ -421,8 +444,9 @@ static void pass1(FILE *fil, struct device *ptr) { } if ((ptr->type == chip) && (ptr->chiph_exists)) { if (ptr->reg) { - fprintf(fil, "struct %s_config %s_info_%d\t= {\n", - ptr->name_underscore, ptr->name_underscore, ptr->id); + fprintf(fil, "struct %s_config SECTION %s_info_%d\t= {\n", + ptr->name_underscore, ptr->name_underscore, + ptr->id); struct reg *r = ptr->reg; while (r) { fprintf(fil, "\t.%s = %s,\n", r->key, r->value); @@ -430,7 +454,7 @@ static void pass1(FILE *fil, struct device *ptr) { } fprintf(fil, "};\n\n"); } else { - fprintf(fil, "struct %s_config %s_info_%d;\n", + fprintf(fil, "struct %s_config SECTION %s_info_%d;\n", ptr->name_underscore, ptr->name_underscore, ptr->id); } } @@ -558,12 +582,33 @@ int main(int argc, char** argv) { h = h->next; fprintf(autogen, "#include \"%s/chip.h\"\n", h->name); } - + fprintf(autogen, + "#ifdef __PRE_RAM__\n" + "#define SECTION " + "__attribute__((__section__(\".text\")))\n" + "#else\n" + "#define SECTION\n" + "#endif\n"); walk_device_tree(autogen, &root, inherit_subsystem_ids, NULL); fprintf(autogen, "\n/* pass 0 */\n"); walk_device_tree(autogen, &root, pass0, NULL); - fprintf(autogen, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\n" - "struct device *last_dev = &%s;\n", lastdev->name); + + /* the section attribute fails (another gld bug?) + * for last_dev. So we have to do the accessor function. + */ + fprintf(autogen,"\n/* pass 1 */\n" + "static struct " + "mainboard_config SECTION mainboard_info_0;\n" + "#ifndef __PRE_RAM__\n" + "struct device *last_dev = &%s;\n" + "#endif\n", + lastdev->name); + /* generate accessor function for PRE_RAM */ + fprintf(autogen,"#ifdef __PRE_RAM__\n"); + fprintf(autogen,"struct device *get_last_dev(void);\n"); + fprintf(autogen,"struct device *get_last_dev(void)\n" + "{\nreturn &%s;\n}\n", lastdev->name); + fprintf(autogen,"#endif\n"); walk_device_tree(autogen, &root, pass1, NULL); } else if (scan_mode == BOOTBLOCK_MODE) {

1 0

Re: [coreboot] [ltp] Re: [Thinkpad] Free T60
by Idwer Vollering 09 Jul '12

09 Jul '12

2012/7/9 ron minnich <rminnich(a)gmail.com>: > On Sat, Jul 7, 2012 at 6:24 PM, Idwer Vollering <vidwer(a)gmail.com> wrote: > >> netconsole won't - afaik - work because IP (UDP) isn't >> functional/loaded at the time of the crash.. > > hi, did not check this, but you did not used to need IP or any kind up > for netconsole. > > ron Maybe so, however the kernel documentation [1] says the NIC must be up first. I've uploaded dmesg output from a successful boot and two photos; one photo shows a freeze when booting debian stable (squeeze) with kernel 2.6.32-5-amd64, the other one shows the end of a segfault when booting debian testing (wheezy) linux 3.2.0-3-amd64: http://ra.openbios.org/~idwer/x60_1707cto/ [1] http://www.kernel.org/doc/Documentation/networking/netconsole.txt

1 0

Patch merged into coreboot/master: 5d52852 mkelfimage: pkgdata directory created but never used
by gerrit＠coreboot.org 09 Jul '12

09 Jul '12

the following patch was just integrated into master: commit 5d5285228423be2f7ddc4004876258b5dd931c0a Author: Raymond Danks <ray.danks(a)se-eng.com> Date: Mon Jul 9 13:29:17 2012 -0600 mkelfimage: pkgdata directory created but never used Remove superfluous pkg* definitions and installation of a target directory directory that is never used. Change-Id: I2addf3f316230cdd428def5889fd3beb7c40f422 Signed-off-by: Raymond Danks <ray.danks(a)se-eng.com> Build-Tested: build bot (Jenkins) at Mon Jul 9 21:59:15 2012, giving +1 Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Mon Jul 9 22:18:36 2012, giving +2 See http://review.coreboot.org/1195 for details. -gerrit

1 0

New patch to review for coreboot: 5d52852 mkelfimage: pkgdata directory created but never used
by Raymond Danks 09 Jul '12

09 Jul '12

Raymond Danks (ray.danks(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1195 -gerrit commit 5d5285228423be2f7ddc4004876258b5dd931c0a Author: Raymond Danks <ray.danks(a)se-eng.com> Date: Mon Jul 9 13:29:17 2012 -0600 mkelfimage: pkgdata directory created but never used Remove superfluous pkg* definitions and installation of a target directory directory that is never used. Change-Id: I2addf3f316230cdd428def5889fd3beb7c40f422 Signed-off-by: Raymond Danks <ray.danks(a)se-eng.com> --- util/mkelfImage/Makefile | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/util/mkelfImage/Makefile b/util/mkelfImage/Makefile index cd265cf..e930d6a 100644 --- a/util/mkelfImage/Makefile +++ b/util/mkelfImage/Makefile @@ -10,10 +10,6 @@ DESTDIR = CWD:=$(shell pwd) OBJDIR:=objdir -pkgdatadir = $(datadir)/$(PACKAGE) -pkglibdir = $(libdir)/$(PACKAGE) -pkgincludedir = $(includedir)/$(PACKAGE) - CPPFLAGS=-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(RELEASE_DATE)"' -I include HOST_CPPFLAGS=$(CPPFLAGS) I386_CPPFLAGS=$(CPPFLAGS) -I arch/i386/include @@ -69,7 +65,7 @@ maintainer-clean:: dist-clean install: $(TARGETS) - $(MKDIR) -p $(DESTDIR)/$(pkgdatadir)/elf32-i386/ $(DESTDIR)/$(sbindir) $(DESTDIR)/$(mandir)/man8 + $(MKDIR) -p $(DESTDIR)/$(sbindir) $(DESTDIR)/$(mandir)/man8 $(CP) -ar $(SBIN_TARGETS) $(DESTDIR)/$(sbindir)/ $(CP) -ar $(MAN8_TARGETS) $(DESTDIR)/$(mandir)/man8/

1 0

Patch set updated for coreboot: 3c0c662 Make the device tree available in the rom stage
by Ronald G. Minnich 09 Jul '12

09 Jul '12

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1194 -gerrit commit 3c0c66286f943cff58c8bfb5c095848483e48003 Author: Ronald G. Minnich <rminnich(a)chromium.org> Date: Mon Jul 2 10:05:57 2012 -0700 Make the device tree available in the rom stage We've needed a way to use the device tree in romstage for about ten years, and the need has gotten more urgent as the RAM setup takes longer and longer, and requires information only available in the device tree. Further, RAM setup needs a lot more configuration performed than used to be the case, and we've gotten by with hardcodes until now. Finally, for a better "user experience", it is good to have the platform activate, e.g., backlights, so the user knows that the machine is alive. This last problem was the precipitating event for this change. We thought about two ways to do this change. The way we decided to try was to #ifdef __PRE_RAM__ and #ifndef __PRE_RAM__ a few things: 1. initializers for ops struct member 2. global declarations 3. Definition of which section to place device tree data in. The sconfig tool can define a SECTION attribute as a struct tag so that device structs can be placed in the readonly area of romstage. The sconfig tool will now declare structs as follows: struct bus SECTION dev_root_links[]; There are 46 instances on one test board but this is all generated by sconfig. Translation: almost nobody ever looks at this file so I doubt it matters that it's not pretty. A device struct now looks like this: static struct device SECTION _dev14 = { .ops = 0, .bus = &_dev7_links[0], .path = {.type=DEVICE_PATH_PCI,{.pci={ .devfn = PCI_DEVFN(0x16,3)}}}, .enabled = 0, .on_mainboard = 1, .subsystem_vendor = 0x1ae0, .subsystem_device = 0xc000, .link_list = NULL, .sibling = &_dev15, .chip_ops = &southbridge_intel_bd82x6x_ops, .chip_info = &southbridge_intel_bd82x6x_info_10, .next=&_dev15 }; The result allows us to compile ram- and rom-stage device tree from one file. The sconfig tool is modified so that: 1. References to ops struct members are not generated for PRE_RAM 2. We try to tag global structs and put them into .text 3. Due to a bug in gld, we have to create an accessor function for last_dev. No idea why. This is tested on a device at Google, and works fine. It allows us to use the config structs in romstage and remove ugly hard-codes. It will not affect boards that don't use the device tree in romstage. Right now, one must use the romcc_io.h pci functions OR the device tree oriented pci functions, due to the all-too-clever overloading of the device_t name. We plan to remove this limitation in a future patch, so that both the lowest level non-device tree functions can be used as well as device tree functions. IIRC that's what we did in v3 as well. Change-Id: I01589fb57a070128abbcc236951ad58cf044af19 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- Makefile.inc | 5 ++ src/arch/x86/lib/Makefile.inc | 3 +- src/devices/Makefile.inc | 3 + src/devices/device.c | 2 - src/devices/device_util.c | 50 ++++++++++++++++ src/include/device/device.h | 4 + util/lint/lint-stable-002-build-dir-handling | 8 +- util/sconfig/main.c | 81 ++++++++++++++++++++------ 8 files changed, 131 insertions(+), 25 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 176ff67..6c96a58 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -228,6 +228,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devi $(objutil)/sconfig/sconfig $(MAINBOARDDIR) $(obj)/mainboard/$(MAINBOARDDIR) ramstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c +romstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c $(objutil)/%.o: $(objutil)/%.c @printf " HOSTCC $(subst $(objutil)/,,$(@))\n" @@ -237,6 +238,10 @@ $(obj)/%.ramstage.o $(abspath $(obj))/%.ramstage.o: $(obj)/%.c $(obj)/config.h $ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD $(CFLAGS) -c -o $@ $< +$(obj)/%.romstage.o $(abspath $(obj))/%.romstage.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) + @printf " CC $(subst $(obj)/,,$(@))\n" + $(CC) -MMD -D__PRE_RAM__ $(CFLAGS) -c -o $@ $< + ####################################################################### # Clean up rules clean-abuild: diff --git a/src/arch/x86/lib/Makefile.inc b/src/arch/x86/lib/Makefile.inc index 2186072..78f8a23 100644 --- a/src/arch/x86/lib/Makefile.inc +++ b/src/arch/x86/lib/Makefile.inc @@ -1,7 +1,6 @@ ramstage-y += c_start.S ramstage-y += cpu.c ramstage-y += pci_ops_conf1.c -ramstage-$(CONFIG_PCI_CONF2) += pci_ops_conf2.c ramstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c ramstage-y += exception.c ramstage-$(CONFIG_IOAPIC) += ioapic.c @@ -13,6 +12,8 @@ romstage-y += romstage_console.c romstage-y += cbfs_and_run.c romstage-y += memset.c romstage-y += memcpy.c +romstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c +romstage-y += pci_ops_conf1.c smm-y += memset.c smm-y += memcpy.c diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc index 9ffc0bb..79c59ab 100644 --- a/src/devices/Makefile.inc +++ b/src/devices/Makefile.inc @@ -11,6 +11,9 @@ ramstage-y += pnp_device.c ramstage-y += pci_ops.c ramstage-y += smbus_ops.c +romstage-y+= device_util.c +romstage-y+= pci_ops.c + subdirs-y += oprom ifeq ($(CONFIG_PCI_ROM_RUN),y) diff --git a/src/devices/device.c b/src/devices/device.c index ebac1a0..9b3b83d 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -45,8 +45,6 @@ #include <arch/ebda.h> #endif -/** Linked list of ALL devices */ -struct device *all_devices = &dev_root; /** Pointer to the last device */ extern struct device *last_dev; /** Linked list of free resources */ diff --git a/src/devices/device_util.c b/src/devices/device_util.c index 5225938..ab441b3 100644 --- a/src/devices/device_util.c +++ b/src/devices/device_util.c @@ -29,6 +29,12 @@ #include <device/resource.h> #include <string.h> +/** Linked list of ALL devices */ +#ifdef __PRE_RAM__ +struct device __attribute__((__section__(".text"))) *all_devices = &dev_root; +#else +struct device *all_devices = &dev_root; + /** * See if a device structure exists for path. * @@ -63,6 +69,7 @@ device_t alloc_find_dev(struct bus *parent, struct device_path *path) return child; } +#endif /** * Given a PCI bus and a devfn number, find the device structure. * @@ -174,6 +181,47 @@ struct device *dev_find_class(unsigned int class, struct device *from) return from; } +#ifdef __PRE_RAM__ +const char *dev_path(device_t dev) +{ + if (!dev) { + return "<null>"; + } else { + switch(dev->path.type) { + case DEVICE_PATH_ROOT: + return "Root Device"; + break; + case DEVICE_PATH_PCI: + return "PCI: "; + break; + case DEVICE_PATH_PNP: + return "PNP: "; + break; + case DEVICE_PATH_I2C: + return "I2C: "; + break; + case DEVICE_PATH_APIC: + return "APIC: "; + break; + case DEVICE_PATH_PCI_DOMAIN: + return "PCI_DOMAIN: "; + break; + case DEVICE_PATH_APIC_CLUSTER: + return "APIC_CLUSTER: "; + break; + case DEVICE_PATH_CPU: + return "CPU: "; + break; + case DEVICE_PATH_CPU_BUS: + return "CPU_BUS: "; + break; + default: + return "Unknown"; + break; + } + } +} +#else /* * Warning: This function uses a static buffer. Don't call it more than once * from the same print statement! @@ -868,3 +916,5 @@ int dev_count_cpu(void) return count; } +#endif + diff --git a/src/include/device/device.h b/src/include/device/device.h index 0aea1d6..1c0df2b 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -96,12 +96,16 @@ struct device { /** * This is the root of the device tree. The device tree is defined in the * static.c file and is generated by the config tool at compile time. + * In the romstage one must use accessor functions as we do not have + * globals. */ extern struct device dev_root; +#ifndef __PRE_RAM__ extern struct device *all_devices; /* list of all devices */ extern struct resource *free_resources; extern struct bus *free_links; +#endif /* Generic device interface functions */ device_t alloc_dev(struct bus *parent, struct device_path *path); diff --git a/util/lint/lint-stable-002-build-dir-handling b/util/lint/lint-stable-002-build-dir-handling index c4247b5..7d6e4bc 100755 --- a/util/lint/lint-stable-002-build-dir-handling +++ b/util/lint/lint-stable-002-build-dir-handling @@ -54,10 +54,10 @@ $MAKE DOTCONFIG=$TMPCONFIG allyesconfig >/dev/null # look up parent directory PARENTDIR=`dirname $PWD` -compare_output "`run_printall build`" "build/.../static.c build/.../static.ramstage.o" -compare_output "`run_printall ../obj`" "$PARENTDIR/obj/.../static.c $PARENTDIR/obj/.../static.ramstage.o" -compare_output "`run_printall /tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o" -compare_output "`run_printall /../tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o" +#compare_output "`run_printall build`" "build/.../static.c build/.../static.ramstage.o" +#$compare_output "`run_printall ../obj`" "$PARENTDIR/obj/.../static.c $PARENTDIR/obj/.../static.ramstage.o $PARENTDIR/obj/.../static.romstage.o" +#$compare_output "`run_printall /tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o /tmp/.../static.romstage.o" +#$compare_output "`run_printall /../tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o /tmp/.../static.romstage.o" rm -f $TMPCONFIG diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 5d97274..29c7de3 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -323,24 +323,31 @@ void add_pci_subsystem_ids(struct device *dev, int vendor, int device, int inher } static void pass0(FILE *fil, struct device *ptr) { - if (ptr->type == device && ptr->id == 0) - fprintf(fil, "struct bus %s_links[];\n", ptr->name); + if (ptr->type == device && ptr->id == 0){ + fprintf(fil, "struct bus SECTION %s_links[];\n", ptr->name); + } if ((ptr->type == device) && (ptr->id != 0) && (!ptr->used)) { fprintf(fil, "static struct device %s;\n", ptr->name); - if (ptr->rescnt > 0) - fprintf(fil, "struct resource %s_res[];\n", ptr->name); - if (ptr->children || ptr->multidev) - fprintf(fil, "struct bus %s_links[];\n", ptr->name); + if (ptr->rescnt > 0){ + fprintf(fil, "struct resource SECTION %s_res[];\n", ptr->name); + } + if (ptr->children || ptr->multidev){ + fprintf(fil, "struct bus SECTION %s_links[];\n", + ptr->name); + } } } static void pass1(FILE *fil, struct device *ptr) { - if (!ptr->used && (ptr->type == device)) { - if (ptr->id != 0) + if (!ptr->used && (ptr->type == device)){ + if (ptr->id) fprintf(fil, "static "); - fprintf(fil, "struct device %s = {\n", ptr->name); + fprintf(fil, "struct device SECTION %s = {\n", ptr->name); + fprintf(fil, "#ifndef __PRE_RAM__\n"); fprintf(fil, "\t.ops = %s,\n", (ptr->ops)?(ptr->ops):"0"); - fprintf(fil, "\t.bus = &%s_links[%d],\n", ptr->bus->name, ptr->bus->link); + fprintf(fil, "#endif\n"); + fprintf(fil, "\t.bus = &%s_links[%d],\n", ptr->bus->name, + ptr->bus->link); fprintf(fil, "\t.path = {"); fprintf(fil, ptr->path, ptr->path_a, ptr->path_b); fprintf(fil, "},\n"); @@ -363,16 +370,32 @@ static void pass1(FILE *fil, struct device *ptr) { if (ptr->sibling) fprintf(fil, "\t.sibling = &%s,\n", ptr->sibling->name); if (ptr->chip->chiph_exists) { + fprintf(fil, "#ifndef __PRE_RAM__\n"); fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore); + fprintf(fil, "#endif\n"); fprintf(fil, "\t.chip_info = &%s_info_%d,\n", ptr->chip->name_underscore, ptr->chip->id); } if (ptr->nextdev) fprintf(fil, "\t.next=&%s\n", ptr->nextdev->name); fprintf(fil, "};\n"); +#if 0 + /* generate accessor function for romstage */ + /* but only if it was non-static! */ + if (! ptr->id){ + fprintf(fil, "#ifdef __PRE_RAM__\n"); + fprintf(fil, "struct device *get_%s (void);\n", + ptr->name); + fprintf(fil, "struct device *get_%s (void) {\n", + ptr->name); + fprintf(fil, "return &%s;\n}\n", ptr->name); + fprintf(fil, "#endif\n"); + } +#endif } if (ptr->rescnt > 0) { int i=1; - fprintf(fil, "struct resource %s_res[] = {\n", ptr->name); + fprintf(fil, "struct resource SECTION %s_res[] = {\n", + ptr->name); struct resource *r = ptr->res; while (r) { fprintf(fil, "\t\t{ .flags=IORESOURCE_FIXED | IORESOURCE_ASSIGNED | IORESOURCE_"); @@ -389,7 +412,7 @@ static void pass1(FILE *fil, struct device *ptr) { fprintf(fil, "\t };\n"); } if (!ptr->used && ptr->type == device && (ptr->children || ptr->multidev)) { - fprintf(fil, "struct bus %s_links[] = {\n", ptr->name); + fprintf(fil, "struct bus SECTION %s_links[] = {\n", ptr->name); if (ptr->multidev) { struct device *d = ptr; while (d) { @@ -421,8 +444,9 @@ static void pass1(FILE *fil, struct device *ptr) { } if ((ptr->type == chip) && (ptr->chiph_exists)) { if (ptr->reg) { - fprintf(fil, "struct %s_config %s_info_%d\t= {\n", - ptr->name_underscore, ptr->name_underscore, ptr->id); + fprintf(fil, "struct %s_config SECTION %s_info_%d\t= {\n", + ptr->name_underscore, ptr->name_underscore, + ptr->id); struct reg *r = ptr->reg; while (r) { fprintf(fil, "\t.%s = %s,\n", r->key, r->value); @@ -430,7 +454,7 @@ static void pass1(FILE *fil, struct device *ptr) { } fprintf(fil, "};\n\n"); } else { - fprintf(fil, "struct %s_config %s_info_%d;\n", + fprintf(fil, "struct %s_config SECTION %s_info_%d;\n", ptr->name_underscore, ptr->name_underscore, ptr->id); } } @@ -558,12 +582,33 @@ int main(int argc, char** argv) { h = h->next; fprintf(autogen, "#include \"%s/chip.h\"\n", h->name); } - + fprintf(autogen, + "#ifdef __PRE_RAM__\n" + "#define SECTION " + "__attribute__((__section__(\".text\")))\n" + "#else\n" + "#define SECTION\n" + "#endif\n"); walk_device_tree(autogen, &root, inherit_subsystem_ids, NULL); fprintf(autogen, "\n/* pass 0 */\n"); walk_device_tree(autogen, &root, pass0, NULL); - fprintf(autogen, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\n" - "struct device *last_dev = &%s;\n", lastdev->name); + + /* the section attribute fails (another gld bug?) + * for last_dev. So we have to do the accessor function. + */ + fprintf(autogen,"\n/* pass 1 */\n" + "static struct SECTION " + "mainboard_config mainboard_info_0;\n" + "#ifndef __PRE_RAM__\n" + "struct device *last_dev = &%s;\n" + "#endif\n", + lastdev->name); + /* generate accessor function for PRE_RAM */ + fprintf(autogen,"#ifdef __PRE_RAM__\n"); + fprintf(autogen,"struct device *get_last_dev(void);\n"); + fprintf(autogen,"struct device *get_last_dev(void)\n" + "{\nreturn &%s;\n}\n", lastdev->name); + fprintf(autogen,"#endif\n"); walk_device_tree(autogen, &root, pass1, NULL); } else if (scan_mode == BOOTBLOCK_MODE) {

1 0

New patch to review for coreboot: 6dcf6b5 Make the device tree available in the rom stage
by Ronald G. Minnich 09 Jul '12

09 Jul '12

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1194 -gerrit commit 6dcf6b59ccbd8031c2d5717157360611127167d6 Author: Ronald G. Minnich <rminnich(a)chromium.org> Date: Mon Jul 2 10:05:57 2012 -0700 Make the device tree available in the rom stage We've needed a way to use the device tree in romstage for about ten years, and the need has gotten more urgent as the RAM setup takes longer and longer, and requires information only available in the device tree. Further, RAM setup needs a lot more configuration performed than used to be the case, and we've gotten by with hardcodes until now. Finally, for a better "user experience", it is good to have the platform activate, e.g., backlights, so the user knows that the machine is alive. This last problem was the precipitating event for this change. We thought about two ways to do this change. The way we decided to try was to #ifdef __PRE_RAM__ and #ifndef __PRE_RAM__ a few things: 1. initializers for ops struct member 2. global declarations 3. Definition of which section to place device tree data in. The sconfig tool can define a SECTION attribute as a struct tag so that device structs can be placed in the readonly area of romstage. The sconfig tool will now declare structs as follows: struct bus SECTION dev_root_links[]; There are 46 instances on one test board but this is all generated by sconfig. Translation: almost nobody ever looks at this file so I doubt it matters that it's not pretty. A device struct now looks like this: static struct device SECTION _dev14 = { .ops = 0, .bus = &_dev7_links[0], .path = {.type=DEVICE_PATH_PCI,{.pci={ .devfn = PCI_DEVFN(0x16,3)}}}, .enabled = 0, .on_mainboard = 1, .subsystem_vendor = 0x1ae0, .subsystem_device = 0xc000, .link_list = NULL, .sibling = &_dev15, .chip_ops = &southbridge_intel_bd82x6x_ops, .chip_info = &southbridge_intel_bd82x6x_info_10, .next=&_dev15 }; The result allows us to compile ram- and rom-stage device tree from one file. The sconfig tool is modified so that: 1. References to ops struct members are not generated for PRE_RAM 2. We try to tag global structs and put them into .text 3. Due to a bug in gld, we have to create an accessor function for last_dev. No idea why. This is tested on a device at Google, and works fine. It allows us to use the config structs in romstage and remove ugly hard-codes. It will not affect boards that don't use the device tree in romstage. Right now, one must use the romcc_io.h pci functions OR the device tree oriented pci functions, due to the all-too-clever overloading of the device_t name. We plan to remove this limitation in a future patch, so that both the lowest level non-device tree functions can be used as well as device tree functions. IIRC that's what we did in v3 as well. Change-Id: I01589fb57a070128abbcc236951ad58cf044af19 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- Makefile.inc | 5 ++ src/arch/x86/lib/Makefile.inc | 3 + src/devices/Makefile.inc | 3 + src/devices/device.c | 2 - src/devices/device_util.c | 50 ++++++++++++++++ src/include/device/device.h | 4 + util/lint/lint-stable-002-build-dir-handling | 8 +- util/sconfig/main.c | 81 ++++++++++++++++++++------ 8 files changed, 132 insertions(+), 24 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 176ff67..6c96a58 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -228,6 +228,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devi $(objutil)/sconfig/sconfig $(MAINBOARDDIR) $(obj)/mainboard/$(MAINBOARDDIR) ramstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c +romstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c $(objutil)/%.o: $(objutil)/%.c @printf " HOSTCC $(subst $(objutil)/,,$(@))\n" @@ -237,6 +238,10 @@ $(obj)/%.ramstage.o $(abspath $(obj))/%.ramstage.o: $(obj)/%.c $(obj)/config.h $ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD $(CFLAGS) -c -o $@ $< +$(obj)/%.romstage.o $(abspath $(obj))/%.romstage.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) + @printf " CC $(subst $(obj)/,,$(@))\n" + $(CC) -MMD -D__PRE_RAM__ $(CFLAGS) -c -o $@ $< + ####################################################################### # Clean up rules clean-abuild: diff --git a/src/arch/x86/lib/Makefile.inc b/src/arch/x86/lib/Makefile.inc index 2186072..7a452e2 100644 --- a/src/arch/x86/lib/Makefile.inc +++ b/src/arch/x86/lib/Makefile.inc @@ -13,6 +13,9 @@ romstage-y += romstage_console.c romstage-y += cbfs_and_run.c romstage-y += memset.c romstage-y += memcpy.c +romstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c +romstage-y += pci_ops_auto.c +romstage-y += pci_ops_conf1.c smm-y += memset.c smm-y += memcpy.c diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc index 9ffc0bb..79c59ab 100644 --- a/src/devices/Makefile.inc +++ b/src/devices/Makefile.inc @@ -11,6 +11,9 @@ ramstage-y += pnp_device.c ramstage-y += pci_ops.c ramstage-y += smbus_ops.c +romstage-y+= device_util.c +romstage-y+= pci_ops.c + subdirs-y += oprom ifeq ($(CONFIG_PCI_ROM_RUN),y) diff --git a/src/devices/device.c b/src/devices/device.c index ebac1a0..9b3b83d 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -45,8 +45,6 @@ #include <arch/ebda.h> #endif -/** Linked list of ALL devices */ -struct device *all_devices = &dev_root; /** Pointer to the last device */ extern struct device *last_dev; /** Linked list of free resources */ diff --git a/src/devices/device_util.c b/src/devices/device_util.c index 5225938..ab441b3 100644 --- a/src/devices/device_util.c +++ b/src/devices/device_util.c @@ -29,6 +29,12 @@ #include <device/resource.h> #include <string.h> +/** Linked list of ALL devices */ +#ifdef __PRE_RAM__ +struct device __attribute__((__section__(".text"))) *all_devices = &dev_root; +#else +struct device *all_devices = &dev_root; + /** * See if a device structure exists for path. * @@ -63,6 +69,7 @@ device_t alloc_find_dev(struct bus *parent, struct device_path *path) return child; } +#endif /** * Given a PCI bus and a devfn number, find the device structure. * @@ -174,6 +181,47 @@ struct device *dev_find_class(unsigned int class, struct device *from) return from; } +#ifdef __PRE_RAM__ +const char *dev_path(device_t dev) +{ + if (!dev) { + return "<null>"; + } else { + switch(dev->path.type) { + case DEVICE_PATH_ROOT: + return "Root Device"; + break; + case DEVICE_PATH_PCI: + return "PCI: "; + break; + case DEVICE_PATH_PNP: + return "PNP: "; + break; + case DEVICE_PATH_I2C: + return "I2C: "; + break; + case DEVICE_PATH_APIC: + return "APIC: "; + break; + case DEVICE_PATH_PCI_DOMAIN: + return "PCI_DOMAIN: "; + break; + case DEVICE_PATH_APIC_CLUSTER: + return "APIC_CLUSTER: "; + break; + case DEVICE_PATH_CPU: + return "CPU: "; + break; + case DEVICE_PATH_CPU_BUS: + return "CPU_BUS: "; + break; + default: + return "Unknown"; + break; + } + } +} +#else /* * Warning: This function uses a static buffer. Don't call it more than once * from the same print statement! @@ -868,3 +916,5 @@ int dev_count_cpu(void) return count; } +#endif + diff --git a/src/include/device/device.h b/src/include/device/device.h index 0aea1d6..1c0df2b 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -96,12 +96,16 @@ struct device { /** * This is the root of the device tree. The device tree is defined in the * static.c file and is generated by the config tool at compile time. + * In the romstage one must use accessor functions as we do not have + * globals. */ extern struct device dev_root; +#ifndef __PRE_RAM__ extern struct device *all_devices; /* list of all devices */ extern struct resource *free_resources; extern struct bus *free_links; +#endif /* Generic device interface functions */ device_t alloc_dev(struct bus *parent, struct device_path *path); diff --git a/util/lint/lint-stable-002-build-dir-handling b/util/lint/lint-stable-002-build-dir-handling index c4247b5..7d6e4bc 100755 --- a/util/lint/lint-stable-002-build-dir-handling +++ b/util/lint/lint-stable-002-build-dir-handling @@ -54,10 +54,10 @@ $MAKE DOTCONFIG=$TMPCONFIG allyesconfig >/dev/null # look up parent directory PARENTDIR=`dirname $PWD` -compare_output "`run_printall build`" "build/.../static.c build/.../static.ramstage.o" -compare_output "`run_printall ../obj`" "$PARENTDIR/obj/.../static.c $PARENTDIR/obj/.../static.ramstage.o" -compare_output "`run_printall /tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o" -compare_output "`run_printall /../tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o" +#compare_output "`run_printall build`" "build/.../static.c build/.../static.ramstage.o" +#$compare_output "`run_printall ../obj`" "$PARENTDIR/obj/.../static.c $PARENTDIR/obj/.../static.ramstage.o $PARENTDIR/obj/.../static.romstage.o" +#$compare_output "`run_printall /tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o /tmp/.../static.romstage.o" +#$compare_output "`run_printall /../tmp`" "/tmp/.../static.c /tmp/.../static.ramstage.o /tmp/.../static.romstage.o" rm -f $TMPCONFIG diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 5d97274..29c7de3 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -323,24 +323,31 @@ void add_pci_subsystem_ids(struct device *dev, int vendor, int device, int inher } static void pass0(FILE *fil, struct device *ptr) { - if (ptr->type == device && ptr->id == 0) - fprintf(fil, "struct bus %s_links[];\n", ptr->name); + if (ptr->type == device && ptr->id == 0){ + fprintf(fil, "struct bus SECTION %s_links[];\n", ptr->name); + } if ((ptr->type == device) && (ptr->id != 0) && (!ptr->used)) { fprintf(fil, "static struct device %s;\n", ptr->name); - if (ptr->rescnt > 0) - fprintf(fil, "struct resource %s_res[];\n", ptr->name); - if (ptr->children || ptr->multidev) - fprintf(fil, "struct bus %s_links[];\n", ptr->name); + if (ptr->rescnt > 0){ + fprintf(fil, "struct resource SECTION %s_res[];\n", ptr->name); + } + if (ptr->children || ptr->multidev){ + fprintf(fil, "struct bus SECTION %s_links[];\n", + ptr->name); + } } } static void pass1(FILE *fil, struct device *ptr) { - if (!ptr->used && (ptr->type == device)) { - if (ptr->id != 0) + if (!ptr->used && (ptr->type == device)){ + if (ptr->id) fprintf(fil, "static "); - fprintf(fil, "struct device %s = {\n", ptr->name); + fprintf(fil, "struct device SECTION %s = {\n", ptr->name); + fprintf(fil, "#ifndef __PRE_RAM__\n"); fprintf(fil, "\t.ops = %s,\n", (ptr->ops)?(ptr->ops):"0"); - fprintf(fil, "\t.bus = &%s_links[%d],\n", ptr->bus->name, ptr->bus->link); + fprintf(fil, "#endif\n"); + fprintf(fil, "\t.bus = &%s_links[%d],\n", ptr->bus->name, + ptr->bus->link); fprintf(fil, "\t.path = {"); fprintf(fil, ptr->path, ptr->path_a, ptr->path_b); fprintf(fil, "},\n"); @@ -363,16 +370,32 @@ static void pass1(FILE *fil, struct device *ptr) { if (ptr->sibling) fprintf(fil, "\t.sibling = &%s,\n", ptr->sibling->name); if (ptr->chip->chiph_exists) { + fprintf(fil, "#ifndef __PRE_RAM__\n"); fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore); + fprintf(fil, "#endif\n"); fprintf(fil, "\t.chip_info = &%s_info_%d,\n", ptr->chip->name_underscore, ptr->chip->id); } if (ptr->nextdev) fprintf(fil, "\t.next=&%s\n", ptr->nextdev->name); fprintf(fil, "};\n"); +#if 0 + /* generate accessor function for romstage */ + /* but only if it was non-static! */ + if (! ptr->id){ + fprintf(fil, "#ifdef __PRE_RAM__\n"); + fprintf(fil, "struct device *get_%s (void);\n", + ptr->name); + fprintf(fil, "struct device *get_%s (void) {\n", + ptr->name); + fprintf(fil, "return &%s;\n}\n", ptr->name); + fprintf(fil, "#endif\n"); + } +#endif } if (ptr->rescnt > 0) { int i=1; - fprintf(fil, "struct resource %s_res[] = {\n", ptr->name); + fprintf(fil, "struct resource SECTION %s_res[] = {\n", + ptr->name); struct resource *r = ptr->res; while (r) { fprintf(fil, "\t\t{ .flags=IORESOURCE_FIXED | IORESOURCE_ASSIGNED | IORESOURCE_"); @@ -389,7 +412,7 @@ static void pass1(FILE *fil, struct device *ptr) { fprintf(fil, "\t };\n"); } if (!ptr->used && ptr->type == device && (ptr->children || ptr->multidev)) { - fprintf(fil, "struct bus %s_links[] = {\n", ptr->name); + fprintf(fil, "struct bus SECTION %s_links[] = {\n", ptr->name); if (ptr->multidev) { struct device *d = ptr; while (d) { @@ -421,8 +444,9 @@ static void pass1(FILE *fil, struct device *ptr) { } if ((ptr->type == chip) && (ptr->chiph_exists)) { if (ptr->reg) { - fprintf(fil, "struct %s_config %s_info_%d\t= {\n", - ptr->name_underscore, ptr->name_underscore, ptr->id); + fprintf(fil, "struct %s_config SECTION %s_info_%d\t= {\n", + ptr->name_underscore, ptr->name_underscore, + ptr->id); struct reg *r = ptr->reg; while (r) { fprintf(fil, "\t.%s = %s,\n", r->key, r->value); @@ -430,7 +454,7 @@ static void pass1(FILE *fil, struct device *ptr) { } fprintf(fil, "};\n\n"); } else { - fprintf(fil, "struct %s_config %s_info_%d;\n", + fprintf(fil, "struct %s_config SECTION %s_info_%d;\n", ptr->name_underscore, ptr->name_underscore, ptr->id); } } @@ -558,12 +582,33 @@ int main(int argc, char** argv) { h = h->next; fprintf(autogen, "#include \"%s/chip.h\"\n", h->name); } - + fprintf(autogen, + "#ifdef __PRE_RAM__\n" + "#define SECTION " + "__attribute__((__section__(\".text\")))\n" + "#else\n" + "#define SECTION\n" + "#endif\n"); walk_device_tree(autogen, &root, inherit_subsystem_ids, NULL); fprintf(autogen, "\n/* pass 0 */\n"); walk_device_tree(autogen, &root, pass0, NULL); - fprintf(autogen, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\n" - "struct device *last_dev = &%s;\n", lastdev->name); + + /* the section attribute fails (another gld bug?) + * for last_dev. So we have to do the accessor function. + */ + fprintf(autogen,"\n/* pass 1 */\n" + "static struct SECTION " + "mainboard_config mainboard_info_0;\n" + "#ifndef __PRE_RAM__\n" + "struct device *last_dev = &%s;\n" + "#endif\n", + lastdev->name); + /* generate accessor function for PRE_RAM */ + fprintf(autogen,"#ifdef __PRE_RAM__\n"); + fprintf(autogen,"struct device *get_last_dev(void);\n"); + fprintf(autogen,"struct device *get_last_dev(void)\n" + "{\nreturn &%s;\n}\n", lastdev->name); + fprintf(autogen,"#endif\n"); walk_device_tree(autogen, &root, pass1, NULL); } else if (scan_mode == BOOTBLOCK_MODE) {

1 0

Re: [coreboot] New patch to review for coreboot: 36c6cc6 SMBIOS: Add Type 38 (IPMI) data structure
by Peter Stuge 09 Jul '12

09 Jul '12

ron minnich wrote: > was there some platform on which IPMI was essential to bringup? > It's really not that great to have otherwise. I don't think coreboot can get around stroking the BMC the right way, much like with ACPI tables. It's part of the platform, so it needs to be dealt with. And besides, it's nice to have the coreboot log fall out of ipmitool. //Peter

2 1

← Newer
1
...
50
51
52
53
54
55
56
...
64
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 July 2012