diff options
| -rw-r--r-- | core/vpd.c | 6 | ||||
| -rw-r--r-- | hdata/iohub.c | 3 | ||||
| -rw-r--r-- | hdata/test/hdata_to_dt.c | 7 | ||||
| -rw-r--r-- | hdata/test/op920.wsp.dts | 1 |
4 files changed, 14 insertions, 3 deletions
@@ -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; diff --git a/hdata/iohub.c b/hdata/iohub.c index 028fc6ab..feb8d6af 100644 --- a/hdata/iohub.c +++ b/hdata/iohub.c @@ -927,8 +927,7 @@ static void io_parse_fru(const void *sp_iohubs) io_parse_slots(sp_iohubs, chip_id); } - /* On P8, grab the CEC VPD */ - if (proc_gen == proc_gen_p8) + if (proc_gen == proc_gen_p8 || proc_gen == proc_gen_p9) io_add_p8_cec_vpd(sp_iohubs); } diff --git a/hdata/test/hdata_to_dt.c b/hdata/test/hdata_to_dt.c index b4a50740..5d30600f 100644 --- a/hdata/test/hdata_to_dt.c +++ b/hdata/test/hdata_to_dt.c @@ -1,4 +1,4 @@ -/* Copyright 2013-2014 IBM Corp. +/* Copyright 2013-2019 IBM Corp. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -170,6 +170,11 @@ static bool spira_check_ptr(const void *ptr, const char *file, unsigned int line #include <op-panel.h> +bool fsp_present() +{ + return false; +} + void op_display(enum op_severity s, enum op_module m, uint16_t code) { fprintf(stderr, "op_panel Severity: 0x%x (%s), module %x, %x\n", diff --git a/hdata/test/op920.wsp.dts b/hdata/test/op920.wsp.dts index c3ebecfc..4c61b0e7 100644 --- a/hdata/test/op920.wsp.dts +++ b/hdata/test/op920.wsp.dts @@ -5,6 +5,7 @@ #address-cells = <0x2>; #size-cells = <0x2>; compatible = "ibm,powernv", "ibm,p9-openbmc", "ibm,witherspoon"; + ibm,io-base-loc-code = "UOPWR.7887E6A-Node0"; nest-frequency = <0x0 0x77359400>; vendor = "IBM"; ibm,sw-checkstop-fir = <0x5012000 0x1f000000>; |
