From 1c3baae4f2b3754fe6062db29697308aa85b9c82 Mon Sep 17 00:00:00 2001 From: Oliver O'Halloran Date: Mon, 18 Mar 2019 17:10:51 +1100 Subject: 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 Tested-by: Vasant Hegde [stewart: fixup op920 hdat_to_dt dts expected result, remove incorrect comment, skip IOVPD loading on non-FSP.] Signed-off-by: Stewart Smith --- core/vpd.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'core') diff --git a/core/vpd.c b/core/vpd.c index 94b7b7a..054a708 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; -- cgit v1.1