May 2015 - coreboot-gerrit - mail.coreboot.org

Patch set updated for coreboot: 18f3087 autoport: Strip inc, co and corp suffixes from vendor name
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10372 -gerrit commit 18f30878b929b452ef0bb0eb9cf33f50e30d7ae5 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 21:43:51 2015 +0200 autoport: Strip inc, co and corp suffixes from vendor name Apple is named Apple Inc in DMI but is "apple" in coreboot naming. For other vendors we should follow similar pattern. Change-Id: I7975b19faaf942c5bd44a704bcee994815499ceb Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/main.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/util/autoport/main.go b/util/autoport/main.go index e9d847d..add58a1 100644 --- a/util/autoport/main.go +++ b/util/autoport/main.go @@ -90,6 +90,7 @@ type Context struct { Model string BaseDirectory string InfoSource DevReader + SaneVendor string } type IOAPICIRQ struct { @@ -622,7 +623,7 @@ const MoboDir = "/src/mainboard/" func makeVendor(ctx Context) { vendor := ctx.Vendor - vendorSane := sanitize(ctx.Vendor) + vendorSane := ctx.SaneVendor vendorDir := *FlagOutDir + MoboDir + vendorSane vendorUpper := strings.ToUpper(vendorSane) kconfig := vendorDir + "/Kconfig" @@ -702,8 +703,18 @@ func main() { if dmi.IsLaptop { KconfigBool["SYSTEM_TYPE_LAPTOP"] = true } - ctx.MoboID = sanitize(ctx.Vendor) + "/" + sanitize(ctx.Model) - ctx.KconfigName = "BOARD_" + strings.ToUpper(sanitize(ctx.Vendor)+"_"+sanitize(ctx.Model)) + ctx.SaneVendor = sanitize(ctx.Vendor) + for { + last := ctx.SaneVendor + for _, suf := range []string{"_inc", "_co", "_corp"} { + ctx.SaneVendor = strings.TrimSuffix(ctx.SaneVendor, suf) + } + if last == ctx.SaneVendor { + break + } + } + ctx.MoboID = ctx.SaneVendor + "/" + sanitize(ctx.Model) + ctx.KconfigName = "BOARD_" + strings.ToUpper(ctx.SaneVendor+"_"+sanitize(ctx.Model)) ctx.BaseDirectory = *FlagOutDir + MoboDir + ctx.MoboID KconfigStringUnquoted["MAINBOARD_DIR"] = ctx.MoboID KconfigString["MAINBOARD_PART_NUMBER"] = ctx.Model

1 0

Patch set updated for coreboot: 0c83439 autoport: Allow binary prerequisites to be placed in the autoport directory.
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10370 -gerrit commit 0c834391685e8f54cd8cd3d22dd4a8b93dc26ba7 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 20:49:09 2015 +0200 autoport: Allow binary prerequisites to be placed in the autoport directory. This allow an easy creation of standalone "autoport pack". Change-Id: Ibe9e38aa3b4bbd7260104e1c2a11630790ff4d2f Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/log_maker.go | 22 ++++++++++++++++++++-- util/autoport/readme.md | 7 ++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/util/autoport/log_maker.go b/util/autoport/log_maker.go index b991ea7..e2440b4 100644 --- a/util/autoport/log_maker.go +++ b/util/autoport/log_maker.go @@ -9,7 +9,7 @@ import ( "strings" ) -func RunAndSave(output string, name string, arg ...string) { +func TryRunAndSave(output string, name string, arg []string) error { cmd := exec.Command(name, arg...) f, err := os.Create(output) @@ -22,9 +22,27 @@ func RunAndSave(output string, name string, arg ...string) { err = cmd.Start() if err != nil { - log.Fatal(err) + return err } cmd.Wait() + return nil +} + +func RunAndSave(output string, name string, arg ...string) { + err := TryRunAndSave(output, name, arg) + if err == nil { + return + } + idx := strings.LastIndex(name, "/") + relname := name + if idx >= 0 { + relname = name[idx+1:] + } + relname = "./" + relname + err = TryRunAndSave(output, relname, arg) + if err != nil { + log.Fatal(err) + } } func MakeLogs(outDir string) { diff --git a/util/autoport/readme.md b/util/autoport/readme.md index 2f525a9..8c139a3 100644 --- a/util/autoport/readme.md +++ b/util/autoport/readme.md @@ -30,7 +30,12 @@ This will allow autoport to detect as much as possible make cd ../autoport go build - ./autoport --input_log=logs --make_logs --coreboot_dir=../.. + sudo ./autoport --input_log=logs --make_logs --coreboot_dir=../.. + + Note: in case you have problems getting gcc and golang to target machine + you can just compile on another machine and transfer binaries + `autoport`, `inteltool` and `ectool`. You'll still need other prerequisites + but you may place them in the same directory as autoport. * Look for output unknown PCI devices. E.g.

1 0

Patch set updated for coreboot: f2e47de autoport/bd82x6x: Fix off-by-one error
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10371 -gerrit commit f2e47def8d9b1c9f96cfa5a14fed7d35a2a9f060 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 21:43:42 2015 +0200 autoport/bd82x6x: Fix off-by-one error Change-Id: Ibd5c8a1364ab183f72e12cc9b450a36200fe3fde Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/bd82x6x.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/autoport/bd82x6x.go b/util/autoport/bd82x6x.go index 91538bd..4a0f503 100644 --- a/util/autoport/bd82x6x.go +++ b/util/autoport/bd82x6x.go @@ -105,7 +105,7 @@ func ich9GetFlashSize(ctx Context) { highflkb := uint32(0) for reg := uint16(0); reg < 5; reg++ { fl := (inteltool.RCBA[0x3854+4*reg] >> 16) & 0x1fff - flkb := fl << 2 + flkb := (fl + 1) << 2 if flkb > highflkb { highflkb = flkb }

1 0

New patch to review for coreboot: 088ebaf autoport: Improve keyboard detection.
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10376 -gerrit commit 088ebaf841467149b5955f1014cf8bb2714fb5a0 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 23:53:37 2015 +0200 autoport: Improve keyboard detection. Previously I tried to see if Linux think that port 0x60 is in use by keyboard. Unfortunately it always thinks that it is. Instead just base off real input busses used. Change-Id: I4bb744938f623d29f38396165a1694fee78c3d32 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/ec_fixme.go | 2 +- util/autoport/log_maker.go | 19 +++++++++++++++++++ util/autoport/log_reader.go | 16 ++++++++++++++++ util/autoport/main.go | 1 + 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/util/autoport/ec_fixme.go b/util/autoport/ec_fixme.go index d7dff52..850998d 100644 --- a/util/autoport/ec_fixme.go +++ b/util/autoport/ec_fixme.go @@ -6,7 +6,7 @@ func FIXMEEC(ctx Context) { ap := Create(ctx, "acpi/platform.asl") defer ap.Close() - hasKeyboard := IsIOPortUsedBy(ctx, 0x60, "keyboard") + hasKeyboard := ctx.InfoSource.HasPS2() sbGPE := GuessECGPE(ctx) var GPEUnsure bool diff --git a/util/autoport/log_maker.go b/util/autoport/log_maker.go index fccc452..3f36963 100644 --- a/util/autoport/log_maker.go +++ b/util/autoport/log_maker.go @@ -103,4 +103,23 @@ func MakeLogs(outDir string) { defer out.Close() io.Copy(out, in) } + + out, err := os.Create(outDir + "/input_bustypes.log") + if err != nil { + log.Fatal(err) + } + defer out.Close() + + ClassInputDir := "/sys/class/input/" + files, _ = ioutil.ReadDir(ClassInputDir) + for _, f := range files { + if strings.HasPrefix(f.Name(), "input") && !f.Mode().IsRegular() { /* Allow both dirs and symlinks. */ + in, err := os.Open(ClassInputDir + f.Name() + "/id/bustype") + defer in.Close() + if err != nil { + log.Fatal(err) + } + io.Copy(out, in) + } + } } diff --git a/util/autoport/log_reader.go b/util/autoport/log_reader.go index 58f1182..c94d182 100644 --- a/util/autoport/log_reader.go +++ b/util/autoport/log_reader.go @@ -359,6 +359,22 @@ func (l *LogDevReader) GetCPUModel() (ret []uint32) { return } +func (l *LogDevReader) HasPS2() bool { + file, err := os.Open(l.InputDirectory + "/input_bustypes.log") + if err != nil { + log.Fatal(err) + } + defer file.Close() + scanner := bufio.NewScanner(file) + for scanner.Scan() { + line := scanner.Text() + if strings.Index(line, "0011") >= 0 { + return true + } + } + return false +} + var FlagLogInput = flag.String("input_log", ".", "Input log directory") var FlagLogMkLogs = flag.Bool("make_logs", false, "Dump logs") diff --git a/util/autoport/main.go b/util/autoport/main.go index c25e565..f38346c 100644 --- a/util/autoport/main.go +++ b/util/autoport/main.go @@ -59,6 +59,7 @@ type DevReader interface { GetCPUModel() []uint32 GetEC() []byte GetIOPorts() []IOPorts + HasPS2() bool } type IOPorts struct {

1 0

New patch to review for coreboot: b8b903b autoport: Add a note that slot labeling is unreliable.
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10375 -gerrit commit b8b903bbe76a172d3aef57c0b8b783a28fa0bcdd Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 22:12:33 2015 +0200 autoport: Add a note that slot labeling is unreliable. Change-Id: I26c78d05524e5affcd44b528895d1e19905e924b Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/autoport/readme.md b/util/autoport/readme.md index 8c139a3..9a16fd2 100644 --- a/util/autoport/readme.md +++ b/util/autoport/readme.md @@ -126,6 +126,9 @@ the first entry in SPD map has to be `0x50`. Once you have SPD map your You can and should omit lines which correspond to slots not present on your machine. +Note: slot labelling may be missing or unreliable. Use `inteltool` to see +which slot have modules in them. + This way works well if your RAM is socketed. For soldered RAM if you see its SPD, you're in luck and can proceed the same way although you may have to guess some entries due to RAM not being removable.

1 0

New patch to review for coreboot: 2bb333e autoport/ec_fixme: Fix error in resulting code.
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10373 -gerrit commit 2bb333e80775436128d5749007d919bdc5ca1e76 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 21:51:54 2015 +0200 autoport/ec_fixme: Fix error in resulting code. Change-Id: Icfa3874b8e3accb3aa3db44d0baa6b7b5a683b41 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/ec_fixme.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/autoport/ec_fixme.go b/util/autoport/ec_fixme.go index 589a101..d7dff52 100644 --- a/util/autoport/ec_fixme.go +++ b/util/autoport/ec_fixme.go @@ -34,6 +34,7 @@ Method(_PTS,1) ecs := ctx.InfoSource.GetEC() MainboardIncludes = append(MainboardIncludes, "ec/acpi/ec.h") + MainboardIncludes = append(MainboardIncludes, "console/console.h") MainboardInit += ` /* FIXME: trim this down or remove if necessary */ @@ -58,6 +59,7 @@ Method(_PTS,1) } ` + KconfigBool["EC_ACPI"] = true si := Create(ctx, "acpi/superio.asl") defer si.Close() @@ -82,4 +84,5 @@ Method(_PTS,1) fmt.Fprintf(ec, "\tName (_GPE, %d)\n", sbGPE) } ec.WriteString("/* FIXME: EC support */\n") + ec.WriteString("}\n") }

1 0

New patch to review for coreboot: 20dcfd6 autoport: Fix SPD map guessing function.
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10374 -gerrit commit 20dcfd60fa05fb1699cfa71bbfca0695d722dc1a Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 22:09:06 2015 +0200 autoport: Fix SPD map guessing function. It was reversed between Lenovo and non-Lenovo cases. Change-Id: I52c3b928abda2851e97ec0b40b7da5c5191217f5 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/autoport/main.go b/util/autoport/main.go index fb16a45..c25e565 100644 --- a/util/autoport/main.go +++ b/util/autoport/main.go @@ -678,9 +678,9 @@ func GuessSPDMap(ctx Context) []uint8 { dmi := ctx.InfoSource.GetDMI() if dmi.Vendor == "LENOVO" { - return []uint8{0x50, 0x51, 0x52, 0x53} + return []uint8{0x50, 0x52, 0x51, 0x53} } - return []uint8{0x50, 0x52, 0x51, 0x53} + return []uint8{0x50, 0x51, 0x52, 0x53} }

1 0

New patch to review for coreboot: 65ae1a6 autoport: Strip inc, co and corp suffixes from vendor name
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10372 -gerrit commit 65ae1a64d5d75f03e78aa3e45bbf2119925980fd Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 21:43:51 2015 +0200 autoport: Strip inc, co and corp suffixes from vendor name Apple is named Apple Inc in DMI but is "apple" in coreboot naming. For other vendors we should follow similar pattern. Change-Id: I7975b19faaf942c5bd44a704bcee994815499ceb Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/main.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/util/autoport/main.go b/util/autoport/main.go index e9d847d..fb16a45 100644 --- a/util/autoport/main.go +++ b/util/autoport/main.go @@ -90,6 +90,7 @@ type Context struct { Model string BaseDirectory string InfoSource DevReader + SaneVendor string } type IOAPICIRQ struct { @@ -622,7 +623,7 @@ const MoboDir = "/src/mainboard/" func makeVendor(ctx Context) { vendor := ctx.Vendor - vendorSane := sanitize(ctx.Vendor) + vendorSane := ctx.SaneVendor vendorDir := *FlagOutDir + MoboDir + vendorSane vendorUpper := strings.ToUpper(vendorSane) kconfig := vendorDir + "/Kconfig" @@ -682,6 +683,7 @@ func GuessSPDMap(ctx Context) []uint8 { return []uint8{0x50, 0x52, 0x51, 0x53} } + func main() { flag.Parse() @@ -702,8 +704,18 @@ func main() { if dmi.IsLaptop { KconfigBool["SYSTEM_TYPE_LAPTOP"] = true } - ctx.MoboID = sanitize(ctx.Vendor) + "/" + sanitize(ctx.Model) - ctx.KconfigName = "BOARD_" + strings.ToUpper(sanitize(ctx.Vendor)+"_"+sanitize(ctx.Model)) + ctx.SaneVendor = sanitize(ctx.Vendor) + for { + last := ctx.SaneVendor + for _, suf := range []string{"_inc", "_co", "_corp"} { + ctx.SaneVendor = strings.TrimSuffix(ctx.SaneVendor, suf) + } + if (last == ctx.SaneVendor) { + break + } + } + ctx.MoboID = ctx.SaneVendor + "/" + sanitize(ctx.Model) + ctx.KconfigName = "BOARD_" + strings.ToUpper(ctx.SaneVendor+"_"+sanitize(ctx.Model)) ctx.BaseDirectory = *FlagOutDir + MoboDir + ctx.MoboID KconfigStringUnquoted["MAINBOARD_DIR"] = ctx.MoboID KconfigString["MAINBOARD_PART_NUMBER"] = ctx.Model

1 0

New patch to review for coreboot: 89f566e autoport/bd82x6x: Fix off-by-one error
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10371 -gerrit commit 89f566edf0669751aa2ebf5e0f01ff6a590545c8 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 21:43:42 2015 +0200 autoport/bd82x6x: Fix off-by-one error Change-Id: Ibd5c8a1364ab183f72e12cc9b450a36200fe3fde Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/bd82x6x.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/autoport/bd82x6x.go b/util/autoport/bd82x6x.go index 91538bd..4a0f503 100644 --- a/util/autoport/bd82x6x.go +++ b/util/autoport/bd82x6x.go @@ -105,7 +105,7 @@ func ich9GetFlashSize(ctx Context) { highflkb := uint32(0) for reg := uint16(0); reg < 5; reg++ { fl := (inteltool.RCBA[0x3854+4*reg] >> 16) & 0x1fff - flkb := fl << 2 + flkb := (fl + 1) << 2 if flkb > highflkb { highflkb = flkb }

1 0

New patch to review for coreboot: 9f754ac autoport: Allow binary prerequisites to be placed in the autoport directory.
by Vladimir Serbinenko May 29, 2015

May 29, 2015

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10370 -gerrit commit 9f754ac3505b7e80c5b4e4fb0f5800519a790f58 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri May 29 20:49:09 2015 +0200 autoport: Allow binary prerequisites to be placed in the autoport directory. This allow an easy creation of standalone "autoport pack". Change-Id: Ibe9e38aa3b4bbd7260104e1c2a11630790ff4d2f Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/autoport/log_maker.go | 22 ++++++++++++++++++++-- util/autoport/readme.md | 7 ++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/util/autoport/log_maker.go b/util/autoport/log_maker.go index b991ea7..fccc452 100644 --- a/util/autoport/log_maker.go +++ b/util/autoport/log_maker.go @@ -9,7 +9,7 @@ import ( "strings" ) -func RunAndSave(output string, name string, arg ...string) { +func TryRunAndSave(output string, name string, arg []string) error { cmd := exec.Command(name, arg...) f, err := os.Create(output) @@ -22,9 +22,27 @@ func RunAndSave(output string, name string, arg ...string) { err = cmd.Start() if err != nil { - log.Fatal(err) + return err } cmd.Wait() + return nil +} + +func RunAndSave(output string, name string, arg ...string) { + err := TryRunAndSave(output, name, arg) + if err == nil { + return + } + idx:=strings.LastIndex(name, "/") + relname := name + if idx >= 0 { + relname = name[idx+1:] + } + relname = "./" + relname + err = TryRunAndSave(output, relname, arg) + if err != nil { + log.Fatal(err) + } } func MakeLogs(outDir string) { diff --git a/util/autoport/readme.md b/util/autoport/readme.md index 2f525a9..8c139a3 100644 --- a/util/autoport/readme.md +++ b/util/autoport/readme.md @@ -30,7 +30,12 @@ This will allow autoport to detect as much as possible make cd ../autoport go build - ./autoport --input_log=logs --make_logs --coreboot_dir=../.. + sudo ./autoport --input_log=logs --make_logs --coreboot_dir=../.. + + Note: in case you have problems getting gcc and golang to target machine + you can just compile on another machine and transfer binaries + `autoport`, `inteltool` and `ectool`. You'll still need other prerequisites + but you may place them in the same directory as autoport. * Look for output unknown PCI devices. E.g.

1 0