diff options
| author | Oliver O'Halloran <oohall@gmail.com> | 2019-03-18 17:10:51 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-03-28 15:24:12 +1100 |
| commit | 1c3baae4f2b3754fe6062db29697308aa85b9c82 (patch) | |
| tree | b15d14ea1b3124424e7a946e98fcccd5fd16dcee /hdata | |
| parent | b392d785eb49630b9f00fef8d17944ed82b2c1fe (diff) | |
| download | blackbird-skiboot-1c3baae4f2b3754fe6062db29697308aa85b9c82.tar.gz blackbird-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 'hdata')
| -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 |
3 files changed, 8 insertions, 3 deletions
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>; |
