Correct typo, fix stage2 code documentation, add dtsname printing to differentiate between identically named objects during boot.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: LinuxBIOSv3/include/device/device.h =================================================================== --- LinuxBIOSv3/include/device/device.h (Revision 485) +++ LinuxBIOSv3/include/device/device.h (Arbeitskopie) @@ -202,7 +202,7 @@ struct resource resource[MAX_RESOURCES]; unsigned int resources;
- /* link are (down sream) buses attached to the device, usually a leaf + /* link are (downstream) buses attached to the device, usually a leaf * device with no children have 0 buses attached and a bridge has 1 bus */ struct bus link[MAX_LINKS]; Index: LinuxBIOSv3/device/device.c =================================================================== --- LinuxBIOSv3/device/device.c (Revision 485) +++ LinuxBIOSv3/device/device.c (Arbeitskopie) @@ -260,8 +260,10 @@ for (curdev = bus->children; curdev; curdev = curdev->sibling) { unsigned int links; int i; - printk(BIOS_SPEW, "%s: %s(%s) have_resources %d enabled %d\n", + printk(BIOS_SPEW, + "%s: %s(%s) dtsname %s have_resources %d enabled %d\n", __func__, bus->dev->dtsname, dev_path(bus->dev), + curdev->dtsname, curdev->have_resources, curdev->enabled); if (curdev->have_resources) { continue; Index: LinuxBIOSv3/lib/stage2.c =================================================================== --- LinuxBIOSv3/lib/stage2.c (Revision 485) +++ LinuxBIOSv3/lib/stage2.c (Arbeitskopie) @@ -31,8 +31,9 @@ /** * Main function of the DRAM part of LinuxBIOS. * - * LinuxBIOS is divided into pre-DRAM part and DRAM part. The phases before - * this part are phase 0 and phase 1. This part contains phases x through y. + * LinuxBIOS is divided into pre-DRAM part and DRAM part. The stages before + * this part are stage 0 and stage 1. This part contains stage 2, which + * consists of phases 1 through 6. * * Device Enumeration: in the dev_enumerate() phase. * @@ -53,6 +54,7 @@
post_code(0x20);
+ /* TODO: Explain why we use printk here although it is impossible */ printk(BIOS_NOTICE, console_test);
dev_init();
Acked-by: Ronald G. Minnich rminnich@gmail.com
On 8/29/07, Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net wrote:
Correct typo, fix stage2 code documentation, add dtsname printing to differentiate between identically named objects during boot.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: LinuxBIOSv3/include/device/device.h
--- LinuxBIOSv3/include/device/device.h (Revision 485) +++ LinuxBIOSv3/include/device/device.h (Arbeitskopie) @@ -202,7 +202,7 @@ struct resource resource[MAX_RESOURCES]; unsigned int resources;
/* link are (down sream) buses attached to the device, usually a leaf
/* link are (downstream) buses attached to the device, usually a leaf * device with no children have 0 buses attached and a bridge has 1 bus */ struct bus link[MAX_LINKS];Index: LinuxBIOSv3/device/device.c
--- LinuxBIOSv3/device/device.c (Revision 485) +++ LinuxBIOSv3/device/device.c (Arbeitskopie) @@ -260,8 +260,10 @@ for (curdev = bus->children; curdev; curdev = curdev->sibling) { unsigned int links; int i;
printk(BIOS_SPEW, "%s: %s(%s) have_resources %d enabled %d\n",
printk(BIOS_SPEW,"%s: %s(%s) dtsname %s have_resources %d enabled %d\n", __func__, bus->dev->dtsname, dev_path(bus->dev),curdev->dtsname, curdev->have_resources, curdev->enabled); if (curdev->have_resources) { continue;Index: LinuxBIOSv3/lib/stage2.c
--- LinuxBIOSv3/lib/stage2.c (Revision 485) +++ LinuxBIOSv3/lib/stage2.c (Arbeitskopie) @@ -31,8 +31,9 @@ /**
- Main function of the DRAM part of LinuxBIOS.
- LinuxBIOS is divided into pre-DRAM part and DRAM part. The phases before
- this part are phase 0 and phase 1. This part contains phases x through y.
- LinuxBIOS is divided into pre-DRAM part and DRAM part. The stages before
- this part are stage 0 and stage 1. This part contains stage 2, which
- consists of phases 1 through 6.
- Device Enumeration: in the dev_enumerate() phase.
@@ -53,6 +54,7 @@
post_code(0x20);
/* TODO: Explain why we use printk here although it is impossible */ printk(BIOS_NOTICE, console_test); dev_init();-- linuxbios mailing list linuxbios@linuxbios.org http://www.linuxbios.org/mailman/listinfo/linuxbios
Can somebody please commit?
Carl-Daniel
On 30.08.2007 17:11, ron minnich wrote:
Acked-by: Ronald G. Minnich rminnich@gmail.com
On 8/29/07, Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net wrote:
Correct typo, fix stage2 code documentation, add dtsname printing to differentiate between identically named objects during boot.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: LinuxBIOSv3/include/device/device.h
--- LinuxBIOSv3/include/device/device.h (Revision 485) +++ LinuxBIOSv3/include/device/device.h (Arbeitskopie) @@ -202,7 +202,7 @@ struct resource resource[MAX_RESOURCES]; unsigned int resources;
/* link are (down sream) buses attached to the device, usually a leaf
/* link are (downstream) buses attached to the device, usually a leaf * device with no children have 0 buses attached and a bridge has 1 bus */ struct bus link[MAX_LINKS];Index: LinuxBIOSv3/device/device.c
--- LinuxBIOSv3/device/device.c (Revision 485) +++ LinuxBIOSv3/device/device.c (Arbeitskopie) @@ -260,8 +260,10 @@ for (curdev = bus->children; curdev; curdev = curdev->sibling) { unsigned int links; int i;
printk(BIOS_SPEW, "%s: %s(%s) have_resources %d enabled %d\n",
printk(BIOS_SPEW,"%s: %s(%s) dtsname %s have_resources %d enabled %d\n", __func__, bus->dev->dtsname, dev_path(bus->dev),curdev->dtsname, curdev->have_resources, curdev->enabled); if (curdev->have_resources) { continue;Index: LinuxBIOSv3/lib/stage2.c
--- LinuxBIOSv3/lib/stage2.c (Revision 485) +++ LinuxBIOSv3/lib/stage2.c (Arbeitskopie) @@ -31,8 +31,9 @@ /**
- Main function of the DRAM part of LinuxBIOS.
- LinuxBIOS is divided into pre-DRAM part and DRAM part. The phases before
- this part are phase 0 and phase 1. This part contains phases x through y.
- LinuxBIOS is divided into pre-DRAM part and DRAM part. The stages before
- this part are stage 0 and stage 1. This part contains stage 2, which
- consists of phases 1 through 6.
- Device Enumeration: in the dev_enumerate() phase.
@@ -53,6 +54,7 @@
post_code(0x20);
/* TODO: Explain why we use printk here although it is impossible */ printk(BIOS_NOTICE, console_test); dev_init();-- linuxbios mailing list linuxbios@linuxbios.org http://www.linuxbios.org/mailman/listinfo/linuxbios
On Wed, Sep 26, 2007 at 11:18:32AM +0200, Carl-Daniel Hailfinger wrote:
Can somebody please commit?
r501
Thanks, Ward.
* Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [070830 02:05]:
printk(BIOS_SPEW, "%s: %s(%s) have_resources %d enabled %d\n",
printk(BIOS_SPEW,"%s: %s(%s) dtsname %s have_resources %d enabled %d\n", __func__, bus->dev->dtsname, dev_path(bus->dev),
These kind of indent changes look rather ugly in my opinion.
- /* TODO: Explain why we use printk here although it is impossible */
What? Impossible? Why? That commend looks pretty bogus.
printk(BIOS_NOTICE, console_test);
dev_init();
-- linuxbios mailing list linuxbios@linuxbios.org http://www.linuxbios.org/mailman/listinfo/linuxbios
On 02.09.2007 18:43, Stefan Reinauer wrote:
- Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net [070830 02:05]:
printk(BIOS_SPEW, "%s: %s(%s) have_resources %d enabled %d\n",
printk(BIOS_SPEW,"%s: %s(%s) dtsname %s have_resources %d enabled %d\n", __func__, bus->dev->dtsname, dev_path(bus->dev),These kind of indent changes look rather ugly in my opinion.
This is not really an indent change, the message became 18 chars longer so I had to either violate the 80 column limit or move the message to a new line. I chose the second option.
- /* TODO: Explain why we use printk here although it is impossible */
What? Impossible? Why? That commend looks pretty bogus.
newboot.lyx chapter 5.3 says stage 2 phase 1 makes printk work. That implies printk will not work before that.
printk(BIOS_NOTICE, console_test);
Carl-Daniel
-
Carl-Daniel Hailfinger -
ron minnich -
Stefan Reinauer -
Ward Vandewege