[Skiboot] [PATCH] skiboot.tcl: Add chip-id to pmem device tree node

[Alistair Popple]

Skiboot expects a chip-id to be associated with the pmem device tree
node. Without one the following assertion is hit during boot:

1305405: (1305405): [    0.001300406,3] ***********************************************
1316412: (1316412): [    0.001306446,3] < assert failed at core/device.c:968 >
1319544: (1319544): [    0.001316645,3]     .
1322726: (1322726): [    0.001319777,3]      .
1325958: (1325958): [    0.001322959,3]       .
1329490: (1329490): [    0.001326191,3]         OO__)
1332972: (1332972): [    0.001329723,3]        <"__/
1336404: (1336404): [    0.001333205,3]         ^ ^
1612307: (1612307): [    0.001581877,3] Fatal TRAP at 00000000300297f4   .dt_get_chip_id+0x28  MSR 9000000000021002
1618779: (1618779): [    0.001612557,3] CFAR : 00000000300ce7b4 MSR  : 9000000030001000
1625236: (1625236): [    0.001619014,3] SRR0 : 00000000300297f4 SRR1 : 9000000000021002
1631693: (1631693): [    0.001625471,3] HSRR0: 0000000030012624 HSRR1: 9000000030001000
1637745: (1637745): [    0.001631928,3] DSISR: 00000000         DAR  : 0000000000000000
1644023: (1644023): [    0.001637980,3] LR   : 00000000300297dc CTR  : 0000000000000000
1649684: (1649684): [    0.001644258,3] CR   : 20000202         XER  : 00040000
1656705: (1656705): [    0.001649921,3] GPR00: 00000000300297dc GPR16: 0000000000000000
1663740: (1663740): [    0.001656946,3] GPR01: 0000000031c13940 GPR17: 0000000000000000
1670775: (1670775): [    0.001663981,3] GPR02: 0000000030127400 GPR18: 0000000000000000
1677810: (1677810): [    0.001671016,3] GPR03: 00000000ffffffff GPR19: 0000000000000000
1684845: (1684845): [    0.001678051,3] GPR04: 00000000300d0376 GPR20: 0000000000000000
1691796: (1691796): [    0.001685086,3] GPR05: 000000000000000c GPR21: 0000000000000000
1698831: (1698831): [    0.001692037,3] GPR06: 0000000031c10060 GPR22: 0000000000000000
1705960: (1705960): [    0.001699072,3] GPR07: 0000000030500010 GPR23: 00000000300eca0c
1713089: (1713089): [    0.001706201,3] GPR08: 0000000030502b48 GPR24: 00000000300cf2c8
1720124: (1720124): [    0.001713330,3] GPR09: 0000000000000000 GPR25: 00000000300ce8d7
1727182: (1727182): [    0.001720365,3] GPR10: 0000000000000063 GPR26: 00000000300ce8fb
1734228: (1734228): [    0.001727423,3] GPR11: 0000000000000003 GPR27: 00000000300d0398
1741358: (1741358): [    0.001734469,3] GPR12: 0000000040000402 GPR28: 00000000300ce91d
1748488: (1748488): [    0.001741599,3] GPR13: 0000000031c10000 GPR29: 00000000300d048f
1755618: (1755618): [    0.001748729,3] GPR14: 00000000300026fc GPR30: 0000000030502cb8
1762748: (1762748): [    0.001755859,3] GPR15: 0000000030000000 GPR31: 0000000030502cb8
2414283: (2414283): CPU 0000 Backtrace:
2414283: (2414283):  S: 0000000031c13c40 R: 00000000300297dc   .dt_get_chip_id+0x10
2414283: (2414283):  S: 0000000031c13cb0 R: 000000003002ab68   .add_chip_dev_associativity+0x14
2414283: (2414283):  S: 0000000031c13d50 R: 0000000030017c00   .mem_region_init+0x144
2414283: (2414283):  S: 0000000031c13e30 R: 00000000300153d0   .main_cpu_entry+0x4d4
2414283: (2414283):  S: 0000000031c13f00 R: 000000003000275c   boot_entry+0x1bc

Signed-off-by: Alistair Popple <alistair at popple.id.au>
---
 external/mambo/skiboot.tcl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl
index c353897b3..2c576c5ad 100644
--- a/external/mambo/skiboot.tcl
+++ b/external/mambo/skiboot.tcl
@@ -299,6 +299,7 @@ proc pmem_node_add { root start size } {
     mysim of addprop $node array "reg" reg
     mysim of addprop $node string "compatible" "pmem-region"
     mysim of addprop $node empty "volatile" "1"
+    mysim of addprop $node int "ibm,chip-id" 0
     return [expr $start + $size]
 }
 
-- 
2.20.1