diff options
| author | Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | 2017-08-28 12:47:59 +0530 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-09-04 20:45:35 -0500 |
| commit | 2a73bbed50c3daefb88a362f29ef6f415e05043b (patch) | |
| tree | c21415d7585cabc5316a6599a21d5e5b0b7c5554 /hdata | |
| parent | 789b0e3586e004e8139d87dc586a54c78b21f10a (diff) | |
| download | blackbird-skiboot-2a73bbed50c3daefb88a362f29ef6f415e05043b.tar.gz blackbird-skiboot-2a73bbed50c3daefb88a362f29ef6f415e05043b.zip | |
hdata: Fix vpd parse
We detect vpd data format in vpd_parse() and set "op_platform" variable.
dt_add_vpd_node() depends on op_platform to select parser type.
There are places where we call dt_add_vpd_node() even before calling
vpd_parse(). And in such cases it will not parse vpd data properly.
This patch fixes above issue.
Fixes: 694546c1 (hdata/vpd: Parse the OpenPOWER OPFR record)
CC: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Acked-by: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'hdata')
| -rw-r--r-- | hdata/vpd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/hdata/vpd.c b/hdata/vpd.c index d7d57cda..0e23e298 100644 --- a/hdata/vpd.c +++ b/hdata/vpd.c @@ -23,8 +23,6 @@ #include "hdata.h" #include <inttypes.h> -static bool op_platform; - struct card_info { const char *ccin; /* Customer card identification number */ const char *description; @@ -492,7 +490,7 @@ struct dt_node *dt_add_vpd_node(const struct HDIF_common_hdr *hdr, && !dt_find_property(node, "ibm,vpd")) { dt_add_property(node, "ibm,vpd", fruvpd, fruvpd_sz); - if (op_platform) + if (vpd_find_record(fruvpd, fruvpd_sz, "OPFR", NULL)) vpd_opfr_parse(node, fruvpd, fruvpd_sz); else vpd_vini_parse(node, fruvpd, fruvpd_sz); @@ -607,10 +605,9 @@ static void sysvpd_parse(void) } /* Look for the new OpenPower "OSYS" first */ - if (vpd_find_record(sysvpd, sysvpd_sz, "OSYS", NULL)) { - op_platform = true; + if (vpd_find_record(sysvpd, sysvpd_sz, "OSYS", NULL)) sysvpd_parse_opp(sysvpd, sysvpd_sz); - } else + else sysvpd_parse_legacy(sysvpd, sysvpd_sz); dt_add_model_name(); |
