aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhavan Srinivasan <maddy@linux.vnet.ibm.com>2017-10-16 13:57:58 +0530
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-10-16 21:51:28 -0500
commitf21673c68854ff612cac1ac59ca784e229a1b21b (patch)
treed68c530d332ccf968fa4a0ad668f5bf5ed6d066f
parent39ffacb9691a3a4e5fe543787dfe4e671b6979b8 (diff)
downloadskiboot-f21673c68854ff612cac1ac59ca784e229a1b21b.zip
skiboot-f21673c68854ff612cac1ac59ca784e229a1b21b.tar.gz
skiboot-f21673c68854ff612cac1ac59ca784e229a1b21b.tar.bz2
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 <shriyak@linux.vnet.ibm.com> Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--hw/imc.c4
1 files changed, 2 insertions, 2 deletions
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;