<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27361">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[WIP]util/autoport: Change the order in which chips and PCI devices are added<br><br>That way pci0.0-2.0 are places above chip southbridge/intel/bd82x6x<br><br>Change-Id: Ib4c7c43dd209678aa3d37fe75a8d010192ae2803<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M util/autoport/main.go<br>1 file changed, 28 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/27361/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/autoport/main.go b/util/autoport/main.go</span><br><span>index 3071559..b039631 100644</span><br><span>--- a/util/autoport/main.go</span><br><span>+++ b/util/autoport/main.go</span><br><span>@@ -290,34 +290,6 @@</span><br><span>      }</span><br><span> </span><br><span>        for _, slot := range dev.PCISlots {</span><br><span style="color: hsl(0, 100%, 40%);">-             slotChip, ok := unmatchedPCIChips[slot.PCIAddr]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-         if !ok {</span><br><span style="color: hsl(0, 100%, 40%);">-                        continue</span><br><span style="color: hsl(0, 100%, 40%);">-                }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               if slot.additionalComment != "" && slotChip.Comment != "" {</span><br><span style="color: hsl(0, 100%, 40%);">-                 slotChip.Comment = slot.additionalComment + " " + slotChip.Comment</span><br><span style="color: hsl(0, 100%, 40%);">-            } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                        slotChip.Comment = slot.additionalComment + slotChip.Comment</span><br><span style="color: hsl(0, 100%, 40%);">-            }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               delete(unmatchedPCIChips, slot.PCIAddr)</span><br><span style="color: hsl(0, 100%, 40%);">-         MatchDev(&slotChip)</span><br><span style="color: hsl(0, 100%, 40%);">-         dev.Children = append(dev.Children, slotChip)</span><br><span style="color: hsl(0, 100%, 40%);">-   }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       if dev.PCIController {</span><br><span style="color: hsl(0, 100%, 40%);">-          for slot, slotDev := range unmatchedPCIChips {</span><br><span style="color: hsl(0, 100%, 40%);">-                  if slot.Bus == dev.ChildPCIBus {</span><br><span style="color: hsl(0, 100%, 40%);">-                                delete(unmatchedPCIChips, slot)</span><br><span style="color: hsl(0, 100%, 40%);">-                         MatchDev(&slotDev)</span><br><span style="color: hsl(0, 100%, 40%);">-                          dev.Children = append(dev.Children, slotDev)</span><br><span style="color: hsl(0, 100%, 40%);">-                    }</span><br><span style="color: hsl(0, 100%, 40%);">-               }</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       for _, slot := range dev.PCISlots {</span><br><span>          slotDev, ok := unmatchedPCIDevices[slot.PCIAddr]</span><br><span>             if !ok {</span><br><span>                     if slot.writeEmpty {</span><br><span>@@ -355,6 +327,34 @@</span><br><span>          delete(MissingChildren, dev.MissingParent)</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ for _, slot := range dev.PCISlots {</span><br><span style="color: hsl(120, 100%, 40%);">+           slotChip, ok := unmatchedPCIChips[slot.PCIAddr]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+             if !ok {</span><br><span style="color: hsl(120, 100%, 40%);">+                      continue</span><br><span style="color: hsl(120, 100%, 40%);">+              }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           if slot.additionalComment != "" && slotChip.Comment != "" {</span><br><span style="color: hsl(120, 100%, 40%);">+                       slotChip.Comment = slot.additionalComment + " " + slotChip.Comment</span><br><span style="color: hsl(120, 100%, 40%);">+          } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      slotChip.Comment = slot.additionalComment + slotChip.Comment</span><br><span style="color: hsl(120, 100%, 40%);">+          }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           delete(unmatchedPCIChips, slot.PCIAddr)</span><br><span style="color: hsl(120, 100%, 40%);">+               MatchDev(&slotChip)</span><br><span style="color: hsl(120, 100%, 40%);">+               dev.Children = append(dev.Children, slotChip)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if dev.PCIController {</span><br><span style="color: hsl(120, 100%, 40%);">+                for slot, slotDev := range unmatchedPCIChips {</span><br><span style="color: hsl(120, 100%, 40%);">+                        if slot.Bus == dev.ChildPCIBus {</span><br><span style="color: hsl(120, 100%, 40%);">+                              delete(unmatchedPCIChips, slot)</span><br><span style="color: hsl(120, 100%, 40%);">+                               MatchDev(&slotDev)</span><br><span style="color: hsl(120, 100%, 40%);">+                                dev.Children = append(dev.Children, slotDev)</span><br><span style="color: hsl(120, 100%, 40%);">+                  }</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  if dev.PCIController {</span><br><span>               for slot, slotDev := range unmatchedPCIDevices {</span><br><span>                     if slot.Bus == dev.ChildPCIBus {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27361">change 27361</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27361"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib4c7c43dd209678aa3d37fe75a8d010192ae2803 </div>
<div style="display:none"> Gerrit-Change-Number: 27361 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>