[coreboot-gerrit] Change in coreboot[master]: [WIP]util/autoport: Change the order in which chips and PCI devices a...

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/27361


Change subject: [WIP]util/autoport: Change the order in which chips and PCI devices are added
......................................................................

[WIP]util/autoport: Change the order in which chips and PCI devices are added

That way pci0.0-2.0 are places above chip southbridge/intel/bd82x6x

Change-Id: Ib4c7c43dd209678aa3d37fe75a8d010192ae2803
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
M util/autoport/main.go
1 file changed, 28 insertions(+), 28 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/27361/1

diff --git a/util/autoport/main.go b/util/autoport/main.go
index 3071559..b039631 100644
--- a/util/autoport/main.go
+++ b/util/autoport/main.go
@@ -290,34 +290,6 @@
 	}
 
 	for _, slot := range dev.PCISlots {
-		slotChip, ok := unmatchedPCIChips[slot.PCIAddr]
-
-		if !ok {
-			continue
-		}
-
-		if slot.additionalComment != "" && slotChip.Comment != "" {
-			slotChip.Comment = slot.additionalComment + " " + slotChip.Comment
-		} else {
-			slotChip.Comment = slot.additionalComment + slotChip.Comment
-		}
-
-		delete(unmatchedPCIChips, slot.PCIAddr)
-		MatchDev(&slotChip)
-		dev.Children = append(dev.Children, slotChip)
-	}
-
-	if dev.PCIController {
-		for slot, slotDev := range unmatchedPCIChips {
-			if slot.Bus == dev.ChildPCIBus {
-				delete(unmatchedPCIChips, slot)
-				MatchDev(&slotDev)
-				dev.Children = append(dev.Children, slotDev)
-			}
-		}
-	}
-
-	for _, slot := range dev.PCISlots {
 		slotDev, ok := unmatchedPCIDevices[slot.PCIAddr]
 		if !ok {
 			if slot.writeEmpty {
@@ -355,6 +327,34 @@
 		delete(MissingChildren, dev.MissingParent)
 	}
 
+	for _, slot := range dev.PCISlots {
+		slotChip, ok := unmatchedPCIChips[slot.PCIAddr]
+
+		if !ok {
+			continue
+		}
+
+		if slot.additionalComment != "" && slotChip.Comment != "" {
+			slotChip.Comment = slot.additionalComment + " " + slotChip.Comment
+		} else {
+			slotChip.Comment = slot.additionalComment + slotChip.Comment
+		}
+
+		delete(unmatchedPCIChips, slot.PCIAddr)
+		MatchDev(&slotChip)
+		dev.Children = append(dev.Children, slotChip)
+	}
+
+	if dev.PCIController {
+		for slot, slotDev := range unmatchedPCIChips {
+			if slot.Bus == dev.ChildPCIBus {
+				delete(unmatchedPCIChips, slot)
+				MatchDev(&slotDev)
+				dev.Children = append(dev.Children, slotDev)
+			}
+		}
+	}
+
 	if dev.PCIController {
 		for slot, slotDev := range unmatchedPCIDevices {
 			if slot.Bus == dev.ChildPCIBus {

-- 
To view, visit https://review.coreboot.org/27361
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4c7c43dd209678aa3d37fe75a8d010192ae2803
Gerrit-Change-Number: 27361
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur at aheymans.xyz>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180705/6e6b7a28/attachment.html>