diff options
| author | Oliver O'Halloran <oohall@gmail.com> | 2019-03-18 17:10:56 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-03-28 15:24:12 +1100 |
| commit | 0c86fef7e502e342df9669d6ccdcd07144ac4cef (patch) | |
| tree | 6b1a4b1a07dc09c286958c9ba36b0b571cee7c70 | |
| parent | efc568c1e30bf00dfec3fe795b24497bb7fd8d3a (diff) | |
| download | blackbird-skiboot-0c86fef7e502e342df9669d6ccdcd07144ac4cef.tar.gz blackbird-skiboot-0c86fef7e502e342df9669d6ccdcd07144ac4cef.zip | |
firenze-pci: Always init slot info from LXVPD
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>
| -rw-r--r-- | platforms/ibm-fsp/firenze-pci.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/platforms/ibm-fsp/firenze-pci.c b/platforms/ibm-fsp/firenze-pci.c index b87c65bf..dc0ff568 100644 --- a/platforms/ibm-fsp/firenze-pci.c +++ b/platforms/ibm-fsp/firenze-pci.c @@ -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)) { @@ -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) |
