summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2019-03-18 17:10:51 +1100
committerStewart Smith <stewart@linux.ibm.com>2019-03-28 15:24:12 +1100
commit1c3baae4f2b3754fe6062db29697308aa85b9c82 (patch)
treeb15d14ea1b3124424e7a946e98fcccd5fd16dcee /core
parentb392d785eb49630b9f00fef8d17944ed82b2c1fe (diff)
downloadtalos-skiboot-1c3baae4f2b3754fe6062db29697308aa85b9c82.tar.gz
talos-skiboot-1c3baae4f2b3754fe6062db29697308aa85b9c82.zip
hdata/iohub: Look for IOVPD on P9
P8 and P9 use the same IO VPD setup, so we need to load the IOHUB VPD on P9 systems too. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Tested-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> [stewart: fixup op920 hdat_to_dt dts expected result, remove incorrect comment, skip IOVPD loading on non-FSP.] Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'core')
-rw-r--r--core/vpd.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/vpd.c b/core/vpd.c
index 94b7b7aa..054a708d 100644
--- a/core/vpd.c
+++ b/core/vpd.c
@@ -157,6 +157,9 @@ static void *vpd_lid_preload(const uint8_t *lx)
{
int rc;
+ if (!fsp_present())
+ return NULL;
+
/* Now this is a guess game as we don't have the info from the
* pHyp folks. But basically, it seems to boil down to loading
* a LID whose name is 0x80e000yy where yy is the last 2 digits
@@ -212,6 +215,9 @@ void vpd_iohub_load(struct dt_node *hub_node)
const uint8_t *lx;
unsigned int lxrn;
+ if (!fsp_present())
+ return;
+
p = dt_prop_get_def(hub_node, "ibm,vpd-lx-info", NULL);
if (!p)
return;
OpenPOWER on IntegriCloud