[Skiboot] [PATCH 04/16] platforms/astbmc: Support dynamic PCI slot
Gavin Shan
gwshan at linux.vnet.ibm.com
Fri Sep 16 15:05:11 AEST 2016
We might insert a PCIe switch to PHB direct slot and the downstream
ports of the PCIe switch supports PCI hotplug. This creates dynamic
PCI slots for the downstream ports in the scenario:
* The dynamic PCI slot's label has fixed encoding: "S<domain><bus_num>".
* No associated platform slot.
* The management on dynamic PCI slot relies on the generic layer
implemented in pcie-slot.c.
Signed-off-by: Gavin Shan <gwshan at linux.vnet.ibm.com>
---
platforms/astbmc/slots.c | 67 +++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 61 insertions(+), 6 deletions(-)
diff --git a/platforms/astbmc/slots.c b/platforms/astbmc/slots.c
index ff69e99..47db021 100644
--- a/platforms/astbmc/slots.c
+++ b/platforms/astbmc/slots.c
@@ -17,6 +17,7 @@
#include <device.h>
#include <console.h>
#include <chip.h>
+#include <pci-cfg.h>
#include <pci.h>
#include <pci-slot.h>
@@ -88,17 +89,24 @@ static void add_slot_properties(struct pci_slot *slot,
struct dt_node *np)
{
struct phb *phb = slot->phb;
+ struct pci_device *pd = slot->pd;
struct slot_table_entry *ent = slot->data;
size_t base_loc_code_len, slot_label_len;
- char loc_code[LOC_CODE_SIZE];
+ char label[8], loc_code[LOC_CODE_SIZE];
- if (!np || !ent)
+ if (!np)
return;
- dt_add_property_string(np, "ibm,slot-label", ent->name);
+ if (ent) {
+ dt_add_property_string(np, "ibm,slot-label", ent->name);
+ slot_label_len = strlen(ent->name);
+ } else {
+ snprintf(label, 8, "S%04x%02x", phb->opal_id, pd->secondary_bus);
+ dt_add_property_string(np, "ibm,slot-label", label);
+ slot_label_len = strlen(label);
+ }
base_loc_code_len = phb->base_loc_code ? strlen(phb->base_loc_code) : 0;
- slot_label_len = strlen(ent->name);
if ((base_loc_code_len + slot_label_len + 1) >= LOC_CODE_SIZE)
return;
@@ -110,7 +118,10 @@ static void add_slot_properties(struct pci_slot *slot,
loc_code[0] = '\0';
}
- strcat(loc_code, ent->name);
+ if (ent)
+ strcat(loc_code, ent->name);
+ else
+ strcat(loc_code, label);
dt_add_property(np, "ibm,slot-location-code",
loc_code, strlen(loc_code) + 1);
}
@@ -130,6 +141,48 @@ static void init_slot_info(struct pci_slot *slot, bool pluggable, void *data)
slot->attn_led_ctl = PCI_SLOT_ATTN_LED_CTL_NONE;
}
+static void create_dynamic_slot(struct phb *phb, struct pci_device *pd)
+{
+ struct pci_slot *slot;
+ uint32_t ecap, val32;
+ uint16_t val16;
+
+ if (!phb || !pd || pd->slot)
+ return;
+
+ /* Try to create slot whose details aren't provided by platform.
+ * We only care the downstream ports of PCIe switch.
+ */
+ if (pd->dev_type != PCIE_TYPE_SWITCH_DNPORT)
+ return;
+
+ /* The dynamic PCI slots are created for below PCIe switches:
+ *
+ * 0x854611f8 - PCI bridge: PMC-Sierra Inc. Device 8546
+ */
+ if (pd->vdid != 0x854611f8)
+ return;
+
+ /* Check the builtin PCI slot capability. As we already checked
+ * the downstream port's vendor/device ID, the below check is
+ * almost unnecessary, but not harmful.
+ */
+ ecap = pci_cap(pd, PCI_CFG_CAP_ID_EXP, false);
+ if (!ecap)
+ return;
+
+ pci_cfg_read16(phb, pd->bdfn, ecap + PCICAP_EXP_CAPABILITY_REG, &val16);
+ if (!(val16 & PCICAP_EXP_CAP_SLOT))
+ return;
+ pci_cfg_read32(phb, pd->bdfn, ecap + PCICAP_EXP_SLOTCAP, &val32);
+ if (!(val32 & PCICAP_EXP_SLOTCAP_HPLUG_CAP))
+ return;
+
+ slot = pcie_slot_create(phb, pd);
+ assert(slot);
+ init_slot_info(slot, true, NULL);
+}
+
void slot_table_get_slot_info(struct phb *phb, struct pci_device *pd)
{
const struct slot_table_entry *ent;
@@ -139,8 +192,10 @@ void slot_table_get_slot_info(struct phb *phb, struct pci_device *pd)
if (!pd || pd->slot)
return;
ent = match_slot_dev_entry(phb, pd);
- if (!ent || !ent->name)
+ if (!ent || !ent->name) {
+ create_dynamic_slot(phb, pd);
return;
+ }
slot = pcie_slot_create(phb, pd);
assert(slot);
--
2.1.0
More information about the Skiboot
mailing list