* [PULL 0/3] MIPS patches for 5.1
@ 2020-07-14 20:20 Philippe Mathieu-Daudé
2020-07-14 20:20 ` [PULL 1/3] target/mips: Remove identical if/else branches Philippe Mathieu-Daudé
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-07-14 20:20 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Rikalo, Philippe Mathieu-Daudé,
Jiaxun Yang, Aleksandar Markovic, Huacai Chen, Aurelien Jarno
The following changes since commit 1a53dfee92284d3016a579ef31d53367e84d9dd8:
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-07-13' into staging (2020-07-14 13:52:10 +0100)
are available in the Git repository at:
https://gitlab.com/philmd/qemu.git tags/mips-next-20200714
for you to fetch changes up to 15d983dee95edff1dc4c0bed71ce02fff877e766:
MAINTAINERS: Adjust MIPS maintainership (add Huacai Chen & Jiaxun Yang) (2020-07-14 21:49:33 +0200)
----------------------------------------------------------------
MIPS patches for 5.1
- A pair of fixes,
- Add Huacai Chen as MIPS KVM maintainer,
- Add Jiaxun Yang as designated MIPS TCG reviewer.
CI jobs results:
. https://travis-ci.org/github/philmd/qemu/builds/708079271
. https://gitlab.com/philmd/qemu/-/pipelines/166528104
. https://cirrus-ci.com/build/6483996878045184
----------------------------------------------------------------
Aleksandar Markovic (2):
target/mips: Remove identical if/else branches
MAINTAINERS: Adjust MIPS maintainership (add Huacai Chen & Jiaxun
Yang)
Alex Richardson (1):
target/mips: Fix ADD.S FPU instruction
target/mips/cp0_helper.c | 9 +--------
target/mips/fpu_helper.c | 2 +-
MAINTAINERS | 4 ++++
3 files changed, 6 insertions(+), 9 deletions(-)
--
2.21.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL 1/3] target/mips: Remove identical if/else branches
2020-07-14 20:20 [PULL 0/3] MIPS patches for 5.1 Philippe Mathieu-Daudé
@ 2020-07-14 20:20 ` Philippe Mathieu-Daudé
2020-07-14 20:20 ` [PULL 2/3] target/mips: Fix ADD.S FPU instruction Philippe Mathieu-Daudé
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-07-14 20:20 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Rikalo, Philippe Mathieu-Daudé,
Jiaxun Yang, Aleksandar Markovic, Huacai Chen, Aurelien Jarno
From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Remove the segment:
if (other_tc == other->current_tc) {
tccause = other->CP0_Cause;
} else {
tccause = other->CP0_Cause;
}
Original contributor can't remember what was his intention.
Fixes: 5a25ce9487 ("mips: Hook in more reg accesses via mttr/mftr")
Buglink: https://bugs.launchpad.net/qemu/+bug/1885718
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-Id: <20200701182559.28841-2-aleksandar.qemu.devel@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/mips/cp0_helper.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/target/mips/cp0_helper.c b/target/mips/cp0_helper.c
index bbf12e4a97..de64add038 100644
--- a/target/mips/cp0_helper.c
+++ b/target/mips/cp0_helper.c
@@ -375,16 +375,9 @@ target_ulong helper_mftc0_entryhi(CPUMIPSState *env)
target_ulong helper_mftc0_cause(CPUMIPSState *env)
{
int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
- int32_t tccause;
CPUMIPSState *other = mips_cpu_map_tc(env, &other_tc);
- if (other_tc == other->current_tc) {
- tccause = other->CP0_Cause;
- } else {
- tccause = other->CP0_Cause;
- }
-
- return tccause;
+ return other->CP0_Cause;
}
target_ulong helper_mftc0_status(CPUMIPSState *env)
--
2.21.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PULL 2/3] target/mips: Fix ADD.S FPU instruction
2020-07-14 20:20 [PULL 0/3] MIPS patches for 5.1 Philippe Mathieu-Daudé
2020-07-14 20:20 ` [PULL 1/3] target/mips: Remove identical if/else branches Philippe Mathieu-Daudé
@ 2020-07-14 20:20 ` Philippe Mathieu-Daudé
2020-07-14 20:20 ` [PULL 3/3] MAINTAINERS: Adjust MIPS maintainership (add Huacai Chen & Jiaxun Yang) Philippe Mathieu-Daudé
2020-07-15 16:15 ` [PULL 0/3] MIPS patches for 5.1 Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-07-14 20:20 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Rikalo, Philippe Mathieu-Daudé,
Jiaxun Yang, Aleksandar Markovic, Alex Richardson, Huacai Chen,
Aurelien Jarno
From: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
After merging latest QEMU upstream into our CHERI fork,
I noticed that some of the FPU tests in our MIPS baremetal
testsuite [*] started failing.
It turns out commit 1ace099f2a accidentally changed add.s
into a subtract.
[*] https://github.com/CTSRD-CHERI/cheritest
Fixes: 1ace099f2a ("target/mips: fpu: Demacro ADD.<D|S|PS>")
Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200703161515.25966-1-Alexander.Richardson@cl.cam.ac.uk>
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/mips/fpu_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/mips/fpu_helper.c b/target/mips/fpu_helper.c
index 7a3a61cab3..56beda49d8 100644
--- a/target/mips/fpu_helper.c
+++ b/target/mips/fpu_helper.c
@@ -1221,7 +1221,7 @@ uint32_t helper_float_add_s(CPUMIPSState *env,
{
uint32_t wt2;
- wt2 = float32_sub(fst0, fst1, &env->active_fpu.fp_status);
+ wt2 = float32_add(fst0, fst1, &env->active_fpu.fp_status);
update_fcr31(env, GETPC());
return wt2;
}
--
2.21.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PULL 3/3] MAINTAINERS: Adjust MIPS maintainership (add Huacai Chen & Jiaxun Yang)
2020-07-14 20:20 [PULL 0/3] MIPS patches for 5.1 Philippe Mathieu-Daudé
2020-07-14 20:20 ` [PULL 1/3] target/mips: Remove identical if/else branches Philippe Mathieu-Daudé
2020-07-14 20:20 ` [PULL 2/3] target/mips: Fix ADD.S FPU instruction Philippe Mathieu-Daudé
@ 2020-07-14 20:20 ` Philippe Mathieu-Daudé
2020-07-15 16:15 ` [PULL 0/3] MIPS patches for 5.1 Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-07-14 20:20 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Rikalo, Philippe Mathieu-Daudé,
Jiaxun Yang, Aleksandar Markovic, Huacai Chen, Aurelien Jarno
From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Huacai Chen and Jiaxun Yang step in as new energy [1].
Aurelien Jarno comment [2]:
It happens that I known Huacai Chen from the time he was
upstreaming the Loongson 3 support to the kernel, I have been
testing and reviewing his patches. I also know Jiaxun Yang from
the #debian-mips IRC channel. I know that they are both very
competent and have a good knowledge of the open source world.
I therefore agree that they are good additions to maintain and/or
review the MIPS part of QEMU.
[1] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718434.html
[2] https://www.mail-archive.com/qemu-devel@nongnu.org/msg718738.html
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-Id: <20200701182559.28841-3-aleksandar.qemu.devel@gmail.com>
PMD: [Split patch, added Aurelien's comment]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Acked-by: Huacai Chen <chenhc@lemote.com>
---
MAINTAINERS | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index fe8139f367..cdb5c6f171 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -222,6 +222,7 @@ F: disas/microblaze.c
MIPS TCG CPUs
M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
R: Aurelien Jarno <aurelien@aurel32.net>
+R: Jiaxun Yang <jiaxun.yang@flygoat.com>
R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
S: Maintained
F: target/mips/
@@ -384,6 +385,7 @@ S: Maintained
F: target/arm/kvm.c
MIPS KVM CPUs
+M: Huacai Chen <chenhc@lemote.com>
M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
S: Odd Fixes
F: target/mips/kvm.c
@@ -2743,6 +2745,8 @@ F: disas/i386.c
MIPS TCG target
M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
R: Aurelien Jarno <aurelien@aurel32.net>
+R: Huacai Chen <chenhc@lemote.com>
+R: Jiaxun Yang <jiaxun.yang@flygoat.com>
R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
S: Maintained
F: tcg/mips/
--
2.21.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PULL 0/3] MIPS patches for 5.1
2020-07-14 20:20 [PULL 0/3] MIPS patches for 5.1 Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2020-07-14 20:20 ` [PULL 3/3] MAINTAINERS: Adjust MIPS maintainership (add Huacai Chen & Jiaxun Yang) Philippe Mathieu-Daudé
@ 2020-07-15 16:15 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2020-07-15 16:15 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Aleksandar Rikalo, QEMU Developers, Jiaxun Yang,
Aleksandar Markovic, Huacai Chen, Aurelien Jarno
On Tue, 14 Jul 2020 at 21:22, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The following changes since commit 1a53dfee92284d3016a579ef31d53367e84d9dd8:
>
> Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-07-13' into staging (2020-07-14 13:52:10 +0100)
>
> are available in the Git repository at:
>
> https://gitlab.com/philmd/qemu.git tags/mips-next-20200714
>
> for you to fetch changes up to 15d983dee95edff1dc4c0bed71ce02fff877e766:
>
> MAINTAINERS: Adjust MIPS maintainership (add Huacai Chen & Jiaxun Yang) (2020-07-14 21:49:33 +0200)
>
> ----------------------------------------------------------------
> MIPS patches for 5.1
>
> - A pair of fixes,
> - Add Huacai Chen as MIPS KVM maintainer,
> - Add Jiaxun Yang as designated MIPS TCG reviewer.
>
> CI jobs results:
> . https://travis-ci.org/github/philmd/qemu/builds/708079271
> . https://gitlab.com/philmd/qemu/-/pipelines/166528104
> . https://cirrus-ci.com/build/6483996878045184
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-07-15 16:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-14 20:20 [PULL 0/3] MIPS patches for 5.1 Philippe Mathieu-Daudé
2020-07-14 20:20 ` [PULL 1/3] target/mips: Remove identical if/else branches Philippe Mathieu-Daudé
2020-07-14 20:20 ` [PULL 2/3] target/mips: Fix ADD.S FPU instruction Philippe Mathieu-Daudé
2020-07-14 20:20 ` [PULL 3/3] MAINTAINERS: Adjust MIPS maintainership (add Huacai Chen & Jiaxun Yang) Philippe Mathieu-Daudé
2020-07-15 16:15 ` [PULL 0/3] MIPS patches for 5.1 Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.