aboutsummaryrefslogtreecommitdiff
path: root/platforms/astbmc
diff options
context:
space:
mode:
authorGavin Shan <gwshan@linux.vnet.ibm.com>2016-08-11 14:55:13 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-10-11 15:01:54 +1100
commit121814d718272ee7ed743aad9d919c8365aeb6dd (patch)
treec01bab32177c6054fc13645e9165e9dfc2b2e124 /platforms/astbmc
parentd29c25372037e61a1c8c3dd2f04ff8e31c72db97 (diff)
downloadskiboot-121814d718272ee7ed743aad9d919c8365aeb6dd.zip
skiboot-121814d718272ee7ed743aad9d919c8365aeb6dd.tar.gz
skiboot-121814d718272ee7ed743aad9d919c8365aeb6dd.tar.bz2
platforms/astbmc: ibm, slot-label not depend on ibm, slot-location-code
"ibm,slot-label" should not depend on "ibm,slot-location-code". The later one can not be populted because of oversized "ibm,slot-label" or PHB's base location code. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'platforms/astbmc')
-rw-r--r--platforms/astbmc/slots.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/platforms/astbmc/slots.c b/platforms/astbmc/slots.c
index 6ffec7d..e71eb38 100644
--- a/platforms/astbmc/slots.c
+++ b/platforms/astbmc/slots.c
@@ -95,6 +95,8 @@ static void add_slot_properties(struct pci_slot *slot,
if (!np || !ent)
return;
+ dt_add_property_string(np, "ibm,slot-label", ent->name);
+
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)
@@ -111,7 +113,6 @@ static void add_slot_properties(struct pci_slot *slot,
strcat(loc_code, ent->name);
dt_add_property(np, "ibm,slot-location-code",
loc_code, strlen(loc_code) + 1);
- dt_add_property_string(np, "ibm,slot-label", ent->name);
}
void slot_table_get_slot_info(struct phb *phb, struct pci_device *pd)