Commit 4c60e328 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-pa-20200127' into staging 



Improve LASI emulation
Add Artist graphics
Fix main memory allocation
Improve LDCW emulation wrt real hw

# gpg: Signature made Mon 27 Jan 2020 18:53:35 GMT
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-pa-20200127:
  target/hppa: Allow, but diagnose, LDCW aligned only mod 4
  hw/hppa/machine: Map the PDC memory region with higher priority
  hw/hppa/machine: Restrict the total memory size to 3GB
  hw/hppa/machine: Correctly check the firmware is in PDC range
  hppa: Add emulation of Artist graphics
  seabios-hppa: update to latest version
  hppa: Switch to tulip NIC by default
  hppa: add emulation of LASI PS2 controllers
  ps2: accept 'Set Key Make and Break' commands
  hppa: Add support for LASI chip with i82596 NIC
  hw/hppa/dino.c: Improve emulation of Dino PCI chip

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 750fe598 b1af755c

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ S: Maintained 
F: target/hppa/

F: hw/hppa/

F: disas/hppa.c

F: hw/net/*i82596*

F: include/hw/net/lasi_82596.h



LM32 TCG CPUs

M: Michael Walle <michael@walle.cc>
@@ -890,7 +892,7 @@ F: hw/*/etraxfs_*.c 


HP-PARISC Machines

------------------

Dino

HP B160L

M: Richard Henderson <rth@twiddle.net>

R: Helge Deller <deller@gmx.de>

S: Odd Fixes

hw/display/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ config TCX 
config CG3

    bool



config ARTIST

    bool

    select FRAMEBUFFER



config VGA

    bool

hw/display/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ common-obj-$(CONFIG_SM501) += sm501.o 
common-obj-$(CONFIG_TCX) += tcx.o

common-obj-$(CONFIG_CG3) += cg3.o

common-obj-$(CONFIG_NEXTCUBE) += next-fb.o

common-obj-$(CONFIG_ARTIST) += artist.o



obj-$(CONFIG_VGA) += vga.o

hw/display/artist.c

0 → 100644
+1454 −0

File added.

Preview size limit exceeded, changes collapsed.

hw/display/trace-events

+9 −0
Original line number Diff line number Diff line
@@ -142,3 +142,12 @@ sii9022_switch_mode(const char *mode) "mode: %s" 
# ati.c

ati_mm_read(unsigned int size, uint64_t addr, const char *name, uint64_t val) "%u 0x%"PRIx64 " %s -> 0x%"PRIx64

ati_mm_write(unsigned int size, uint64_t addr, const char *name, uint64_t val) "%u 0x%"PRIx64 " %s <- 0x%"PRIx64



# artist.c

artist_reg_read(unsigned int size, uint64_t addr, const char *name, uint64_t val) "%u 0x%"PRIx64 "%s -> 0x%"PRIx64

artist_reg_write(unsigned int size, uint64_t addr, const char *name, uint64_t val) "%u 0x%"PRIx64 "%s <- 0x%"PRIx64

artist_vram_read(unsigned int size, uint64_t addr, int posx, int posy, uint64_t val) "%u 0x%"PRIx64 " %ux%u-> 0x%"PRIx64

artist_vram_write(unsigned int size, uint64_t addr, uint64_t val) "%u 0x%"PRIx64 " <- 0x%"PRIx64

artist_fill_window(unsigned int start_x, unsigned int start_y, unsigned int width, unsigned int height, uint32_t op, uint32_t ctlpln) "start=%ux%u length=%ux%u op=0x%08x ctlpln=0x%08x"

artist_block_move(unsigned int start_x, unsigned int start_y, unsigned int dest_x, unsigned int dest_y, unsigned int width, unsigned int height) "source %ux%u -> dest %ux%u size %ux%u"

artist_draw_line(unsigned int start_x, unsigned int start_y, unsigned int end_x, unsigned int end_y) "%ux%u %ux%u"