Skip to content
Snippets Groups Projects
Commit ff2fb5b2 authored by Drew Fustini's avatar Drew Fustini
Browse files

DO_NOT_MERGE riscv: dts: qemu: add cbqri-capable controllers

Add nodes to for CBQRI-capable cache and memory controllers.

This is necessary as the qemu branch riscv-cbqri-rfc (based on
v8.0.0-rc4) does not yet support generating a dtb with the nodes and
properties needed for CBQRI controllers.

Thus, an external dtb (qemu-virt-cbqri.dtb) built by Linux is used when
invoking qemu-system-riscv64:

  qemu-system-riscv64 \
    -M virt \
    -nographic \
    -smp 8 \
    -bios output/images/fw_jump.elf \
    -kernel ${LINUX}/arch/riscv/boot/Image \
    -dtb ${LINUX}/arch/riscv/boot/dts/qemu/qemu-virt-cbqri.dtb \
    -append "root=/dev/vda ro" \
    -drive file=output/images/rootfs.ext2,format=raw,id=hd0 \
    -device virtio-blk-device,drive=hd0 \

Link: https://gitlab.baylibre.com/baylibre/qemu/-/tree/riscv-cbqri-rfc


Co-developed-by: default avatarAdrien Ricciardi <aricciardi@baylibre.com>
Signed-off-by: default avatarAdrien Ricciardi <aricciardi@baylibre.com>
Signed-off-by: default avatarDrew Fustini <dfustini@baylibre.com>
parent 0f906171
No related branches found
No related tags found
No related merge requests found
......@@ -367,5 +367,64 @@ clint@2000000 {
reg = <0x00 0x2000000 0x00 0x10000>;
compatible = "sifive,clint0\0riscv,clint0";
};
cluster0_l2: controller@4820000 {
compatible = "foobar,cache-controller";
reg = <0x0 0x4820000 0x0 0x1000>; /* 4KB at 0x04820000 */
cache-unified;
cache-line-size = <64>;
cache-level = <2>;
cache-sets = <1000>;
cache-size = <768000>; /* 750 KiB */
next-level-cache = <&shared_llc>;
riscv,cbqri-rcid = <64>;
riscv,cbqri-mcid = <256>;
};
cluster1_l2: controller@4821000 {
compatible = "foobar,cache-controller";
reg = <0x0 0x4821000 0x0 0x1000>; /* 4KB at 0x04821000 */
cache-unified;
cache-line-size = <64>;
cache-level = <2>;
cache-sets = <1000>;
cache-size = <768000>; /* 750 KiB */
next-level-cache = <&shared_llc>;
riscv,cbqri-rcid = <64>;
riscv,cbqri-mcid = <256>;
};
shared_llc: controller@482b000 {
compatible = "foobar,cache-controller";
reg = <0x0 0x482b000 0x0 0x1000>; /* 4KB at 0x0482B000 */
cache-unified;
cache-line-size = <64>;
cache-level = <3>;
cache-sets = <4096>;
cache-size = <3145728>; /* 3 MiB */
riscv,cbqri-rcid = <64>;
riscv,cbqri-mcid = <256>;
};
mem0: controller@4828000 {
compatible = "foobar,memory-controller";
reg = <0x0 0x4828000 0x0 0x1000>; /* 4KB at 0x04828000 */
riscv,cbqri-rcid = <64>;
riscv,cbqri-mcid = <256>;
};
mem1: controller@4829000 {
compatible = "foobar,memory-controller";
reg = <0x0 0x4829000 0x0 0x1000>; /* 4KB at 0x04829000 */
riscv,cbqri-rcid = <64>;
riscv,cbqri-mcid = <256>;
};
mem2: controller@482a000 {
compatible = "foobar,memory-controller";
reg = <0x0 0x482a000 0x0 0x1000>; /* 4KB at 0x0482A000 */
riscv,cbqri-rcid = <64>;
riscv,cbqri-mcid = <256>;
};
};
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment