sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/autoport: Use chipset.cb references

Browse Source 
TESTED with x220 logs.

Change-Id: I89023b6c6dd5d985168331fbb12b2fc36fb65dc3
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72597
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jakub Czapiga <jacz@semihalf.com>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
This commit is contained in:
Arthur Heymans
2023-01-30 13:32:44 +01:00
committed by Paul Fagerburg
parent b5df65a9aa
commit bc3261f828
3 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
util/autoport/main.go
View File

@@ -238,6 +238,7 @@ func RestoreRCBA32(f *os.File, inteltool InteltoolData, addr uint16) {
type PCISlot struct {
PCIAddr
alias string
additionalComment string
writeEmpty bool
}
@@ -361,14 +362,18 @@ func writeOn(dt *os.File, dev DevTreeNode) {
}
}
func WriteDev(dt *os.File, offset int, dev DevTreeNode) {
func WriteDev(dt *os.File, offset int, alias string, dev DevTreeNode) {
Offset(dt, offset)
switch dev.Chip {
case "cpu_cluster", "lapic", "domain", "ioapic":
fmt.Fprintf(dt, "device %s 0x%x ", dev.Chip, dev.Dev)
writeOn(dt, dev)
case "pci", "pnp":
fmt.Fprintf(dt, "device %s %02x.%x ", dev.Chip, dev.Dev, dev.Func)
if alias != "" {
fmt.Fprintf(dt, "device ref %s ", alias)
} else {
fmt.Fprintf(dt, "device %s %02x.%x ", dev.Chip, dev.Dev, dev.Func)
}
writeOn(dt, dev)
case "i2c":
fmt.Fprintf(dt, "device %s %02x ", dev.Chip, dev.Dev)
@@ -422,7 +427,14 @@ func WriteDev(dt *os.File, offset int, dev DevTreeNode) {
}
for _, child := range dev.Children {
WriteDev(dt, offset+1, child)
alias = ""
for _, slot := range dev.PCISlots {
if slot.PCIAddr.Bus == child.Bus &&
slot.PCIAddr.Dev == child.Dev && slot.PCIAddr.Func == child.Func {
alias = slot.alias
}
}
WriteDev(dt, offset+1, alias, child)
}
Offset(dt, offset)
@@ -739,7 +751,7 @@ func main() {
defer devtree.Close()
MatchDev(&DevTree)
WriteDev(devtree, 0, DevTree)
WriteDev(devtree, 0, "", DevTree)
if MainboardInit != "" || MainboardEnable != "" || MainboardIncludes != nil {
mainboard := Create(ctx, "mainboard.c")