[v1] hw/arm/raspi: Fix SYS_timer on Linux + misc changes

[PATCH 0/7] hw/arm/raspi: Fix SYS_timer on Linux + misc changes

Posted by Philippe Mathieu-Daudé 3 years, 7 months ago

In this series we implement the COMPARE registers of the
SYS_timer, since they are used by Linux.

This fixes the hang reported by Niek here:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg682090.html

Few trivial patches used while working on this added.

Philippe Mathieu-Daudé (7):
  hw/arm/raspi: Define various blocks base addresses
  hw/arm/bcm2835: Add more unimplemented peripherals
  hw/intc/bcm2835_ic: Trace GPU/CPU IRQ handlers
  hw/timer/bcm2835: Introduce BCM2835_SYSTIMER_COUNT definition
  hw/timer/bcm2835: Rename variable holding CTRL_STATUS register
  hw/timer/bcm2835: Support the timer COMPARE registers
  hw/arm/bcm2835_peripherals: Correctly wire the SYS_timer IRQs

 include/hw/arm/bcm2835_peripherals.h |  2 ++
 include/hw/arm/raspi_platform.h      | 51 +++++++++++++++++++++++-----
 include/hw/timer/bcm2835_systmr.h    | 17 +++++++---
 hw/arm/bcm2835_peripherals.c         | 15 ++++++--
 hw/intc/bcm2835_ic.c                 |  4 ++-
 hw/timer/bcm2835_systmr.c            | 50 ++++++++++++++++-----------
 hw/intc/trace-events                 |  4 +++
 hw/timer/trace-events                |  4 ++-
 8 files changed, 111 insertions(+), 36 deletions(-)

-- 
2.26.2

Re: [PATCH 0/7] hw/arm/raspi: Fix SYS_timer on Linux + misc changes

Posted by no-reply@patchew.org 3 years, 7 months ago

Patchew URL: https://patchew.org/QEMU/20200920175825.417680-1-f4bug@amsat.org/



Hi,

This series failed the docker-mingw@fedora 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
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===

Host machine cpu: x86_64
Target machine cpu family: x86
Target machine cpu: x86_64
../src/meson.build:10: WARNING: Module unstable-keyval has no backwards or forwards compatibility and might not exist in future releases.
Program sh found: YES
Program python3 found: YES (/usr/bin/python3)
Configuring ninjatool using configuration
---
Compiling C object libqemu-aarch64-softmmu.fa.p/hw_virtio_virtio.c.obj
Compiling C object libqemu-aarch64-softmmu.fa.p/hw_virtio_virtio-net-pci.c.obj
../src/hw/arm/bcm2835_peripherals.c: In function 'bcm2835_peripherals_realize':
../src/hw/arm/bcm2835_peripherals.c:355:45: error: 'TPX_OFFSET' undeclared (first use in this function); did you mean 'TXP_OFFSET'?
  355 |     create_unimp(s, &s->tpx, "bcm2835-tpx", TPX_OFFSET, 0x1000);
      |                                             ^~~~~~~~~~
      |                                             TXP_OFFSET
../src/hw/arm/bcm2835_peripherals.c:355:45: note: each undeclared identifier is reported only once for each function it appears in
make: *** [Makefile.ninja:1728: libqemu-aarch64-softmmu.fa.p/hw_arm_bcm2835_peripherals.c.obj] Error 1
make: *** Waiting for unfinished jobs....
Compiling C object libqemu-aarch64-softmmu.fa.p/hw_virtio_virtio-rng.c.obj
Traceback (most recent call last):
---
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--rm', '--label', 'com.qemu.instance.uuid=ee92e91bb28e4881969f35515c9119dc', '-u', '1001', '--security-opt', 'seccomp=unconfined', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-fglfbk_j/src/docker-src.2020-09-20-15.12.50.31123:/var/tmp/qemu:z,ro', 'qemu/fedora', '/var/tmp/qemu/run', 'test-mingw']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=ee92e91bb28e4881969f35515c9119dc
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-fglfbk_j/src'
make: *** [docker-run-test-mingw@fedora] Error 2

real    3m57.351s
user    0m20.238s


The full log is available at
http://patchew.org/logs/20200920175825.417680-1-f4bug@amsat.org/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [PATCH 0/7] hw/arm/raspi: Fix SYS_timer on Linux + misc changes

Posted by no-reply@patchew.org 3 years, 7 months ago

Patchew URL: https://patchew.org/QEMU/20200920175825.417680-1-f4bug@amsat.org/



Hi,

This series failed the docker-quick@centos7 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-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===

C linker for the host machine: cc ld.bfd 2.27-43
Host machine cpu family: x86_64
Host machine cpu: x86_64
../src/meson.build:10: WARNING: Module unstable-keyval has no backwards or forwards compatibility and might not exist in future releases.
Program sh found: YES
Program python3 found: YES (/usr/bin/python3)
Configuring ninjatool using configuration
---
Compiling C object libqemu-aarch64-softmmu.fa.p/hw_arm_omap1.c.o
Compiling C object libqemu-aarch64-softmmu.fa.p/hw_arm_msf2-soc.c.o
../src/hw/arm/bcm2835_peripherals.c: In function 'bcm2835_peripherals_realize':
../src/hw/arm/bcm2835_peripherals.c:355:45: error: 'TPX_OFFSET' undeclared (first use in this function)
     create_unimp(s, &s->tpx, "bcm2835-tpx", TPX_OFFSET, 0x1000);
                                             ^
../src/hw/arm/bcm2835_peripherals.c:355:45: note: each undeclared identifier is reported only once for each function it appears in
make: *** [libqemu-aarch64-softmmu.fa.p/hw_arm_bcm2835_peripherals.c.o] Error 1
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
  File "./tests/docker/docker.py", line 709, in <module>
---
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--rm', '--label', 'com.qemu.instance.uuid=04577f543e20460cb2faaccf17a7e772', '-u', '1003', '--security-opt', 'seccomp=unconfined', '-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-12_3567t/src/docker-src.2020-09-20-15.17.31.5091:/var/tmp/qemu:z,ro', 'qemu/centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=04577f543e20460cb2faaccf17a7e772
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-12_3567t/src'
make: *** [docker-run-test-quick@centos7] Error 2

real    3m17.186s
user    0m18.205s


The full log is available at
http://patchew.org/logs/20200920175825.417680-1-f4bug@amsat.org/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com