hw/riscv: Generate correct "mmu-type" for 32-bit machines
Subsystems (2)
PATCH 1/1 hw/riscv: Generate correct "mmu-type" for 32-bit machines
32-bit machine should have its CPU's "mmu-type" set to "riscv,sv32".
---
hw/riscv/sifive_u.c | 4 ++++ hw/riscv/spike.c | 4 ++++ hw/riscv/virt.c | 4 ++++ 3 files changed, 12 insertions(+)
hw/riscv/sifive_u.c +4 -0
@@ -159,7 +159,11 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_add_subnode (fdt, nodename);/* cpu 0 is the management hart that does not have mmu */ if (cpu !=0 ) { +#if defined(TARGET_RISCV32 ) +qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv32" ); +#else qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); +#endif isa =riscv_isa_string (&s->soc.u_cpus.harts[cpu -1 ]); }else { isa =riscv_isa_string (&s->soc.e_cpus.harts[0 ]);
hw/riscv/spike.c +4 -0
@@ -102,7 +102,11 @@ static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap,char *intc =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu);char *isa =riscv_isa_string (&s->soc.harts[cpu]);qemu_fdt_add_subnode (fdt, nodename); +#if defined(TARGET_RISCV32 ) +qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv32" ); +#else qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); +#endif qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , isa);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, nodename,"status" ,"okay" );
hw/riscv/virt.c +4 -0
@@ -229,7 +229,11 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,char *intc =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu);char *isa =riscv_isa_string (&s->soc.harts[cpu]);qemu_fdt_add_subnode (fdt, nodename); +#if defined(TARGET_RISCV32 ) +qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv32" ); +#else qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); +#endif qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , isa);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, nodename,"status" ,"okay" );
Signature · 1 line
2.7.4
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-clang@ubuntu build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-ubuntu V=1 NETWORK=1
time make docker-test-clang@ubuntu SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
LINK qemu-io LINK qemu-edid LINK fsdev/virtfs-proxy-helper
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK scsi/qemu-pr-helper
LINK qemu-bridge-helper/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK virtiofsd LINK vhost-user-input GEN lm32-softmmu/hmp-commands.h --- CC mips64el-softmmu/qapi/qapi-init-commands.o CC i386-softmmu/hw/i386/microvm.o CC mips64-softmmu/qapi/qapi-commands.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
CC alpha-softmmu/target/alpha/vax_helper.o CC mips-softmmu/target/mips/cpu.o CC mips64el-softmmu/softmmu/vl.o --- CC arm-softmmu/hw/arm/armv7m.o CC aarch64-softmmu/hw/arm/sabrelite.o CC i386-softmmu/qapi/qapi-visit-machine-target.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC arm-softmmu/hw/arm/exynos4210.o CC aarch64-softmmu/hw/arm/armv7m.o CC i386-softmmu/qapi/qapi-visit-misc-target.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
CC arm-softmmu/hw/arm/pxa2xx.o/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
CC aarch64-softmmu/hw/arm/exynos4210.o CC i386-softmmu/qapi/qapi-visit.o CC arm-softmmu/hw/arm/pxa2xx_gpio.o --- CC riscv64-softmmu/migration/ram.o CC ppc-softmmu/hw/scsi/vhost-user-scsi.o CC sparc-softmmu/migration/ram.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC riscv64-softmmu/accel/qtest.o GEN aarch64-softmmu/target/arm/decode-a32.inc.c CC sh4-softmmu/accel/tcg/cputlb.o --- CC sh4-softmmu/accel/tcg/translate-all.o CC s390x-softmmu/tcg/tcg-common.o CC riscv32-softmmu/accel/tcg/cputlb.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC riscv64-softmmu/accel/tcg/tcg-runtime.o CC ppc-softmmu/hw/vfio/display.o CC sparc-softmmu/accel/tcg/tcg-runtime.o --- CC s390x-softmmu/cpus.o CC arm-softmmu/target/arm/translate.o CC riscv32-softmmu/hw/block/dataplane/virtio-blk.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC s390x-softmmu/gdbstub.o CC sh4-softmmu/hw/display/virtio-gpu-base.o CC sparc-softmmu/hw/intc/grlib_irqmp.o --- CC riscv32-softmmu/hw/riscv/riscv_hart.o CC s390x-softmmu/hw/vfio/ccw.o CC ppc64-softmmu/hw/virtio/virtio-scsi-pci.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC s390x-softmmu/hw/vfio/ap.o CC sparc64-softmmu/accel/tcg/cpu-exec.o CC sh4eb-softmmu/hw/virtio/virtio-rng-pci.o --- CC riscv64-softmmu/hw/riscv/sifive_gpio.o CC ppc-softmmu/qapi/qapi-commands-machine-target.o CC ppc-softmmu/qapi/qapi-commands-misc-target.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC ppc-softmmu/qapi/qapi-commands.o CC s390x-softmmu/hw/virtio/vhost.o CC riscv64-softmmu/hw/riscv/sifive_plic.o --- CC sparc64-softmmu/hw/sparc64/sparc64.o CC ppc64-softmmu/hw/ppc/spapr_rtas_ddw.o CC s390x-softmmu/hw/s390x/virtio-ccw-net.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC s390x-softmmu/hw/s390x/virtio-ccw-blk.o CC sparc64-softmmu/hw/sparc64/sun4u_iommu.o CC ppc64-softmmu/hw/ppc/ppc405_boards.o --- CC riscv32-softmmu/qapi/qapi-visit-misc-target.o CC unicore32-softmmu/accel/qtest.o CC riscv64-softmmu/qapi/qapi-visit-misc-target.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC sparc64-softmmu/target/sparc/cpu.o CC ppc64-softmmu/hw/ppc/virtex_ml507.o CC riscv32-softmmu/qapi/qapi-visit.o --- CC riscv64-softmmu/target/riscv/cpu.o CC unicore32-softmmu/dump/dump.o CC s390x-softmmu/qapi/qapi-init-commands.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC ppc64-softmmu/qapi/qapi-commands-misc-target.o CC xtensa-softmmu/tcg/optimize.o CC xtensa-softmmu/fpu/softfloat.o --- CC ppc64-softmmu/target/ppc/mmu_helper.o CC x86_64-softmmu/accel/qtest.o CC xtensa-softmmu/accel/qtest.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC s390x-softmmu/target/s390x/cc_helper.o CC xtensaeb-softmmu/tcg/tcg-common.o CC xtensa-softmmu/accel/stubs/hax-stub.o --- CC unicore32-softmmu/target/unicore32/translate.o CC s390x-softmmu/target/s390x/crypto_helper.o CC ppc64-softmmu/target/ppc/compat.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC xtensa-softmmu/accel/tcg/tcg-runtime.o CC x86_64-softmmu/accel/tcg/tcg-runtime-gvec.o CC ppc64-softmmu/target/ppc/mmu-radix64.o --- CC alpha-linux-user/tcg/tcg-common.o GEN trace/generated-helpers.c CC unicore32-softmmu/trace/control-target.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC s390x-softmmu/target/s390x/arch_dump.o CC xtensa-softmmu/dump/dump.o CC xtensa-softmmu/hw/9pfs/virtio-9p-device.o --- CC alpha-linux-user/gdbstub.o CC ppc64-softmmu/target/ppc/../../libdecnumber/dpd/decimal32.o CC xtensa-softmmu/hw/display/virtio-gpu-pci.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC aarch64_be-linux-user/gdbstub.o CC alpha-linux-user/thunk.o CC s390x-softmmu/gdbstub-xml.o --- CC aarch64_be-linux-user/accel/tcg/tcg-runtime.o CC alpha-linux-user/accel/tcg/translate-all.o CC alpha-linux-user/accel/tcg/translator.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC alpha-linux-user/accel/tcg/user-exec.o CC aarch64-linux-user/accel/tcg/tcg-runtime-gvec.o CC x86_64-softmmu/hw/display/vga.o --- CC x86_64-softmmu/hw/display/virtio-gpu-base.o CC xtensa-softmmu/hw/scsi/vhost-scsi-common.o CC aarch64_be-linux-user/accel/tcg/tcg-runtime-gvec.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC aarch64_be-linux-user/accel/tcg/cpu-exec.o CC xtensaeb-softmmu/hw/display/vga.o CC xtensaeb-softmmu/hw/display/virtio-gpu-base.o --- CC mips-linux-user/accel/stubs/kvm-stub.o CC microblaze-linux-user/target/microblaze/translate.o CC microblazeel-linux-user/linux-user/signal.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC mips-linux-user/accel/tcg/tcg-runtime.o CC mipsel-linux-user/exec-vary.o CC m68k-linux-user/target/m68k/gdbstub.o --- CC ppc-linux-user/accel/tcg/user-exec.o GEN ppc64le-linux-user/config-target.h CC ppc64le-linux-user/exec.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC nios2-linux-user/linux-user/strace.o CC mipsn32-linux-user/target/mips/op_helper.o CC ppc64le-linux-user/exec-vary.o --- CC extF80M_lt.o CC extF80M_eq_signaling.o CC extF80M_le_quiet.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC extF80M_lt_quiet.o CC f128_to_ui32.o CC f128_to_ui64.o --- AR libtestfloat.a LINK tests/test-thread-pool AR libsoftfloat.a
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-hbitmap
LINK tests/test-bdrv-drain/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK fp-test
LINK tests/test-bdrv-graph-mod/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-blockjob LINK tests/test-blockjob-txn LINK tests/test-block-backend LINK tests/test-block-iothread LINK tests/test-image-locking LINK tests/test-x86-cpuid
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-xbzrle/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-vmstate/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-cutils/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-shift128 LINK tests/test-mul64 LINK tests/test-int128 --- LINK tests/test-write-threshold LINK tests/test-crypto-hash LINK tests/test-crypto-hmac /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK tests/test-crypto-cipher LINK tests/test-crypto-secret LINK tests/test-crypto-tlscredsx509
---
FLOAT TEST add
FLOAT TEST sub
FLOAT TEST uint-to-float/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
FLOAT TEST float-to-int
FLOAT TEST mul
FLOAT TEST float-to-uint
---
dbus-daemon[7831]: Could not get password database information for UID of current process: User "???" unknown or no memory to allocate password entry
**
ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18) Aborted (core dumped)
cleaning up pid 7831
ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18)
make: *** [/tmp/qemu-test/src/tests/Makefile.include:632: check-qtest-i386] Error 1
make: *** Waiting for unfinished jobs....
Looking for expected file 'tests/data/acpi/pc/FACP'
---
dbus-daemon[9256]: Could not get password database information for UID of current process: User "???" unknown or no memory to allocate password entry
**
ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18) Aborted (core dumped)
cleaning up pid 9256
ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18)
make: *** [/tmp/qemu-test/src/tests/Makefile.include:632: check-qtest-x86_64] Error 1
TEST check-qtest-arm: tests/qtest/test-hmp TEST check-qtest-arm: tests/qtest/qos-test TEST check-qtest-aarch64: tests/qtest/test-hmp
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=d51252d51f8d4e928b5dcc95dac16d56', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-ypx17xjk/src/docker-src.2020-03-07-07.55.09.4526:/var/tmp/qemu:z,ro', 'qemu:ubuntu', '/var/tmp/qemu/run', 'test-clang']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=d51252d51f8d4e928b5dcc95dac16d56
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-ypx17xjk/src'
make: *** [docker-run-test-clang@ubuntu] Error 2
real 19m14.680s
user 0m9.207s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-clang@ubuntu/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 4 lines · Bin Meng
32-bit machine should have its CPU's "mmu-type" set to "riscv,sv32".
Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 59 lines
---
hw/riscv/sifive_u.c | 4 ++++ hw/riscv/spike.c | 4 ++++ hw/riscv/virt.c | 4 ++++ 3 files changed, 12 insertions(+)hw/riscv/sifive_u.c +4
-0@@ -159,7 +159,11 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_add_subnode (fdt, nodename);/* cpu 0 is the management hart that does not have mmu */ if (cpu !=0 ) { +#if defined(TARGET_RISCV32 ) +qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv32" ); +#else qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); +#endif isa =riscv_isa_string (&s->soc.u_cpus.harts[cpu -1 ]); }else { isa =riscv_isa_string (&s->soc.e_cpus.harts[0 ]);hw/riscv/spike.c +4
-0@@ -102,7 +102,11 @@ static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap,char *intc =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu);char *isa =riscv_isa_string (&s->soc.harts[cpu]);qemu_fdt_add_subnode (fdt, nodename); +#if defined(TARGET_RISCV32 ) +qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv32" ); +#else qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); +#endif qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , isa);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, nodename,"status" ,"okay" );hw/riscv/virt.c +4
-1@@ -229,7 +229,11 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,char *intc =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu);char *isa =riscv_isa_string (&s->soc.harts[cpu]);qemu_fdt_add_subnode (fdt, nodename); +#if defined(TARGET_RISCV32 ) +qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv32" ); +#else qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); +#endif qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , isa);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, nodename,"status" ,"okay" ); --2.7.4
Hi Palmer,
Quoted 9 lines · Alistair Francis
Quoted 4 lines · Bin Meng
32-bit machine should have its CPU's "mmu-type" set to "riscv,sv32".
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>
Ping? Could you please take this for v5.0.0?
Regards,
Bin
Alistair Francis
AppliedQuoted 7 lines · Bin Meng
Hi Palmer,
Quoted 3 lines · Alistair Francis
Quoted 1 line · Bin Meng
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
32-bit machine should have its CPU's "mmu-type" set to "riscv,sv32".
Signed-off-by Bin Meng <[email protected]>Reviewed-by Alistair Francis <[email protected]>Ping? Could you please take this for v5.0.0?
Applied to the RISC-V tree for 5.1
Alistair
Quoted 3 lines
Regards,
Bin