sh4: Update MAINTAINERS & trivial fixes
v3 cover sh4: Update MAINTAINERS & trivial fixes
Hi,
This series clarifies the situation of the SH4 TCG target and peripherals.
Since v2:
- Keep Magnus as maintainer:
https://www.mail-archive.com/[email protected]/msg710320.html
Addressed Aleksandar review comments:
- Split the MAINTAINER patch in various atomic units
https://www.mail-archive.com/[email protected]/msg710947.html
- Add Yoshinori Sato as maintainer of SH4/RX peripherals
https://www.mail-archive.com/[email protected]/msg711008.html
Aleksandar, I hope this is now fine for you and you can Ack the changes. If this is still not perfect enough, I suggest you send the perfect patches directly, because I can't spend more time on this.
Maybe patches 7 & 8 can go via acceptance-next queue, and the rest via qemu-trivial@?
Regards,
Phil.
CI report:
https://travis-ci.org/github/philmd/qemu/builds/692828388
Supersedes: <[email protected]>
Philippe Mathieu-Daudé (9):
MAINTAINERS: Mark SH4 section orphan
MAINTAINERS: Mark SH4 based Shix machine orphan
MAINTAINERS: Demote SH4 based R2D machine to 'Odd Fixes'
MAINTAINERS: Cover 'hw/sh4/sh_intc.h' with the R2D machine
MAINTAINERS: Add an entry for common Renesas peripherals
MAINTAINERS: Add Yoshinori Sato as maintainer of Renesas peripherals hw/sh4: Use MemoryRegion typedef
hw/sh4: Extract timer definitions to 'hw/timer/tmu012.h' hw/timer/sh_timer: Remove unused 'qemu/timer.h' include
Thomas Huth (2):
tests/acceptance: Add boot tests for sh4 QEMU advent calendar image .travis.yml: Test SH4 QEMU advent calendar image
include/hw/sh4/sh.h | 12 +----------- include/hw/timer/tmu012.h | 23 +++++++++++++++++++++++ hw/sh4/sh7750.c | 1 + hw/timer/sh_timer.c | 3 ++- .travis.yml | 2 +- MAINTAINERS | 16 ++++++++++------ tests/acceptance/boot_linux_console.py | 13 +++++++++++-- 7 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 include/hw/timer/tmu012.h
Signature · 1 line
2.21.3
PATCH v3 1/11 MAINTAINERS: Mark SH4 section orphan
Aurelien Jarno expressed his desire to orphan the SH4 section [*]:
I don't mind being [...] removed from there.
I do not really have time to work on that.
Mark the SH4 section orphan.
Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 emulation for various years!
[*] https://www.mail-archive.com/[email protected]/msg708400.html
Message-Id: <[email protected]>
--- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
MAINTAINERS +1 -2
@@ -296,8 +296,7 @@ F: tests/tcg/s390x/ L: [email protected] SH4 TCG CPUs -M: Aurelien Jarno <[email protected]> -S: Odd Fixes +S: Orphan F: target/sh4/ F: hw/sh4/ F: disas/sh4.c
Signature · 1 line
2.21.3
Re: [PATCH v3 01/11] MAINTAINERS: Mark SH4 section orphan
чет, 11. јун 2020. у 00:08 Philippe Mathieu-Daudé <[email protected]> је написао/ла:
Quoted 11 lines
Aurelien Jarno expressed his desire to orphan the SH4 section [*]:
I don't mind being [...] removed from there.
I do not really have time to work on that.Mark the SH4 section orphan.
Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 emulation for various years!
Quoted 7 lines
[*] https://www.mail-archive.com/[email protected]/msg708400.html
Message-Id: <[email protected]>
Acked-by Aurelien Jarno <[email protected]>Suggested-by Aleksandar Markovic <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
I am sorry if I hurt anybody's feelings with my choice of words, or in other ways.
As requested by Philippe, I wrote the patch that represent a comprehensive summary of all needed changes related to sh4 maintainership, that is, I believe,
simple, effective and productive in both short and long term.
https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg03080.html
The patch I wrote supersedes patches 1-2 from v2 of this series, and also patches
1-6 from v3 (this one) of this series.
Please let me know if you have any objection to such patch.
Sincerely,
Aleksandar
Quoted 20 lines
MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)MAINTAINERS +1
-3@@ -296,8 +296,7 @@ F: tests/tcg/s390x/ L: [email protected] SH4 TCG CPUs -M: Aurelien Jarno <[email protected]> -S: Odd Fixes +S: Orphan F: target/sh4/ F: hw/sh4/ F: disas/sh4.c --2.21.3
PATCH v3 2/11 MAINTAINERS: Mark SH4 based Shix machine orphan
In reply to Philippe Mathieu-DaudéMagnus Damm doesn't have time to keep maintaining the Shix machine [*]. Mark it orphan, so volunteers can step in to maintain it.
Orphan: No current maintainer [but maybe you could
take the role as you write your new code].
Many thanks to Magnus for introducing this SH4 machine!
[*] https://www.mail-archive.com/[email protected]/msg710319.html
--- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
MAINTAINERS +1 -2
@@ -1257,8 +1257,7 @@ F: hw/intc/sh_intc.c F: hw/timer/sh_timer.c Shix -M: Magnus Damm <[email protected]> -S: Odd Fixes +S: Orphan F: hw/sh4/shix.c SPARC Machines
Signature · 1 line
2.21.3
PATCH v3 3/11 MAINTAINERS: Demote SH4 based R2D machine to 'Odd Fixes'
In reply to Philippe Mathieu-DaudéMagnus Damm doesn't have much time to maintain the R2D machine, but want to keep it [*]. Demote its status to 'Odd Fixes' so contributors won't expect Magnus to take the patches:
Odd Fixes: It has a maintainer but they don't have time to do
much other than throw the odd patch in. See below.
[*] https://www.mail-archive.com/[email protected]/msg710319.html
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
@@ -1251,7 +1251,7 @@ SH4 Machines ------------ R2D M: Magnus Damm <[email protected]> -S: Maintained +S: Odd Fixes F: hw/sh4/r2d.c F: hw/intc/sh_intc.c F: hw/timer/sh_timer.c
Signature · 1 line
2.21.3
PATCH v3 4/11 MAINTAINERS: Cover 'hw/sh4/sh_intc.h' with the R2D machine
In reply to Philippe Mathieu-DaudéCommit 81527b94ad added hw/intc/sh_intc.c, complete by adding its corresponding header.
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -1255,6 +1255,7 @@ S: Odd Fixes F: hw/sh4/r2d.c F: hw/intc/sh_intc.c F: hw/timer/sh_timer.c +F: include/hw/sh4/sh_intc.h Shix S: Orphan
Signature · 1 line
2.21.3
PATCH v3 5/11 MAINTAINERS: Add an entry for common Renesas peripherals
In reply to Philippe Mathieu-DaudéRenesas peripherals are common to SH4/RX based MCUs. Their datasheets share common sections. It makes sense to maintain them altogether. The current names are misleading (see the 'sh' prefix). This will be fixed later when RX peripherals will be added.
--- MAINTAINERS | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
MAINTAINERS +7 -2
@@ -1254,8 +1254,6 @@ M: Magnus Damm <[email protected]> S: Odd Fixes F: hw/sh4/r2d.c F: hw/intc/sh_intc.c -F: hw/timer/sh_timer.c -F: include/hw/sh4/sh_intc.h Shix S: Orphan
@@ -1954,6 +1952,13 @@ F: hw/*/*xive* F: include/hw/*/*xive* F: docs/*/*xive* +Renesas peripherals +M: Magnus Damm <[email protected]> +S: Odd Fixes +F: hw/char/sh_serial.c +F: hw/timer/sh_timer.c +F: include/hw/sh4/sh.h + Subsystems ---------- Audio
Signature · 1 line
2.21.3
Re: [PATCH v3 05/11] MAINTAINERS: Add an entry for common Renesas peripherals
Quoted 18 lines · Philippe Mathieu-Daudé
Renesas peripherals are common to SH4/RX based MCUs. Their datasheets share common sections. It makes sense to maintain them altogether. The current names are misleading (see the 'sh' prefix). This will be fixed later when RX peripherals will be added.
Cc Magnus Damm <[email protected]>Cc Yoshinori Sato <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- MAINTAINERS | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)MAINTAINERS +0
-0
MAINTAINERS M: Magnus Damm <[email protected]> · line 1258
Quoted 5 lines
MAINTAINERS +0
-2@@ -1254,8 +1254,6 @@ M: Magnus Damm <[email protected]> S: Odd Fixes F: hw/sh4/r2d.c F: hw/intc/sh_intc.c -F: hw/timer/sh_timer.c -F: include/hw/sh4/sh_intc.h
You've added the line for sh_intc.h in the previous patch, just to remove it here again? ... I guess you only wanted to remove sh_timer.c here instead?
Thomas
Quoted 17 lines
MAINTAINERS +7
-0Shix S: Orphan@@ -1954,6 +1952,13 @@ F: hw/*/*xive* F: include/hw/*/*xive* F: docs/*/*xive* +Renesas peripherals +M: Magnus Damm <[email protected]> +S: Odd Fixes +F: hw/char/sh_serial.c +F: hw/timer/sh_timer.c +F: include/hw/sh4/sh.h + Subsystems ---------- Audio
Re: [PATCH v3 05/11] MAINTAINERS: Add an entry for common Renesas peripherals
Quoted 14 lines · Thomas Huth
Quoted 13 lines · Philippe Mathieu-Daudé
Renesas peripherals are common to SH4/RX based MCUs. Their datasheets share common sections. It makes sense to maintain them altogether. The current names are misleading (see the 'sh' prefix). This will be fixed later when RX peripherals will be added.
Cc Magnus Damm <[email protected]>Cc Yoshinori Sato <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- MAINTAINERS | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Quoted 14 lines
MAINTAINERS M: Magnus Damm <[email protected]> · line 1258
Quoted 10 lines
MAINTAINERS +0
-2@@ -1254,8 +1254,6 @@ M: Magnus Damm <[email protected]> S: Odd Fixes F: hw/sh4/r2d.c F: hw/intc/sh_intc.c -F: hw/timer/sh_timer.c -F: include/hw/sh4/sh_intc.hYou've added the line for
sh_intc.hin the previous patch, just to remove it here again? ... I guess you only wanted to removesh_timer.chere instead?
Yes, you are right, too many rework trying to split in a way that would satisfy Aleksander requirements, but he eventually implicitly Nacked this series (not replying on the cover however, and not answering my questions, so this is not clear neither...):
https://www.mail-archive.com/[email protected]/msg711260.html
Aleksander said Yoshinori will arrange the sections in his own ways. While I'm not certain Yoshinori is interested/willing to do the cleanup, I don't think any more reviewer should spend time reviewing this. Thanks for caring anyway, very appreciated!
Quoted 21 lines
Thomas
Quoted 17 lines
MAINTAINERS +7
-0Shix S: Orphan@@ -1954,6 +1952,13 @@ F: hw/*/*xive* F: include/hw/*/*xive* F: docs/*/*xive* +Renesas peripherals +M: Magnus Damm <[email protected]> +S: Odd Fixes +F: hw/char/sh_serial.c +F: hw/timer/sh_timer.c +F: include/hw/sh4/sh.h + Subsystems ---------- Audio
PATCH v3 6/11 MAINTAINERS: Add Yoshinori Sato as maintainer of Renesas peripherals
In reply to Philippe Mathieu-DaudéRenesas peripherals are common to SH4/RX based MCUs. Their datasheets share common sections. It makes sense to maintain them altogether.
Yoshinori Sato volonteered to maintain them [*].
[*] https://www.mail-archive.com/[email protected]/msg710928.html
--- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
MAINTAINERS +2 -2
@@ -1953,8 +1953,8 @@ F: include/hw/*/*xive* F: docs/*/*xive* Renesas peripherals -M: Magnus Damm <[email protected]> -S: Odd Fixes +M: Yoshinori Sato <[email protected]> +S: Maintained F: hw/char/sh_serial.c F: hw/timer/sh_timer.c F: include/hw/sh4/sh.h
Signature · 1 line
2.21.3
PATCH v3 7/11 hw/sh4: Use MemoryRegion typedef
In reply to Philippe Mathieu-DaudéUse the MemoryRegion type defined in "qemu/typedefs.h", to keep the repository style consistent.
--- include/hw/sh4/sh.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
include/hw/sh4/sh.h +2 -3
@@ -10,9 +10,8 @@/* sh7750.c */ struct SH7750State ; -struct MemoryRegion ; -struct SH7750State *sh7750_init (SuperHCPU *cpu,struct MemoryRegion *sysmem); +struct SH7750State *sh7750_init (SuperHCPU *cpu,MemoryRegion *sysmem); typedef struct { /* The callback will be triggered if any of the designated lines change */
@@ -32,7 +31,7 @@ int sh7750_register_io_device(struct SH7750State *s,#define TMU012_FEAT_TOCR (1 << 0)#define TMU012_FEAT_3CHAN (1 << 1)#define TMU012_FEAT_EXTCLK (1 << 2) -void tmu012_init (struct MemoryRegion *sysmem,hwaddr base, +void tmu012_init (MemoryRegion *sysmem,hwaddr base,int feat,uint32_t freq,qemu_irq ch0_irq,qemu_irq ch1_irq,qemu_irq ch2_irq0,qemu_irq ch2_irq1);
Signature · 1 line
2.21.3
PATCH v3 8/11 hw/sh4: Extract timer definitions to 'hw/timer/tmu012.h'
In reply to Philippe Mathieu-DaudéExtract timer definitions to 'hw/timer/tmu012.h'.
--- include/hw/sh4/sh.h | 9 --------- include/hw/timer/tmu012.h | 23 +++++++++++++++++++++++ hw/sh4/sh7750.c | 1 + hw/timer/sh_timer.c | 2 ++ 4 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 include/hw/timer/tmu012.h
include/hw/sh4/sh.h +0 -9
@@ -27,15 +27,6 @@ typedef struct {int sh7750_register_io_device (struct SH7750State *s,sh7750_io_device * device); -/* sh_timer.c */ -#define TMU012_FEAT_TOCR (1 << 0) -#define TMU012_FEAT_3CHAN (1 << 1) -#define TMU012_FEAT_EXTCLK (1 << 2) -void tmu012_init (MemoryRegion *sysmem,hwaddr base, -int feat,uint32_t freq, -qemu_irq ch0_irq,qemu_irq ch1_irq, -qemu_irq ch2_irq0,qemu_irq ch2_irq1); -/* sh_serial.c */ #define SH_SERIAL_FEAT_SCIF (1 << 0)
include/hw/timer/tmu012.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* SuperH Timer +* +* Copyright (c) 2007 Magnus Damm +* +* This code is licensed under the GPL. +*/ + +#ifndef HW_TIMER_TMU012_H +#define HW_TIMER_TMU012_H + +#include "exec/hwaddr.h" + +#define TMU012_FEAT_TOCR (1 << 0) +#define TMU012_FEAT_3CHAN (1 << 1) +#define TMU012_FEAT_EXTCLK (1 << 2) + +void tmu012_init (MemoryRegion *sysmem,hwaddr base, +int feat,uint32_t freq, +qemu_irq ch0_irq,qemu_irq ch1_irq, +qemu_irq ch2_irq0,qemu_irq ch2_irq1); + +#endif
hw/sh4/sh7750.c +1 -0
@@ -30,6 +30,7 @@#include "sh7750_regs.h" #include "sh7750_regnames.h" #include "hw/sh4/sh_intc.h" +#include "hw/timer/tmu012.h" #include "cpu.h" #include "exec/exec-all.h"
hw/timer/sh_timer.c +2 -0
@@ -9,10 +9,12 @@*/ #include "qemu/osdep.h" +#include "exec/memory.h" #include "hw/hw.h" #include "hw/irq.h" #include "hw/sh4/sh.h" #include "qemu/timer.h" +#include "hw/timer/tmu012.h" #include "hw/ptimer.h" //#define DEBUG_TIMER
Signature · 1 line
2.21.3
PATCH v3 9/11 hw/timer/sh_timer: Remove unused 'qemu/timer.h' include
In reply to Philippe Mathieu-DaudéRemove unused "qemu/timer.h" include.
--- hw/timer/sh_timer.c | 1 - 1 file changed, 1 deletion(-)
hw/timer/sh_timer.c +0 -1
@@ -13,7 +13,6 @@#include "hw/hw.h" #include "hw/irq.h" #include "hw/sh4/sh.h" -#include "qemu/timer.h" #include "hw/timer/tmu012.h" #include "hw/ptimer.h"
Signature · 1 line
2.21.3
PATCH v3 10/11 tests/acceptance: Add boot tests for sh4 QEMU advent calendar image
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
Now that we can select the second serial console in the acceptance tests (see commit 746f244d9720 "Allow to use other serial consoles than default"), we can also test the sh4 image from the QEMU advent calendar 2018.
Message-Id: <[email protected]>
--- tests/acceptance/boot_linux_console.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
tests/acceptance/boot_linux_console.py +11 -2
@@ -858,12 +858,12 @@ def test_m68k_q800(self): console_pattern = 'No filesystem could mount root' self.wait_for_console_pattern(console_pattern) - def do_test_advcal_2018(self, day, tar_hash, kernel_name): + def do_test_advcal_2018(self, day, tar_hash, kernel_name, console=0): tar_url = ('https://www.qemu-advent-calendar.org' '/2018/download/day' + day + '.tar.xz') file_path = self.fetch_asset(tar_url, asset_hash=tar_hash) archive.extract(file_path, self.workdir) - self.vm.set_console() + self.vm.set_console(console_index=console) self.vm.add_args('-kernel', self.workdir + '/day' + day + '/' + kernel_name) self.vm.launch()
@@ -937,6 +937,15 @@ def test_ppc_mac99(self): self.vm.add_args('-M', 'graphics=off') self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + def test_sh4_r2d(self): + """ + :avocado: tags=arch:sh4 + :avocado: tags=machine:r2d + """ + tar_hash = 'fe06a4fd8ccbf2e27928d64472939d47829d4c7e' + self.vm.add_args('-append', 'console=ttySC1') + self.do_test_advcal_2018('09', tar_hash, 'zImage', console=1) + def test_sparc_ss20(self): """ :avocado: tags=arch:sparc
Signature · 1 line
2.21.3
PATCH v3 11/11 .travis.yml: Test SH4 QEMU advent calendar image
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
Now that we can select the second serial console in the acceptance tests (see commit 746f244d9720 "Allow to use other serial consoles than default"), we can also test the sh4 image from the QEMU advent calendar 2018.
Message-Id: <[email protected]>
--- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
.travis.yml +1 -1
@@ -293,7 +293,7 @@ jobs: - name: "GCC check-acceptance" dist: bionic env: - - CONFIG="--enable-tools --target-list=aarch64-softmmu,alpha-softmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu" + - CONFIG="--enable-tools --target-list=aarch64-softmmu,alpha-softmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sh4-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu" - TEST_CMD="make check-acceptance" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-acceptance" after_script:
Signature · 1 line
2.21.3