diff --git a/JOURNAL.md b/JOURNAL.md index ae48e9e..c72e264 100644 --- a/JOURNAL.md +++ b/JOURNAL.md @@ -2070,3 +2070,26 @@ shouldn't. First, let's remove the reserved region, as now OpenSBI properly forwards the regions to the kernel. + +It continues to hang, but at least now we don't have overlap of memory regions: + + [ 0.000000] Reserved memory: created DMA memory pool at 0x0000000060000000, size 256 MiB + [ 0.000000] OF: reserved mem: initialized node dma_pool@60000000, compatible id shared-dma-pool + [ 0.000000] OF: reserved mem: 0x0000000060000000..0x000000006fffffff (262144 KiB) map non-reusable dma_pool@60000000 + [ 0.000000] Reserved memory: created DMA memory pool at 0x0000000070000000, size 256 MiB + [ 0.000000] OF: reserved mem: initialized node dma_pool@70000000, compatible id shared-dma-pool + [ 0.000000] OF: reserved mem: 0x0000000070000000..0x000000007fffffff (262144 KiB) map non-reusable dma_pool@70000000 + [ 0.000000] OF: reserved mem: 0x0000000080000000..0x000000008003ffff (256 KiB) nomap non-reusable mmode_resv1@80000000 + [ 0.000000] OF: reserved mem: 0x0000000080040000..0x000000008005ffff (128 KiB) nomap non-reusable mmode_resv0@80040000 + [ 0.000000] cma: Reserved 16 MiB at 0x00000000af000000 on node -1 + [ 0.000000] Zone ranges: + [ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000afffffff] + [ 0.000000] Normal empty + [ 0.000000] Movable zone start for each node + [ 0.000000] Early memory node ranges + [ 0.000000] node 0: [mem 0x0000000080000000-0x000000008005ffff] + [ 0.000000] node 0: [mem 0x0000000080060000-0x00000000afffffff] + [ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000afffffff] + +Let's remove the clint from the device tree for now, just to see if it is +affecting. diff --git a/ox-plic.dts b/ox-plic.dts index 18ae4a5..11f95b5 100644 --- a/ox-plic.dts +++ b/ox-plic.dts @@ -224,17 +224,17 @@ * property is described in * Documentation/devicetree/bindings/riscv/cpus.yaml */ - clint: clint@40002000 { - /* MTIME and MTIMECMP address and size pairs */ - reg = <0x0 0x40002000 0x0 0x8>, <0x0 0x40002008 0x0 0x8>; - interrupts-extended = <&HLIC0 3>, <&HLIC0 7>; - /*<&CPU0 0x3>, <&CPU0 0x7>,*/ - /*<&onic_pool 0x3>, <&onic_pool 0x7>,*/ - /*<&SERIAL 0x3>, <&SERIAL 0x7>*/ - - /* Allows using the "generic" platform in OpenSBI. */ - compatible = "riscv,aclint-mtimer"; - }; +// clint: clint@40002000 { +// /* MTIME and MTIMECMP address and size pairs */ +// reg = <0x0 0x40002000 0x0 0x8>, <0x0 0x40002008 0x0 0x8>; +// interrupts-extended = <&HLIC0 3>, <&HLIC0 7>; +// /*<&CPU0 0x3>, <&CPU0 0x7>,*/ +// /*<&onic_pool 0x3>, <&onic_pool 0x7>,*/ +// /*<&SERIAL 0x3>, <&SERIAL 0x7>*/ +// +// /* Allows using the "generic" platform in OpenSBI. */ +// compatible = "riscv,aclint-mtimer"; +// }; /* Guesswork: There must be a timer at 0x40170000 as it is * initialized in OpenSBI. It seems to drive the console. */