diff mbox series

[2/3] pcie_chassis: add slot_max field

Message ID 20210331160835.160670-2-tom.ty89@gmail.com
State New
Headers show
Series [1/3] pcie_chassis: use an available slot number if not explicity set | expand

Commit Message

Tom Yan March 31, 2021, 4:08 p.m. UTC 
Keep track of the largested allocated slot number when adding slot.

Signed-off-by: Tom Yan <tom.ty89@gmail.com>
---
 hw/pci/pcie_port.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
index 40fd80c4da..1e2348250c 100644
--- a/hw/pci/pcie_port.c
+++ b/hw/pci/pcie_port.c
@@ -49,6 +49,7 @@  void pcie_port_init_reg(PCIDevice *d)
  */
 struct PCIEChassis {
     uint8_t     number;
+    uint16_t    slot_max; // largest allocated slot number
 
     QLIST_HEAD(, PCIESlot) slots;
     QLIST_ENTRY(PCIEChassis) next;
@@ -94,19 +95,11 @@  static PCIESlot *pcie_chassis_find_slot_with_chassis(struct PCIEChassis *c,
 
 static void pcie_chassis_find_avail_slot_with_chassis(struct PCIEChassis *c, struct PCIESlot *slot)
 {
-    PCIESlot *s;
-    uint16_t slot_max = 0;
-    QLIST_FOREACH(s, &c->slots, next) {
-        if (s->slot > slot_max) {
-            slot_max = s->slot;
-        }
-    }
-
     /*
       find an available number to use from slot->slot (inclusive) to
-      slot_max; if there is none, use slot_max+1
+      c->slot_max; if there is none, use c->slot_max+1
     */
-    while (slot->slot <= slot_max) {
+    while (slot->slot <= c->slot_max) {
         if (!pcie_chassis_find_slot_with_chassis(c, slot->slot)) {
             break;
         }
@@ -137,6 +130,8 @@  int pcie_chassis_add_slot(struct PCIESlot *slot)
         return -EBUSY;
     }
     QLIST_INSERT_HEAD(&c->slots, slot, next);
+    if (slot->slot > c->slot_max)
+        c->slot_max = slot->slot;
     return 0;
 }