coreboot July 2011

coreboot@coreboot.org

52 participants
244 discussions

Patch set updated: c7d7cdb Un-perl commit-msg hook
by Patrick Georgi 17 Jul '11

17 Jul '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/78 -gerrit commit c7d7cdb0bd994c887cab6f617497b20069be8a2d Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sat Jul 2 00:35:02 2011 +0200 Un-perl commit-msg hook To simplify installation on mingw a bit (even though git remains a pain), drop the perl dependency the commit-msg hook introduced to the coreboot development environment. It's replaced by awk which we use elsewhere already (and is a more lightweight utility in any case) Change-Id: I67adfe1ec43c898735d4bae4819ceb53e83c303b Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/gitconfig/commit-msg | 121 ++++++++++++++++++++++++++++++++------------- 1 files changed, 87 insertions(+), 34 deletions(-) diff --git a/util/gitconfig/commit-msg b/util/gitconfig/commit-msg index 789bad3..548f373 100755 --- a/util/gitconfig/commit-msg +++ b/util/gitconfig/commit-msg @@ -1,5 +1,4 @@ #!/bin/sh -# From Gerrit Code Review 2.1.7-rc2 # # Part of Gerrit Code Review (http://code.google.com/p/gerrit/) # @@ -37,56 +36,110 @@ add_ChangeId() { return fi + # Does Change-Id: already exist? if so, exit (no change). if grep -i '^Change-Id:' "$MSG" >/dev/null then return fi id=`_gen_ChangeId` - perl -e ' - $MSG = shift; - $id = shift; - $CHANGE_ID_AFTER = shift; + T="$MSG.tmp.$$" + AWK=awk + if [ -x /usr/xpg4/bin/awk ]; then + # Solaris AWK is just too broken + AWK=/usr/xpg4/bin/awk + fi + $AWK ' + # Skip lines starting with "#" without any spaces before it. + /^#/ { next } - undef $/; - open(I, $MSG); $_ = <I>; close I; - s|^diff --git a/.*||ms; - s|^#.*$||mg; - exit unless $_; + # Skip the line starting with the diff command and everything after it, + # up to the end of the file, assuming it is only patch data. + # If more than one line before the diff was empty, strip all but one. + /^diff --git a/ { + if (blankLines > 1) { + blankLines = 1 + } + while (getline) { } + next + } - @message = split /\n/; - $haveFooter = 0; - $startFooter = @message; - for($line = @message - 1; $line >= 0; $line--) { - $_ = $message[$line]; + # Handle comments and continuations in tags ([foo: bar] etc) + (caught == 1) && /^[ []/ { + if (lines != "") { + lines = lines "\n" + } + lines = lines $0 + next + } - if (/^[a-zA-Z0-9-]+:/ && !m,^[a-z0-9-]+://,) { - $haveFooter++; - next; + # Handle normal lines (ie. not starting with some tag like "Signed-off-by:"). + # If normal text appears after tags were "caught", handle them as normal text, too. + # Also count blank lines in blankLines. + !/^[a-zA-Z0-9-]+:/ || /^[a-zA-Z0-9-]+:\/\// { + if ($0 == "") { + blankLines++ + next + } else { + for (i = 0; i < blankLines; i++) { + print "" } - next if /^[ []/; - $startFooter = $line if ($haveFooter && /^\r?$/); - last; + blankLines = 0 } + if (caught == 1) { + caught = 0 + print lines + lines = "" + } + print $0 + next + } - @footer = @message[$startFooter+1..@message]; - @message = @message[0..$startFooter]; - push(@footer, "") unless @footer; - - for ($line = 0; $line < @footer; $line++) { - $_ = $footer[$line]; - next if /^($CHANGE_ID_AFTER):/i; - last; + # Handle tags. They are "caught" and collected in the "lines" variable + { + caught = 1 + if (lines != "") { + lines = lines "\n"; } - splice(@footer, $line, 0, "Change-Id: I$id"); + lines = lines $0 + } - $_ = join("\n", @message, @footer); - open(O, ">$MSG"); print O; close O; - ' "$MSG" "$id" "$CHANGE_ID_AFTER" + # Tag handling: + # If last line before tags was not blank, there were no tags. + # In that case, print everything, plus a blank line, followed by Change-Id. + # Otherwise there were tags. Look for the right place to inject Change-Id, + # by considering CHANGE_ID_AFTER. Tags listed in it (case insensitive) come first, + # then Change-Id, then everything else (eg. Signed-off-by:). + END { + unprinted = 1 + if (blankLines == 0) { + if (lines == "") { + print "" + } else { + print lines "\n" + } + } else { + for (i = 0; i < blankLines; i++) { + print "" + } + changeIdAfter = "^(" tolower("'"$CHANGE_ID_AFTER"'") "):" + numlines = split(lines, footer, "\n") + for (line = 1; line <= numlines; line++) { + if (unprinted && match(tolower(footer[line]), changeIdAfter) != 1) { + unprinted = 0 + print "Change-Id: I'"$id"'" + } + print footer[line] + } + } + if (unprinted) { + print "Change-Id: I'"$id"'" + } + }' "$MSG" > $T && mv $T "$MSG" || rm -f $T } _gen_ChangeIdInput() { echo "tree `git write-tree`" - if parent=`git rev-parse HEAD^0 2>/dev/null` + if parent=`git rev-parse "HEAD^0" 2>/dev/null` then echo "parent $parent" fi

1 0

New patch to review: e2e5c9b buildgcc: Break if parts of the toolchain are missing We test for the presence of a couple of tools and even print an error. But the tool didn't stop there.
by Patrick Georgi 17 Jul '11

17 Jul '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/111 -gerrit commit e2e5c9b848ff94fa02714a9fd4047fe65add2fd0 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sun Jul 17 11:36:10 2011 +0200 buildgcc: Break if parts of the toolchain are missing We test for the presence of a couple of tools and even print an error. But the tool didn't stop there. Change-Id: I40dcf7894408ea7b24d5f68c76df4b7541f469bd Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/crossgcc/buildgcc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 9211cfd..355b01a 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -88,9 +88,9 @@ searchgnu() exit 1 } -TAR=`searchgnu tar` -PATCH=`searchgnu patch` -MAKE=`searchgnu make` +TAR=`searchgnu tar` || exit $? +PATCH=`searchgnu patch` || exit $? +MAKE=`searchgnu make` || exit $? cleanup() {

1 0

New patch to review: 662ddf3 Fix coreboot revision detection
by Patrick Georgi 17 Jul '11

17 Jul '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/110 -gerrit commit 662ddf3cfcb85266aed897825c2f6abda0919d7e Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sun Jul 17 11:32:51 2011 +0200 Fix coreboot revision detection Neither do we publish coreboot via svn, nor is git-svn a useful indicator anymore. Instead, fetch a shortened commit id. Change-Id: I1b990384553209a7d39ecf7f5e8a2db7c7e34d0b Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- Makefile.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 2b3ea8d..65550e6 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -19,7 +19,7 @@ ####################################################################### # misleadingly named, this is the coreboot version -REV=-r$(shell if [ -d $(top)/.svn -a -f "`which svnversion`" ]; then svnversion $(top); else if [ -d $(top)/.git -a -f "`which git`" ]; then git --git-dir=/$(top)/.git log|grep git-svn-id|cut -f 2 -d@|cut -f 1 -d' '|sort -g|tail -1; fi; fi) +REV=-r$(shell if [ -d $(top)/.git -a -f "`which git`" ]; then git --git-dir=/$(top)/.git show -s --pretty=format:%h; fi) export KERNELVERSION := 4.0$(REV) #######################################################################

1 0

Patch merged into master: 89461d8 port_enable and port_reset must change atomically.
by gerrit＠coreboot.org 17 Jul '11

17 Jul '11

the following patch was just integrated into master: commit 89461d88a0e163ab5fee96908a4195035fe800f5 Author: Steven A. Falco <sfalco(a)coincident.com> Date: Fri Jul 15 21:44:35 2011 -0400 port_enable and port_reset must change atomically. I have observed two separate EHCI host bridges that do not tolerate using C bit-fields to directly manipulate the portsc_t register. The reason for this is that the EHCI spec says that port_enable must go to 0 at the time that port_reset goes to 1. Naturally this cannot be done using direct bit-field manipulation. Instead, we use a temporary variable, change the bit-fields there, then atomically write the new value back to the hardware. Signed-off-by: Steven A. Falco <sfalco(a)coincident.com> Change-Id: If138faee43e0293efa203b86f7893fdf1e811269 See http://review.coreboot.org/101 for details. -gerrit

1 0

Re: [coreboot] a couple gerrit things
by Peter Stuge 16 Jul '11

16 Jul '11

Marc Jones wrote: > If a patch is cherrypicked from gerrit and pushed again, it > doesn't need a new signoff. I think that anyone that pushes a > change should add a signoff. Actually I think they need to - someone pushing the patch is supposed to say that they can, that's one reason for the signoff to start with. > It might help prevent the unintentional push. Difficult. A hook that checks if the new commit is any different from the previous one would avoid duplicate pushes, but would also block updating commit messages, which could be desirable. A few unintentional pushes do not matter IMO as long as each developer sorts out the configuration and procedures after discovering the mistake. Most are learning gerrit and more are learning git so of course there will be a few bumps. No big deal as long as we get them fixed I think. //Peter

1 0

a couple gerrit things
by Marc Jones 16 Jul '11

16 Jul '11

Hi Patrick, Can the gerrit merge emails include the reviewers/commiter ID? Gerrit (or the hook?) prevents pushing a new patch without the signoff of the person pushing except when a patch is already signed off in gerrit. If a patch is cherrypicked from gerrit and pushed again, it doesn't need a new signoff. I think that anyone that pushes a change should add a signoff. It might help prevent the unintentional push. Marc -- http://se-eng.com

1 0

Patch merged into master: 8de7fcd Workaround the errata #181.
by gerrit＠coreboot.org 16 Jul '11

16 Jul '11

the following patch was just integrated into master: commit 8de7fcde0a1fcc5a56d5e8e03ed689253418c40c Author: Rudolf Marek <r.marek(a)assembler.cz> Date: Wed Jun 29 23:59:13 2011 +0200 Workaround the errata #181. We use LDTSTOP# to trigger the FID/VID change on K8M890, because the FID/VID SMAF is blocked by not yet configured internal VGA. The memory controller is enabled later, nor the workaround makes any harm to non-affected CPUs. This update unbreaks compilation by declaring the tmp variable. Change-Id: Icf5d126b8c8cd9ece6af41d3129315a777c8cef2 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> Signed-off-by: Cristian Măgherușan-Stanciu <cristi.magherusan(a)gmail.com> See http://review.coreboot.org/69 for details. -gerrit

1 0

Patch merged into master: 2ebc016 libpayload: Improve compatibility
by gerrit＠coreboot.org 16 Jul '11

16 Jul '11

the following patch was just integrated into master: commit 2ebc01624221519a82119286b121e218bb5a2df7 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Jul 12 15:02:04 2011 +0200 libpayload: Improve compatibility Define INT_MAX, EOF and make sure size_t is available. Change-Id: I1b4b717d2545ea8312ec52339300307a5bd68f8a Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> See http://review.coreboot.org/104 for details. -gerrit

1 0

Re: [coreboot] ASRock e350m1 problems
by Tadas Slotkus 16 Jul '11

16 Jul '11

> Just to completely rule out the bad SPD idea, can you please dump the > SPD content when you boot with the production BIOS? i2cdump output > (ASCII) or raw output from sysfs would be great. Then we can plug it > into bc and confirm that the checksum is correct. This would also be a > good way to confirm that the SPD addresses are correct in Coreboot, > and rule out the possibility that ASRock changed SPD addressing > between board revisions... Attaching /sys/bus/i2c/drivers/eeprom/0-0050/eeprom as hex file + i2cdump output

2 2

Patch set updated: 89461d8 port_enable and port_reset must change atomically.
by Steven A. Falco 16 Jul '11

16 Jul '11

Steven A. Falco (sfalco(a)coincident.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/101 -gerrit commit 89461d88a0e163ab5fee96908a4195035fe800f5 Author: Steven A. Falco <sfalco(a)coincident.com> Date: Fri Jul 15 21:44:35 2011 -0400 port_enable and port_reset must change atomically. I have observed two separate EHCI host bridges that do not tolerate using C bit-fields to directly manipulate the portsc_t register. The reason for this is that the EHCI spec says that port_enable must go to 0 at the time that port_reset goes to 1. Naturally this cannot be done using direct bit-field manipulation. Instead, we use a temporary variable, change the bit-fields there, then atomically write the new value back to the hardware. Signed-off-by: Steven A. Falco <sfalco(a)coincident.com> Change-Id: If138faee43e0293efa203b86f7893fdf1e811269 --- payloads/libpayload/drivers/usb/ehci_rh.c | 39 +++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ehci_rh.c b/payloads/libpayload/drivers/usb/ehci_rh.c index 5eaeeb6..5f0db94 100644 --- a/payloads/libpayload/drivers/usb/ehci_rh.c +++ b/payloads/libpayload/drivers/usb/ehci_rh.c @@ -54,14 +54,19 @@ static void ehci_rh_hand_over_port (usbdev_t *dev, int port) { volatile portsc_t *p = &(RH_INST(dev)->ports[port]); + volatile portsc_t tmp; printf("giving up port %x, it's USB1\n", port+1); /* Lowspeed device. Hand over to companion */ - p->port_owner = 1; + tmp = *p; + tmp.port_owner = 1; + *p = tmp; do {} while (!p->conn_status_change); /* RW/C register, so clear it by writing 1 */ - p->conn_status_change = 1; + tmp = *p; + tmp.conn_status_change = 1; + *p = tmp; return; } @@ -69,6 +74,7 @@ static void ehci_rh_scanport (usbdev_t *dev, int port) { volatile portsc_t *p = &(RH_INST(dev)->ports[port]); + volatile portsc_t tmp; if (RH_INST(dev)->devices[port]!=-1) { printf("Unregister device at port %x\n", port+1); usb_detach_device(dev->controller, RH_INST(dev)->devices[port]); @@ -81,10 +87,22 @@ ehci_rh_scanport (usbdev_t *dev, int port) ehci_rh_hand_over_port(dev, port); return; } - p->port_enable = 0; - p->port_reset = 1; + + /* Deassert enable, assert reset. These must change + * atomically. + */ + tmp = *p; + tmp.port_enable = 0; + tmp.port_reset = 1; + *p = tmp; + + /* Wait a bit while reset is active. */ mdelay(50); - p->port_reset = 0; + + /* Deassert reset. */ + tmp.port_reset = 0; + *p = tmp; + /* Wait for flag change to finish. The controller might take a while */ while (p->port_reset) ; if (!p->port_enable) { @@ -95,7 +113,9 @@ ehci_rh_scanport (usbdev_t *dev, int port) RH_INST(dev)->devices[port] = usb_attach_device(dev->controller, dev->address, port, 2); } /* RW/C register, so clear it by writing 1 */ - p->conn_status_change = 1; + tmp = *p; + tmp.conn_status_change = 1; + *p = tmp; } static int @@ -122,6 +142,8 @@ void ehci_rh_init (usbdev_t *dev) { int i; + volatile portsc_t *p; + volatile portsc_t tmp; dev->destroy = ehci_rh_destroy; dev->poll = ehci_rh_poll; @@ -135,8 +157,11 @@ ehci_rh_init (usbdev_t *dev) RH_INST(dev)->devices = malloc(RH_INST(dev)->n_ports * sizeof(int)); for (i=0; i < RH_INST(dev)->n_ports; i++) { + p = &(RH_INST(dev)->ports[i]); RH_INST(dev)->devices[i] = -1; - RH_INST(dev)->ports[i].pp = 1; + tmp = *p; + tmp.pp = 1; + *p = tmp; } dev->address = 0;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
25
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 2011