aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2017-05-30 15:10:37 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-06-06 20:49:05 +1000
commit25897895a076471dc4566671fda5cf7d2a2c3379 (patch)
treece086cdd7233cd279a47595638877b2a38113029
parent5d919e412090951ae0139dc8b7f1223fba5ada79 (diff)
downloadskiboot-25897895a076471dc4566671fda5cf7d2a2c3379.zip
skiboot-25897895a076471dc4566671fda5cf7d2a2c3379.tar.gz
skiboot-25897895a076471dc4566671fda5cf7d2a2c3379.tar.bz2
mambo: Make xscom claim to be DD 2.0
In the mambo tcl we set the CPU version to DD 2.0, because mambo is not bug compatible with DD 1. But in xscom_read_cfam_chipid() we have a hard coded value, to work around the lack of the f000f register, which claims to be P9 DD 1.0. This doesn't seem to cause crashes or anything, but at boot we do see: [ 0.003893084,5] XSCOM: chip 0x0 at 0x1a0000000000 [P9N DD1.0] So fix it to claim that the xscom is also DD 2.0 to match the CPU. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--hw/xscom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xscom.c b/hw/xscom.c
index 9fb7da6..63813f1 100644
--- a/hw/xscom.c
+++ b/hw/xscom.c
@@ -597,7 +597,7 @@ int64_t xscom_read_cfam_chipid(uint32_t partid, uint32_t *chip_id)
*/
if (chip_quirk(QUIRK_NO_F000F)) {
if (proc_gen == proc_gen_p9)
- val = 0x100D104980000000UL; /* P9 Nimbus DD1.0 */
+ val = 0x200D104980000000UL; /* P9 Nimbus DD2.0 */
else
val = 0x221EF04980000000UL; /* P8 Murano DD2.1 */
} else