[PATCH v2 0/4] MAINTAINERS: Sanitize 'MIPS TCG CPUs' section

Move various files unrelated to MIPS TCG frontend into new sections. Since v1: - Do not add Paul without his consent - un-deprecate nanoMIPS Philippe Mathieu-Daudé (4): MAINTAINERS: Add MIPS general architecture support entry MAINTAINERS: Add entries to cover MIPS CPS / GIC hardware MAINTAINERS: Split MIPS TCG frontend vs MIPS machines/hardware MAINTAINERS: Agree to maintain nanoMIPS TCG frontend docs/about/deprecated.rst | 23 --------------------- MAINTAINERS | 43 +++++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 38 deletions(-) -- 2.31.1

The architecture is covered in TCG (frontend and backend) and hardware models. Add a generic section matching the 'mips' word in patch subjects. Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20211004092515.3819836-2-f4bug@amsat.org> --- MAINTAINERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 894dc431052..5369fe2a129 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -109,6 +109,12 @@ K: ^Subject:.*(?i)s390x? T: git https://gitlab.com/cohuck/qemu.git s390-next L: qemu-s390x@nongnu.org +MIPS general architecture support +M: Philippe Mathieu-Daudé <f4bug@amsat.org> +R: Jiaxun Yang <jiaxun.yang@flygoat.com> +S: Odd Fixes +K: ^Subject:.*(?i)mips + Guest CPU cores (TCG) --------------------- Overall TCG CPUs @@ -242,7 +248,6 @@ F: include/hw/mips/ F: include/hw/misc/mips_* F: include/hw/timer/mips_gictimer.h F: tests/tcg/mips/ -K: ^Subject:.*(?i)mips MIPS TCG CPUs (nanoMIPS ISA) S: Orphan -- 2.31.1

On 10/26/21 9:14 PM, Philippe Mathieu-Daudé wrote:
The architecture is covered in TCG (frontend and backend) and hardware models. Add a generic section matching the 'mips' word in patch subjects.
Reviewed-by: Jiaxun Yang<jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org> Message-Id:<20211004092515.3819836-2-f4bug@amsat.org> --- MAINTAINERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~

MIPS CPS and GIC models are unrelated to the TCG frontend. Move them as new sections under the 'Devices' group. Cc: Paul Burton <paulburton@kernel.org> Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- MAINTAINERS | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 5369fe2a129..62a37aa94b5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -239,14 +239,8 @@ F: target/mips/ F: configs/devices/mips*/* F: disas/mips.c F: docs/system/cpu-models-mips.rst.inc -F: hw/intc/mips_gic.c F: hw/mips/ -F: hw/misc/mips_* -F: hw/timer/mips_gictimer.c -F: include/hw/intc/mips_gic.h F: include/hw/mips/ -F: include/hw/misc/mips_* -F: include/hw/timer/mips_gictimer.h F: tests/tcg/mips/ MIPS TCG CPUs (nanoMIPS ISA) @@ -2270,6 +2264,20 @@ S: Odd Fixes F: hw/intc/openpic.c F: include/hw/ppc/openpic.h +MIPS CPS +M: Philippe Mathieu-Daudé <f4bug@amsat.org> +S: Odd Fixes +F: hw/misc/mips_* +F: include/hw/misc/mips_* + +MIPS GIC +M: Philippe Mathieu-Daudé <f4bug@amsat.org> +S: Odd Fixes +F: hw/intc/mips_gic.c +F: hw/timer/mips_gictimer.c +F: include/hw/intc/mips_gic.h +F: include/hw/timer/mips_gictimer.h + Subsystems ---------- Overall Audio backends -- 2.31.1

On 10/26/21 9:14 PM, Philippe Mathieu-Daudé wrote:
MIPS CPS and GIC models are unrelated to the TCG frontend. Move them as new sections under the 'Devices' group.
Cc: Paul Burton<paulburton@kernel.org> Reviewed-by: Jiaxun Yang<jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org> --- MAINTAINERS | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~

Hardware emulated models don't belong to the TCG MAINTAINERS section. Move them to a new 'Overall MIPS Machines' section in the 'MIPS Machines' group. Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20211004092515.3819836-4-f4bug@amsat.org> --- MAINTAINERS | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 62a37aa94b5..efcfa57cd6a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -236,11 +236,8 @@ R: Jiaxun Yang <jiaxun.yang@flygoat.com> R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> S: Odd Fixes F: target/mips/ -F: configs/devices/mips*/* F: disas/mips.c F: docs/system/cpu-models-mips.rst.inc -F: hw/mips/ -F: include/hw/mips/ F: tests/tcg/mips/ MIPS TCG CPUs (nanoMIPS ISA) @@ -1169,6 +1166,13 @@ F: hw/microblaze/petalogix_ml605_mmu.c MIPS Machines ------------- +Overall MIPS Machines +M: Philippe Mathieu-Daudé <f4bug@amsat.org> +S: Odd Fixes +F: configs/devices/mips*/* +F: hw/mips/ +F: include/hw/mips/ + Jazz M: Hervé Poussineau <hpoussin@reactos.org> R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> -- 2.31.1

On 10/26/21 9:14 PM, Philippe Mathieu-Daudé wrote:
Hardware emulated models don't belong to the TCG MAINTAINERS section. Move them to a new 'Overall MIPS Machines' section in the 'MIPS Machines' group.
Reviewed-by: Jiaxun Yang<jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org> Message-Id:<20211004092515.3819836-4-f4bug@amsat.org> --- MAINTAINERS | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~

As of this commit, the nanoMIPS toolchains haven't been merged in mainstream projects. However MediaTek provides a toolchain: https://github.com/MediaTek-Labs/nanomips-gnu-toolchain/releases/tag/nanoMIP... QEMU deprecation policy schedules code for removal. If we don't need / want to remove, we should un-deprecated [*]. Since I now have spent more time with the ISA, I agree to maintain it along with the other MIPS ISA. Therefore remove its deprecation notice. For historical notes, see commit a60442eb8 ("Deprecate nanoMIPS ISA"). [*] https://lore.kernel.org/qemu-devel/YVx7YGqUENP83vNF@redhat.com/ Cc: Vince Del Vecchio <Vince.DelVecchio@mediatek.com> Cc: Petar Jovanovic <petar.jovanovic@syrmia.com> Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- v2: un-deprecate (danpb) --- docs/about/deprecated.rst | 23 ----------------------- MAINTAINERS | 6 +----- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 0bed6ecb1da..5f4e4eeb2b0 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -246,13 +246,6 @@ System emulator CPUS ``Icelake-Client`` CPU Models are deprecated. Use ``Icelake-Server`` CPU Models instead. -MIPS ``I7200`` CPU Model (since 5.2) -'''''''''''''''''''''''''''''''''''' - -The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated -(the ISA has never been upstreamed to a compiler toolchain). Therefore -this CPU is also deprecated. - QEMU API (QAPI) events ---------------------- @@ -342,13 +335,6 @@ The ``ppc64abi32`` architecture has a number of issues which regularly trip up our CI testing and is suspected to be quite broken. For that reason the maintainers strongly suspect no one actually uses it. -MIPS ``I7200`` CPU (since 5.2) -'''''''''''''''''''''''''''''' - -The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated -(the ISA has never been upstreamed to a compiler toolchain). Therefore -this CPU is also deprecated. - Related binaries ---------------- @@ -380,12 +366,3 @@ point to a version that doesn't break runnability guarantees versions, aliases will point to newer CPU model versions depending on the machine type, so management software must resolve CPU model aliases before starting a virtual machine. - -Guest Emulator ISAs -------------------- - -nanoMIPS ISA -'''''''''''' - -The ``nanoMIPS`` ISA has never been upstreamed to any compiler toolchain. -As it is hard to generate binaries for it, declare it deprecated. diff --git a/MAINTAINERS b/MAINTAINERS index efcfa57cd6a..71b198139c8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -237,14 +237,10 @@ R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> S: Odd Fixes F: target/mips/ F: disas/mips.c +X: disas/nanomips.* F: docs/system/cpu-models-mips.rst.inc F: tests/tcg/mips/ -MIPS TCG CPUs (nanoMIPS ISA) -S: Orphan -F: disas/nanomips.* -F: target/mips/tcg/*nanomips* - NiosII TCG CPUs M: Chris Wulff <crwulff@gmail.com> M: Marek Vasut <marex@denx.de> -- 2.31.1

On 10/26/21 9:14 PM, Philippe Mathieu-Daudé wrote:
As of this commit, the nanoMIPS toolchains haven't been merged in mainstream projects. However MediaTek provides a toolchain: https://github.com/MediaTek-Labs/nanomips-gnu-toolchain/releases/tag/nanoMIP...
QEMU deprecation policy schedules code for removal. If we don't need / want to remove, we should un-deprecated [*].
Since I now have spent more time with the ISA, I agree to maintain it along with the other MIPS ISA. Therefore remove its deprecation notice.
For historical notes, see commit a60442eb8 ("Deprecate nanoMIPS ISA").
[*] https://lore.kernel.org/qemu-devel/YVx7YGqUENP83vNF@redhat.com/
Cc: Vince Del Vecchio <Vince.DelVecchio@mediatek.com> Cc: Petar Jovanovic <petar.jovanovic@syrmia.com> Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> ---
Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~

On 10/27/21 06:14, Philippe Mathieu-Daudé wrote:
As of this commit, the nanoMIPS toolchains haven't been merged in mainstream projects. However MediaTek provides a toolchain: https://github.com/MediaTek-Labs/nanomips-gnu-toolchain/releases/tag/nanoMIP...
QEMU deprecation policy schedules code for removal. If we don't need / want to remove, we should un-deprecated [*].
Since I now have spent more time with the ISA, I agree to maintain it along with the other MIPS ISA. Therefore remove its deprecation notice.
For historical notes, see commit a60442eb8 ("Deprecate nanoMIPS ISA").
[*] https://lore.kernel.org/qemu-devel/YVx7YGqUENP83vNF@redhat.com/
Cc: Vince Del Vecchio <Vince.DelVecchio@mediatek.com> Cc: Petar Jovanovic <petar.jovanovic@syrmia.com> Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- v2: un-deprecate (danpb) --- docs/about/deprecated.rst | 23 ----------------------- MAINTAINERS | 6 +----- 2 files changed, 1 insertion(+), 28 deletions(-)
I tried to add nanoMIPS testing using the Codescape toolchain suggested by MediaTek [*], unfortunately QEMU user-mode is not able to run any nanoMIPS binary. Various pieces are missing. In particular, mainstream QEMU doesn't implement the p32 ABI, ELF binaries are handled as o32 and the syscall table doesn't match anything correct. I am sorry but I can not proceed further with this patch. [*] https://github.com/MediaTek-Labs/nanomips-gnu-toolchain/releases/tag/nanoMIP...
participants (2)
-
Philippe Mathieu-Daudé
-
Richard Henderson