Skip to content

Commit

Permalink
firenze-pci: Always init slot info from LXVPD
Browse files Browse the repository at this point in the history
We can slot information from the LXVPD without having power control
information about that slot. This patch changes the init path so that
we always override the add_properties() call rather than only when we
have power control information about the slot.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
  • Loading branch information
oohal authored and stewartsmith committed Mar 28, 2019
1 parent efc568c commit 0c86fef
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions platforms/ibm-fsp/firenze-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,10 @@ static void firenze_pci_slot_init(struct pci_slot *slot)
uint32_t vdid;
int i;

/* Search for PCI slot info */
/* Init the slot info from the LXVPD */
slot->ops.add_properties = lxvpd_add_slot_properties;

/* Search for power control information in the per-system table */
for (i = 0; i < ARRAY_SIZE(firenze_pci_slots); i++) {
if (firenze_pci_slots[i].index == s->slot_index &&
!strcmp(firenze_pci_slots[i].label, s->label)) {
Expand Down Expand Up @@ -927,13 +930,6 @@ static void firenze_pci_slot_init(struct pci_slot *slot)
}
}
}

/*
* Anyway, the slot has platform specific info. That
* requires platform specific method to parse it out
* properly.
*/
slot->ops.add_properties = lxvpd_add_slot_properties;
}

void firenze_pci_setup_phb(struct phb *phb, unsigned int index)
Expand Down

0 comments on commit 0c86fef

Please sign in to comment.