OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

lasi: move from hw/hppa to hw/misc 

Move the LASI device implementation from hw/hppa to hw/misc so that it is
located with all the other miscellaneous devices.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-43-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2022-05-04 10:25:52 +01:00
parent 134ba73f32
commit 45f569a116
10 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -1113,7 +1113,9 @@ S: Odd Fixes
F: configs/devices/hppa-softmmu/default.mak
F: hw/hppa/
F: hw/net/*i82596*
F: hw/misc/lasi.c
F: hw/pci-host/dino.c
F: include/hw/misc/lasi.h
F: include/hw/net/lasi_82596.h
F: include/hw/pci-host/dino.h
F: pc-bios/hppa-firmware.img

1
hw/hppa/Kconfig
View File

@ -4,6 +4,7 @@ config HPPA_B160L
imply E1000_PCI
imply VIRTIO_VGA
select DINO
select LASI
select SERIAL
select ISA_BUS
select I8259

2
hw/hppa/machine.c
View File

@ -22,7 +22,7 @@
#include "hw/nmi.h"
#include "hw/pci/pci.h"
#include "hw/pci-host/dino.h"
#include "lasi.h"
#include "hw/misc/lasi.h"
#include "hppa_sys.h"
#include "qemu/units.h"
#include "qapi/error.h"

2
hw/hppa/meson.build
View File

@ -1,4 +1,4 @@
hppa_ss = ss.source_set()
hppa_ss.add(when: 'CONFIG_HPPA_B160L', if_true: files('pci.c', 'machine.c', 'lasi.c'))
hppa_ss.add(when: 'CONFIG_HPPA_B160L', if_true: files('pci.c', 'machine.c'))
hw_arch += {'hppa': hppa_ss}

5
hw/hppa/trace-events
View File

@ -2,8 +2,3 @@
# pci.c
hppa_pci_iack_write(void) ""
# lasi.c
lasi_chip_mem_valid(uint64_t addr, uint32_t val) "access to addr 0x%"PRIx64" is %d"
lasi_chip_read(uint64_t addr, uint32_t val) "addr 0x%"PRIx64" val 0x%08x"
lasi_chip_write(uint64_t addr, uint32_t val) "addr 0x%"PRIx64" val 0x%08x"

3
hw/misc/Kconfig
View File

@ -171,4 +171,7 @@ config SIFIVE_U_PRCI
config VIRT_CTRL
bool
config LASI
bool
source macio/Kconfig

3
hw/hppa/lasi.c → hw/misc/lasi.c
View File

@ -17,10 +17,9 @@
#include "hw/irq.h"
#include "sysemu/sysemu.h"
#include "sysemu/runstate.h"
#include "hppa_sys.h"
#include "migration/vmstate.h"
#include "qom/object.h"
#include "lasi.h"
#include "hw/misc/lasi.h"
static bool lasi_chip_mem_valid(void *opaque, hwaddr addr,

3
hw/misc/meson.build
View File

@ -134,3 +134,6 @@ specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'mips_cp
specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c'))
specific_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa_ec.c'))
# HPPA devices
softmmu_ss.add(when: 'CONFIG_LASI', if_true: files('lasi.c'))

5
hw/misc/trace-events
View File

@ -263,3 +263,8 @@ virt_ctrl_write(void *dev, unsigned int addr, unsigned int size, uint64_t value)
virt_ctrl_reset(void *dev) "ctrl: %p"
virt_ctrl_realize(void *dev) "ctrl: %p"
virt_ctrl_instance_init(void *dev) "ctrl: %p"
# lasi.c
lasi_chip_mem_valid(uint64_t addr, uint32_t val) "access to addr 0x%"PRIx64" is %d"
lasi_chip_read(uint64_t addr, uint32_t val) "addr 0x%"PRIx64" val 0x%08x"
lasi_chip_write(uint64_t addr, uint32_t val) "addr 0x%"PRIx64" val 0x%08x"

0
hw/hppa/lasi.h → include/hw/misc/lasi.h
View File