| Message ID | 20240211122909.5807-1-deller@kernel.org |
|---|---|
| State | New |
| Headers | show |
On Sun, 11 Feb 2024 at 12:30, <deller@kernel.org> wrote: > > From: Helge Deller <deller@gmx.de> > > The following changes since commit 39a6e4f87e7b75a45b08d6dc8b8b7c2954c87440: > > Merge tag 'pull-qapi-2024-02-03' of https://repo.or.cz/qemu/armbru into staging (2024-02-03 13:31:58 +0000) > > are available in the Git repository at: > > https://github.com/hdeller/qemu-hppa.git tags/hppa64-pull-request > > for you to fetch changes up to f9d2270c85872bd71a01e15b2ebda2569f17f811: > > hw/hppa/machine: Load 64-bit firmware on 64-bit machines (2024-02-11 13:25:15 +0100) > > ---------------------------------------------------------------- > target/hppa: Enhancements and fixes > > A new SeaBIOS-hppa firmware which is built as 32- and 64-bit firmware. > Necessary to fully support 64-bit operating systems (HP-UX, Linux, NetBSD,...). > > ---------------------------------------------------------------- This fails "make check", eg: https://gitlab.com/qemu-project/qemu/-/jobs/6154451100 because when the qom-test etc tests run qemu-system-hppa, it barfs with "qemu-system-hppa: no firmware provided". That kind of firmware check needs to not fire when using the qtest accel. thanks -- PMM
On 2/12/24 22:16, Peter Maydell wrote: > On Sun, 11 Feb 2024 at 12:30, <deller@kernel.org> wrote: >> >> From: Helge Deller <deller@gmx.de> >> >> The following changes since commit 39a6e4f87e7b75a45b08d6dc8b8b7c2954c87440: >> >> Merge tag 'pull-qapi-2024-02-03' of https://repo.or.cz/qemu/armbru into staging (2024-02-03 13:31:58 +0000) >> >> are available in the Git repository at: >> >> https://github.com/hdeller/qemu-hppa.git tags/hppa64-pull-request >> >> for you to fetch changes up to f9d2270c85872bd71a01e15b2ebda2569f17f811: >> >> hw/hppa/machine: Load 64-bit firmware on 64-bit machines (2024-02-11 13:25:15 +0100) >> >> ---------------------------------------------------------------- >> target/hppa: Enhancements and fixes >> >> A new SeaBIOS-hppa firmware which is built as 32- and 64-bit firmware. >> Necessary to fully support 64-bit operating systems (HP-UX, Linux, NetBSD,...). >> >> ---------------------------------------------------------------- > > This fails "make check", eg: > https://gitlab.com/qemu-project/qemu/-/jobs/6154451100 > > because when the qom-test etc tests run qemu-system-hppa, it > barfs with "qemu-system-hppa: no firmware provided". > > That kind of firmware check needs to not fire when > using the qtest accel. Ok. But how do people usually work around this kind of issue? Test if the qtest accel is in use? Ignore if the firmware can't be loaded? Any hint would be great! Helge
On Mon, 12 Feb 2024 at 23:04, Helge Deller <deller@gmx.de> wrote: > > On 2/12/24 22:16, Peter Maydell wrote: > > This fails "make check", eg: > > https://gitlab.com/qemu-project/qemu/-/jobs/6154451100 > > > > because when the qom-test etc tests run qemu-system-hppa, it > > barfs with "qemu-system-hppa: no firmware provided". > > > > That kind of firmware check needs to not fire when > > using the qtest accel. > > Ok. But how do people usually work around this kind of issue? > Test if the qtest accel is in use? > Ignore if the firmware can't be loaded? > Any hint would be great! There's a qtest_enabled() function -- see eg hw/mips/malta.c for an example of skipping the "fail on no firmware" check when it's enabled. (There are a bunch of others in the tree too.) thanks -- PMM
On 2/13/24 10:10, Peter Maydell wrote: > On Mon, 12 Feb 2024 at 23:04, Helge Deller <deller@gmx.de> wrote: >> >> On 2/12/24 22:16, Peter Maydell wrote: >>> This fails "make check", eg: >>> https://gitlab.com/qemu-project/qemu/-/jobs/6154451100 >>> >>> because when the qom-test etc tests run qemu-system-hppa, it >>> barfs with "qemu-system-hppa: no firmware provided". >>> >>> That kind of firmware check needs to not fire when >>> using the qtest accel. >> >> Ok. But how do people usually work around this kind of issue? >> Test if the qtest accel is in use? >> Ignore if the firmware can't be loaded? >> Any hint would be great! > > There's a qtest_enabled() function -- see eg hw/mips/malta.c > for an example of skipping the "fail on no firmware" check > when it's enabled. (There are a bunch of others in the tree too.) Yes, I found that.... I've used that function in the latest pull request which I sent... Thanks! Helge
From: Helge Deller <deller@gmx.de> The following changes since commit 39a6e4f87e7b75a45b08d6dc8b8b7c2954c87440: Merge tag 'pull-qapi-2024-02-03' of https://repo.or.cz/qemu/armbru into staging (2024-02-03 13:31:58 +0000) are available in the Git repository at: https://github.com/hdeller/qemu-hppa.git tags/hppa64-pull-request for you to fetch changes up to f9d2270c85872bd71a01e15b2ebda2569f17f811: hw/hppa/machine: Load 64-bit firmware on 64-bit machines (2024-02-11 13:25:15 +0100) ---------------------------------------------------------------- target/hppa: Enhancements and fixes A new SeaBIOS-hppa firmware which is built as 32- and 64-bit firmware. Necessary to fully support 64-bit operating systems (HP-UX, Linux, NetBSD,...). ---------------------------------------------------------------- Helge Deller (11): disas/hppa: Add disassembly for qemu specific instructions target/hppa: Add "diag 0x101" for console output support hw/pci-host/astro: Avoid aborting on access failure hw/pci-host/astro: Implement Hard Fail and Soft Fail mode lasi: allow access to LAN MAC address registers target/hppa: Implement do_transaction_failed handler for I/O errors lasi: Add reset I/O ports for LASI audio and FDC target/hppa: Allow read-access to PSW with rsm 0,reg instruction target/hppa: PDC_BTLB_INFO uses 32-bit ints target/hppa: Update SeaBIOS-hppa to version 16 hw/hppa/machine: Load 64-bit firmware on 64-bit machines Sven Schnelle (1): hw/net/tulip: add chip status register values disas/hppa.c | 4 ++++ hw/hppa/machine.c | 11 ++++++++--- hw/misc/lasi.c | 13 +++++++++++++ hw/net/tulip.c | 4 ++-- hw/pci-host/astro.c | 36 ++++++++++++++++++++---------------- include/hw/misc/lasi.h | 2 ++ include/hw/pci-host/astro.h | 2 ++ pc-bios/hppa-firmware.img | Bin 163324 -> 167820 bytes pc-bios/hppa-firmware64.img | Bin 0 -> 206024 bytes roms/seabios-hppa | 2 +- target/hppa/cpu.c | 1 + target/hppa/cpu.h | 5 +++++ target/hppa/helper.h | 1 + target/hppa/mem_helper.c | 21 ++++++++++++++++++++- target/hppa/sys_helper.c | 36 ++++++++++++++++++++++++++++++++++++ target/hppa/translate.c | 14 +++++++++++++- 16 files changed, 128 insertions(+), 24 deletions(-) mode change 100644 => 100755 pc-bios/hppa-firmware.img create mode 100755 pc-bios/hppa-firmware64.img