From f21673c68854ff612cac1ac59ca784e229a1b21b Mon Sep 17 00:00:00 2001 From: Madhavan Srinivasan Date: Mon, 16 Oct 2017 13:57:58 +0530 Subject: hw/imc: Fix the pvr (sub_id) for IMC Catalog load Currently IMC catalog carry multiple dtbs in the pnor partition, one for each power9 major versions. And system pvr value (pvr_type and pvr_major version) is used as sub-id to load the right dtb from the partition. Since minor version of pvr is not used, mask it out. Reported-by: Shriya Signed-off-by: Madhavan Srinivasan Signed-off-by: Stewart Smith --- hw/imc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw') diff --git a/hw/imc.c b/hw/imc.c index 72207e1..88d0302 100644 --- a/hw/imc.c +++ b/hw/imc.c @@ -381,7 +381,7 @@ static void disable_unavailable_units(struct dt_node *dev) */ void imc_catalog_preload(void) { - uint32_t pvr = (mfspr(SPR_PVR) & ~(0xf000)); + uint32_t pvr = (mfspr(SPR_PVR) & ~(0xf0ff)); int ret = OPAL_SUCCESS; compress_buf_size = MAX_COMPRESSED_IMC_DTB_SIZE; @@ -467,7 +467,7 @@ static void imc_dt_update_nest_node(struct dt_node *dev) void imc_init(void) { void *decompress_buf = NULL; - uint32_t pvr = (mfspr(SPR_PVR) & ~(0xf000)); + uint32_t pvr = (mfspr(SPR_PVR) & ~(0xf0ff)); struct dt_node *dev; int ret; -- cgit v1.1