Commit 06539ebc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/mips-hw-next-20200526' into staging 

MIPS hardware updates

- MAINTAINERS updated to welcome Huacai Chen and Jiaxun Yang,
  and update Aleksandar Rikalo's email address,
- Trivial improvements in the Bonito64 North Bridge and the
  Fuloong 2e machine,
- MIPS Machines names unified without 'mips_' prefix.

CI: https://travis-ci.org/github/philmd/qemu/builds/691247975



# gpg: Signature made Tue 26 May 2020 14:32:08 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/mips-hw-next-20200526:
  MAINTAINERS: Change Aleksandar Rikalo's email address
  hw/mips/mips_int: De-duplicate KVM interrupt delivery
  hw/mips/malta: Add some logging for bad register offset cases
  hw/mips: Rename malta/mipssim/r4k/jazz files
  hw/mips/fuloong2e: Fix typo in Fuloong machine name
  hw/mips/fuloong2e: Move code and update a comment
  hw/pci-host/bonito: Set the Config register reset value with FIELD_DP32
  hw/pci-host/bonito: Better describe the I/O CS regions
  hw/pci-host/bonito: Map the different PCI ranges more detailed
  hw/pci-host/bonito: Map all the Bonito64 I/O range
  hw/pci-host/bonito: Map peripheral using physical address
  hw/pci-host/bonito: Fix DPRINTF() format strings
  hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge
  MAINTAINERS: Add Huacai Chen as fuloong2e co-maintainer

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ddc76083 97d89746

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu 
Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com>

Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com>

Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>

Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> <arikalo@wavecomp.com>

Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>

Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>

Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>

James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>

MAINTAINERS

+14 −12
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ F: disas/microblaze.c 
MIPS TCG CPUs

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Aurelien Jarno <aurelien@aurel32.net>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>

S: Maintained

F: target/mips/

F: default-configs/*mips*
@@ -1048,9 +1048,9 @@ MIPS Machines 
-------------

Jazz

M: Hervé Poussineau <hpoussin@reactos.org>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>

S: Maintained

F: hw/mips/mips_jazz.c

F: hw/mips/jazz.c

F: hw/display/jazz_led.c

F: hw/dma/rc4030.c
@@ -1061,7 +1061,7 @@ R: Aurelien Jarno <aurelien@aurel32.net> 
S: Maintained

F: hw/isa/piix4.c

F: hw/acpi/piix4.c

F: hw/mips/mips_malta.c

F: hw/mips/malta.c

F: hw/mips/gt64xxx_pci.c

F: include/hw/southbridge/piix.h

F: tests/acceptance/linux_ssh_mips_malta.py
@@ -1069,30 +1069,32 @@ F: tests/acceptance/machine_mips_malta.py 


Mipssim

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>

S: Odd Fixes

F: hw/mips/mips_mipssim.c

F: hw/mips/mipssim.c

F: hw/net/mipsnet.c



R4000

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Aurelien Jarno <aurelien@aurel32.net>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>

S: Obsolete

F: hw/mips/mips_r4k.c

F: hw/mips/r4k.c



Fulong 2E

Fuloong 2E

M: Huacai Chen <chenhc@lemote.com>

M: Philippe Mathieu-Daudé <f4bug@amsat.org>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Jiaxun Yang <jiaxun.yang@flygoat.com>

S: Odd Fixes

F: hw/mips/mips_fulong2e.c

F: hw/mips/fuloong2e.c

F: hw/isa/vt82c686.c

F: hw/pci-host/bonito.c

F: include/hw/isa/vt82c686.h



Boston

M: Paul Burton <pburton@wavecomp.com>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>

S: Maintained

F: hw/core/loader-fit.c

F: hw/mips/boston.c
@@ -2606,7 +2608,7 @@ F: disas/i386.c 
MIPS TCG target

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Aurelien Jarno <aurelien@aurel32.net>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>

S: Maintained

F: tcg/mips/

default-configs/mips64el-softmmu.mak

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


include mips-softmmu-common.mak

CONFIG_IDE_VIA=y

CONFIG_FULONG=y

CONFIG_FULOONG=y

CONFIG_ATI_VGA=y

CONFIG_RTL8139_PCI=y

CONFIG_JAZZ=y

docs/system/deprecated.rst

+5 −0
Original line number Diff line number Diff line
@@ -368,6 +368,11 @@ mips ``r4k`` platform (since 5.0) 
This machine type is very old and unmaintained. Users should use the ``malta``

machine type instead.



mips ``fulong2e`` machine (since 5.1)

'''''''''''''''''''''''''''''''''''''



This machine has been renamed ``fuloong2e``.



``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (since 5.0)

'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

docs/system/target-mips.rst

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ The MIPS Magnum R4000 emulation supports: 


-  G364 framebuffer



The Fulong 2E emulation supports:

The Fuloong 2E emulation supports:



-  Loongson 2E CPU