aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>2018-02-09 15:11:43 +0530
committerStewart Smith <stewart@linux.vnet.ibm.com>2018-02-13 01:30:02 -0600
commit92a303dfeeb61c73ea4d9226af6c4d874db6bc89 (patch)
tree212d91fd5b26aa0bd37c52e3e429edf2f0a0bb77 /hw
parent782b91a5b85a35d93cb75ddda146ac97678d8be5 (diff)
downloadskiboot-92a303dfeeb61c73ea4d9226af6c4d874db6bc89.zip
skiboot-92a303dfeeb61c73ea4d9226af6c4d874db6bc89.tar.gz
skiboot-92a303dfeeb61c73ea4d9226af6c4d874db6bc89.tar.bz2
hw/occ: Fix fast-reboot crash in P8 platforms.
commit 85a1de35cbe4 ("fast-boot: occ: Re-parse the pstate table during fast-boot" ) breaks the fast-reboot on P8 platforms while reiniting the OCC pstates. On P8 platforms OPAL adds additional two properties #address-cells and #size-cells under ibm,opal/power-mgmt/ DT node. While in fast-reboot same properties adding back to the same node results in Duplicate properties and hence fast-reboot fails with below traces. [ 541.410373292,5] OCC: All Chip Rdy after 0 ms [ 541.410488745,3] Duplicate property "#address-cells" in node /ibm,opal/power-mgt [ 541.410694290,0] Aborting! CPU 0058 Backtrace: S: 0000000031d639d0 R: 000000003001367c .backtrace+0x48 S: 0000000031d63a60 R: 000000003001a03c ._abort+0x4c S: 0000000031d63ae0 R: 00000000300267d8 .new_property+0xd8 S: 0000000031d63b70 R: 0000000030026a28 .__dt_add_property_cells+0x30 S: 0000000031d63c10 R: 000000003003ea3c .occ_pstates_init+0x984 S: 0000000031d63d90 R: 00000000300142d8 .load_and_boot_kernel+0x86c S: 0000000031d63e70 R: 000000003002586c .fast_reboot_entry+0x358 S: 0000000031d63f00 R: 00000000300029f4 fast_reset_entry+0x2c This patch fixes this issue by removing these two properties on P8 while doing OCC pstates re-init in fast-reboot code path. Fixes: 85a1de35cbe4 Signed-off-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/occ.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/occ.c b/hw/occ.c
index fb7e683..eae03cd 100644
--- a/hw/occ.c
+++ b/hw/occ.c
@@ -1568,6 +1568,8 @@ void occ_pstates_init(void)
"ibm,pstate-nominal",
"ibm,pstate-turbo",
"ibm,pstate-ultra-turbo",
+ "#address-cells",
+ "#size-cells",
};
power_mgt = dt_find_by_path(dt_root, "/ibm,opal/power-mgt");