Skip to contentSkip to conversation

sh4: Mark it orphan in MAINTAINERS & trivial fixes

PATCH Superseded Philippe Mathieu-Daudé 7 participants 23 messages Jun 8, 2020 – Jun 10, 2020

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover sh4: Mark it orphan in MAINTAINERS & trivial fixes

Hi,

This series clarifies the situation of the SH4 TCG target and hardware (there are no active maintainers). From here it should be easier for volunteers to step it.

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]>
Supersedes: <[email protected]>

Philippe Mathieu-Daudé (6):
MAINTAINERS: Mark SH4 hardware orphan
MAINTAINERS: Mark SH4 based R2D & Shix machines orphan
MAINTAINERS: Mark SH4 TCG target orphan
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                            | 18 ++++++++++++------
 tests/acceptance/boot_linux_console.py | 13 +++++++++++--
 7 files changed, 51 insertions(+), 21 deletions(-)
 create mode 100644 include/hw/timer/tmu012.h
Signature · 1 line
2.21.3
#1 lore raw

PATCH v2 1/8 MAINTAINERS: Mark SH4 hardware orphan

Aurelien Jarno expressed his desire to orphan the SH4 hardware [*]:

I don't mind being [...] removed from there.
I do not really have time to work on that.

Mark the SH4 emulated hardware orphan.

Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 hardware for various years!

[*] https://www.mail-archive.com/[email protected]/msg708400.html

Message-Id: <[email protected]>

---
 MAINTAINERS | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
MAINTAINERS +8 -2
index 6e7890ce82..49d90c70de 100644
@@ -299,9 +299,7 @@ SH4 TCG CPUs
 M: Aurelien Jarno <[email protected]>
 S: Odd Fixes
 F: target/sh4/
-F: hw/sh4/
 F: disas/sh4.c
-F: include/hw/sh4/
 
 SPARC TCG CPUs
 M: Mark Cave-Ayland <[email protected]>
@@ -1948,6 +1946,14 @@ F: hw/*/*xive*
 F: include/hw/*/*xive*
 F: docs/*/*xive*
 
+SH4 Hardware
+S: Orphan
+F: hw/sh4/
+F: hw/char/sh_serial.c
+F: hw/intc/sh_intc.c
+F: hw/timer/sh_timer.c
+F: include/hw/sh4/
+
 Subsystems
 ----------
 Audio
Signature · 1 line
2.21.3
#2 lore raw

Re: [PATCH v2 1/8] MAINTAINERS: Mark SH4 hardware orphan

пон, 8. јун 2020. у 11:05 Philippe Mathieu-Daudé <[email protected]> је написао/ла:

Quoted 11 lines

Aurelien Jarno expressed his desire to orphan the SH4 hardware [*]:

I don't mind being [...] removed from there.
I do not really have time to work on that.

Mark the SH4 emulated hardware orphan.

Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 hardware for various years!

Quoted 6 lines

[*] https://www.mail-archive.com/[email protected]/msg708400.html

Message-Id: <[email protected]>

---

The basic idea of the patch (as read from the title and the commit message) is good and positive.

The problem is that the patch does something different than the commit message says - pretending that it just orphans something. Which is not good. Actually, very clumsy and bad.

It creates a whole new subsection in MAINTAINERS file (not said in the commit message), without any consistency with the current organization in the file. That new subsection looks completely misplaced, living with "TCG CPUs" neighbours. On top of that, it creates a new precedent, leaving many unanswered questions, like: Should other targets follow the same pattern?

I personally think that creating a new subsection is just a code churn, waste of everybody's time on unimportant things.

Wouldn't it be simpler that you just changed statuses of all Aurelien sh4 sections to "Orphaned", as he already said he approves, and leave sh4 sections reorganization to a future maintainer?

If you really want to reorganize sh4 sections, these changes should be in a separate patch. "Orphaning" patch should contain only changes of statuses.

Regards,
Aleksandar

Quoted 36 lines
 MAINTAINERS | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
MAINTAINERS +8 -3
index 6e7890ce82..49d90c70de 100644
@@ -299,9 +299,7 @@ SH4 TCG CPUs
 M: Aurelien Jarno <[email protected]>
 S: Odd Fixes
 F: target/sh4/
-F: hw/sh4/
 F: disas/sh4.c
-F: include/hw/sh4/
 
 SPARC TCG CPUs
 M: Mark Cave-Ayland <[email protected]>
@@ -1948,6 +1946,14 @@ F: hw/*/*xive*
 F: include/hw/*/*xive*
 F: docs/*/*xive*
 
+SH4 Hardware
+S: Orphan
+F: hw/sh4/
+F: hw/char/sh_serial.c
+F: hw/intc/sh_intc.c
+F: hw/timer/sh_timer.c
+F: include/hw/sh4/
+
 Subsystems
 ----------
 Audio
--

2.21.3

#3 lore raw

Re: [PATCH v2 1/8] MAINTAINERS: Mark SH4 hardware orphan

Quoted 20 lines · Aleksandar Markovic

пон, 8. јун 2020. у 11:05 Philippe Mathieu-Daudé <[email protected]> је написао/ла:

Quoted 11 lines

Aurelien Jarno expressed his desire to orphan the SH4 hardware [*]:

I don't mind being [...] removed from there.
I do not really have time to work on that.

Mark the SH4 emulated hardware orphan.

Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 hardware for various years!

Quoted 6 lines

[*] https://www.mail-archive.com/[email protected]/msg708400.html

Message-Id: <[email protected]>

---

Quoted 6 lines

The basic idea of the patch (as read from the title and the commit message) is good and positive.

The problem is that the patch does something different than the commit message says - pretending that it just orphans something. Which is not good. Actually, very clumsy and bad.

Aleksandar, could you please stop being so negative? If you've got issues with a patch, that's fair, but you can then also simply express your opinion in a professional and constructive way. Calling the work of someone else "clumsy" is really not something that I want to read on the qemu-devel mailing list.

Thanks,
Thomas

#4 lore raw

Re: [PATCH v2 1/8] MAINTAINERS: Mark SH4 hardware orphan

сре, 10. јун 2020. у 13:17 Thomas Huth <[email protected]> је написао/ла:

Quoted 29 lines · Aleksandar Markovic
Quoted 20 lines

пон, 8. јун 2020. у 11:05 Philippe Mathieu-Daudé <[email protected]> је написао/ла:

Quoted 11 lines

Aurelien Jarno expressed his desire to orphan the SH4 hardware [*]:

I don't mind being [...] removed from there.
I do not really have time to work on that.

Mark the SH4 emulated hardware orphan.

Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 hardware for various years!

Quoted 6 lines

[*] https://www.mail-archive.com/[email protected]/msg708400.html

Message-Id: <[email protected]>

---

Quoted 6 lines

The basic idea of the patch (as read from the title and the commit message) is good and positive.

The problem is that the patch does something different than the commit message says - pretending that it just orphans something. Which is not good. Actually, very clumsy and bad.

Quoted 6 lines

Aleksandar, could you please stop being so negative? If you've got issues with a patch, that's fair, but you can then also simply express your opinion in a professional and constructive way. Calling the work of someone else "clumsy" is really not something that I want to read on the qemu-devel mailing list.

Ok, than delete mentally that word, and focus on the substance.

Quoted 3 lines

Thanks,
Thomas

#5 lore raw

Re: [PATCH v2 1/8] MAINTAINERS: Mark SH4 hardware orphan

In reply to Aleksandar Markovic
Quoted 20 lines · Aleksandar Markovic

пон, 8. јун 2020. у 11:05 Philippe Mathieu-Daudé <[email protected]> је написао/ла:

Quoted 11 lines

Aurelien Jarno expressed his desire to orphan the SH4 hardware [*]:

I don't mind being [...] removed from there.
I do not really have time to work on that.

Mark the SH4 emulated hardware orphan.

Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 hardware for various years!

Quoted 6 lines

[*] https://www.mail-archive.com/[email protected]/msg708400.html

Message-Id: <[email protected]>

---

Quoted 6 lines

The basic idea of the patch (as read from the title and the commit message) is good and positive.

The problem is that the patch does something different than the commit message says - pretending that it just orphans something. Which is not good. Actually, very clumsy and bad.

I can improve my English (actually I am trying, I started to take lessons 2 years ago). Remember it is not easy for non native English speaker to elaborate non-technical topics.
As a side note, it is also hard sometimes to understand contributors who uses a very advanced English level with fancy words, as we have to take the time to translate to understand. Even if we learn new word, this is not often the best use of our time.

Quoted 6 lines

It creates a whole new subsection in MAINTAINERS file (not said in the commit message), without any consistency with the current organization in the file. That new subsection looks completely misplaced, living with "TCG CPUs" neighbours. On top of that, it creates a new precedent, leaving many unanswered questions, like: Should other targets follow the same pattern?

If you look at git-log history, you'll see at the beginning there were not much separations in directories. Everything was altogether. Adding a new machine meant add the TCG emulation code and the hardware. The contributor adding TCG emulation was doing the harder work, usually doing it for a particular machine (hardware). Then other contributors could add other machines, and were maintaining only their machines. See commit b6f97c14f59 importing the short MAINTAINERS from SVN. It was already split in 3 broad categories:
- TCG cores
- Machines / Hardware
- Subsystems (the rest)

In October 2010 (fd5d5c566af0) Anthony Liguori rewrote MAINTAINERS using Linux style tags.

In January 2011 (42f5a7e9367) Aurelien Jarno clarified the difference between the TCG host part (backend, under the tcg/ directory) VS the target part (frontend, under target/).

Then the project grew, and eventually in May 2012 Paolo Bonzini started to clean, by moving files into "subsystem" directories (see 5e8861a0361..c353f261946). In March 2013 he followed by splitting various hardware files from the hw/ directory (see 0d09e41a51a..47b43a1f414).

In November 2013 (f05b328c9d8) Stefan Hajnoczi clarified the importance of the 'block' subsystem (later completed in commit e7c6e631b1 in April 2015).

2015 still, Paolo keeps cleaning (c17652ee409 cover the TCG backend disassembler, 062710000db introduce Peter Maydell for the ARM hardware).

In October 2018 Thomas Huth added the target/ folder (commit fcf5ef2ab).

Recently last year (6347e1f1cc7) Markus Armbruster tried to better describe the TCG frontend ("Overall TCG CPUs") and backend ("TCG target") differences.

So while the difference between TCG emulation (or other accelerators, KVM, ...) versus the hardware emulation is not perfect, there is a separation (and the community failed at clarifying it).

You can see when you were introduced as maintainer for the MIPS target (commit c92023bfd) you were also added as maintainer of the MIPSSIM and Fuloong 2E machines.

In commit 485cd9820 you volunteered to maintain the Malta machine, so I believe you have a good understanding about the difference between target code and hardware code.

Quoted 3 lines

I personally think that creating a new subsection is just a code churn, waste of everybody's time on unimportant things.

Eh... I read that after spending 1h writing the previous paragraph. Yes, you are right.

Quoted 8 lines

Wouldn't it be simpler that you just changed statuses of all Aurelien sh4 sections to "Orphaned", as he already said he approves, and leave sh4 sections reorganization to a future maintainer?

If you really want to reorganize sh4 sections, these changes should be in a separate patch. "Orphaning" patch should contain only changes of statuses.

Good idea! Maybe if you send a patch to show me how to do it, it will be easier to understand what you mean.

Thanks for also caring about the SH4 hardware, the code was prone to bitrot and needed maintainer to look after it.

Regards,

Phil.

Quoted 41 lines

Regards,
Aleksandar

Quoted 36 lines
 MAINTAINERS | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
MAINTAINERS +8 -3
index 6e7890ce82..49d90c70de 100644
@@ -299,9 +299,7 @@ SH4 TCG CPUs
 M: Aurelien Jarno <[email protected]>
 S: Odd Fixes
 F: target/sh4/
-F: hw/sh4/
 F: disas/sh4.c
-F: include/hw/sh4/
 
 SPARC TCG CPUs
 M: Mark Cave-Ayland <[email protected]>
@@ -1948,6 +1946,14 @@ F: hw/*/*xive*
 F: include/hw/*/*xive*
 F: docs/*/*xive*
 
+SH4 Hardware
+S: Orphan
+F: hw/sh4/
+F: hw/char/sh_serial.c
+F: hw/intc/sh_intc.c
+F: hw/timer/sh_timer.c
+F: include/hw/sh4/
+
 Subsystems
 ----------
 Audio
--

2.21.3

#6 lore raw

Re: [PATCH v2 1/8] MAINTAINERS: Mark SH4 hardware orphan

сре, 10. јун 2020. у 14:06 Philippe Mathieu-Daudé <[email protected]> је написао/ла:

Quoted 114 lines · Aleksandar Markovic
Quoted 20 lines

пон, 8. јун 2020. у 11:05 Philippe Mathieu-Daudé <[email protected]> је написао/ла:

Quoted 11 lines

Aurelien Jarno expressed his desire to orphan the SH4 hardware [*]:

I don't mind being [...] removed from there.
I do not really have time to work on that.

Mark the SH4 emulated hardware orphan.

Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 hardware for various years!

Quoted 6 lines

[*] https://www.mail-archive.com/[email protected]/msg708400.html

Message-Id: <[email protected]>

---

Quoted 6 lines

The basic idea of the patch (as read from the title and the commit message) is good and positive.

The problem is that the patch does something different than the commit message says - pretending that it just orphans something. Which is not good. Actually, very clumsy and bad.

I can improve my English (actually I am trying, I started to take lessons 2 years ago). Remember it is not easy for non native English speaker to elaborate non-technical topics.
As a side note, it is also hard sometimes to understand contributors who uses a very advanced English level with fancy words, as we have to take the time to translate to understand. Even if we learn new word, this is not often the best use of our time.

Quoted 6 lines

It creates a whole new subsection in MAINTAINERS file (not said in the commit message), without any consistency with the current organization in the file. That new subsection looks completely misplaced, living with "TCG CPUs" neighbours. On top of that, it creates a new precedent, leaving many unanswered questions, like: Should other targets follow the same pattern?

If you look at git-log history, you'll see at the beginning there were not much separations in directories. Everything was altogether. Adding a new machine meant add the TCG emulation code and the hardware. The contributor adding TCG emulation was doing the harder work, usually doing it for a particular machine (hardware). Then other contributors could add other machines, and were maintaining only their machines. See commit b6f97c14f59 importing the short MAINTAINERS from SVN. It was already split in 3 broad categories:
- TCG cores
- Machines / Hardware
- Subsystems (the rest)

In October 2010 (fd5d5c566af0) Anthony Liguori rewrote MAINTAINERS using Linux style tags.

In January 2011 (42f5a7e9367) Aurelien Jarno clarified the difference between the TCG host part (backend, under the tcg/ directory) VS the target part (frontend, under target/).

Then the project grew, and eventually in May 2012 Paolo Bonzini started to clean, by moving files into "subsystem" directories (see 5e8861a0361..c353f261946). In March 2013 he followed by splitting various hardware files from the hw/ directory (see 0d09e41a51a..47b43a1f414).

In November 2013 (f05b328c9d8) Stefan Hajnoczi clarified the importance of the 'block' subsystem (later completed in commit e7c6e631b1 in April 2015).

2015 still, Paolo keeps cleaning (c17652ee409 cover the TCG backend disassembler, 062710000db introduce Peter Maydell for the ARM hardware).

In October 2018 Thomas Huth added the target/ folder (commit fcf5ef2ab).

Recently last year (6347e1f1cc7) Markus Armbruster tried to better describe the TCG frontend ("Overall TCG CPUs") and backend ("TCG target") differences.

So while the difference between TCG emulation (or other accelerators, KVM, ...) versus the hardware emulation is not perfect, there is a separation (and the community failed at clarifying it).

You can see when you were introduced as maintainer for the MIPS target (commit c92023bfd) you were also added as maintainer of the MIPSSIM and Fuloong 2E machines.

In commit 485cd9820 you volunteered to maintain the Malta machine, so I believe you have a good understanding about the difference between target code and hardware code.

Quoted 3 lines

I personally think that creating a new subsection is just a code churn, waste of everybody's time on unimportant things.

Eh... I read that after spending 1h writing the previous paragraph. Yes, you are right.

Quoted 8 lines

Wouldn't it be simpler that you just changed statuses of all Aurelien sh4 sections to "Orphaned", as he already said he approves, and leave sh4 sections reorganization to a future maintainer?

If you really want to reorganize sh4 sections, these changes should be in a separate patch. "Orphaning" patch should contain only changes of statuses.

Quoted 6 lines

Good idea! Maybe if you send a patch to show me how to do it, it will be easier to understand what you mean.

Thanks for also caring about the SH4 hardware, the code was prone to bitrot and needed maintainer to look after it.

Thank you very much for the analysis above, Philippe.

I think the whole thing is blown out of proportions, possibly to a great degree by my fault.

Again, I think it is this simple: Yoshimori has the best conditions among us for maintaining rx and sh4, he needs it, he wants it - and we just give it to him.

Nothing more and nothing less.

Regards,
Aleksandar

Quoted 45 lines

Regards,

Phil.

Quoted 41 lines

Regards,
Aleksandar

Quoted 36 lines
 MAINTAINERS | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
MAINTAINERS +8 -3
index 6e7890ce82..49d90c70de 100644
@@ -299,9 +299,7 @@ SH4 TCG CPUs
 M: Aurelien Jarno <[email protected]>
 S: Odd Fixes
 F: target/sh4/
-F: hw/sh4/
 F: disas/sh4.c
-F: include/hw/sh4/
 
 SPARC TCG CPUs
 M: Mark Cave-Ayland <[email protected]>
@@ -1948,6 +1946,14 @@ F: hw/*/*xive*
 F: include/hw/*/*xive*
 F: docs/*/*xive*
 
+SH4 Hardware
+S: Orphan
+F: hw/sh4/
+F: hw/char/sh_serial.c
+F: hw/intc/sh_intc.c
+F: hw/timer/sh_timer.c
+F: include/hw/sh4/
+
 Subsystems
 ----------
 Audio
--

2.21.3

#7 lore raw

Re: [PATCH v2 1/8] MAINTAINERS: Mark SH4 hardware orphan

In reply to Aleksandar Markovic
Quoted 23 lines · Aleksandar Markovic

пон, 8. јун 2020. у 11:05 Philippe Mathieu-Daudé <[email protected]> је написао/ла:

Quoted 11 lines

Aurelien Jarno expressed his desire to orphan the SH4 hardware [*]:

I don't mind being [...] removed from there.
I do not really have time to work on that.

Mark the SH4 emulated hardware orphan.

Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 hardware for various years!

Quoted 6 lines

[*] https://www.mail-archive.com/[email protected]/msg708400.html

Message-Id: <[email protected]>

---

The basic idea of the patch (as read from the title and the commit message) is good and positive.

Quoted 8 lines

The problem is that the patch does something different than the commit message says - pretending that it just orphans something. Which is not good. Actually, very clumsy and bad.

It creates a whole new subsection in MAINTAINERS file (not said in the commit message), without any consistency with the current organization in the file. That new subsection looks completely misplaced, living with "TCG CPUs" neighbours.

I guess you misread the patch context, pasting it again:

-->8--

MAINTAINERS +8 -2
index 6e7890ce82..49d90c70de 100644
@@ -299,9 +299,7 @@ SH4 TCG CPUs
 M: Aurelien Jarno <[email protected]>
 S: Odd Fixes
 F: target/sh4/
-F: hw/sh4/
 F: disas/sh4.c
-F: include/hw/sh4/
 
 SPARC TCG CPUs
 M: Mark Cave-Ayland <[email protected]>
@@ -1948,6 +1946,14 @@ F: hw/*/*xive*
 F: include/hw/*/*xive*
 F: docs/*/*xive*
 
+SH4 Hardware
+S: Orphan
+F: hw/sh4/
+F: hw/char/sh_serial.c
+F: hw/intc/sh_intc.c
+F: hw/timer/sh_timer.c
+F: include/hw/sh4/
+
 Subsystems
 ----------
 Audio

---

Pasting with more context and lines numbered:

283 RENESAS RX CPUs
284 M: Yoshinori Sato <[email protected]> 285 S: Maintained
286 F: target/rx/
287
288 S390 TCG CPUs
289 M: Richard Henderson <[email protected]> 290 M: David Hildenbrand <[email protected]> 291 S: Maintained
292 F: target/s390x/
293 F: hw/s390x/
294 F: disas/s390.c
295 F: tests/tcg/s390x/
296 L: [email protected]
297
298 SH4 TCG CPUs
299 M: Aurelien Jarno <[email protected]> 300 S: Odd Fixes
301 F: target/sh4/
302 F: disas/sh4.c

^ This part is the TCG frontend.

303
304 SPARC TCG CPUs
305 M: Mark Cave-Ayland <[email protected]> 306 M: Artyom Tarasenko <[email protected]> 307 S: Maintained
308 F: target/sparc/
309 F: hw/sparc/
310 F: hw/sparc64/
311 F: include/hw/sparc/sparc64.h
312 F: disas/sparc.c
313
314 UniCore32 TCG CPUs
315 M: Guan Xuetao <[email protected]>
316 S: Maintained
317 F: target/unicore32/
318 F: hw/unicore32/
319 F: include/hw/unicore32/
...

1240 RISC-V Machines
1241 ---------------
1242 OpenTitan
1243 M: Alistair Francis <[email protected]> 1244 L: [email protected]
1245 S: Supported
1246 F: hw/riscv/opentitan.c
1247 F: include/hw/riscv/opentitan.h
1248
1249 SH4 Machines
1250 ------------
1251 R2D
1252 M: Magnus Damm <[email protected]> 1253 S: Maintained
1254 F: hw/sh4/r2d.c
1255 F: hw/intc/sh_intc.c
1256 F: hw/timer/sh_timer.c

^ a SH4-based machine

1257
1258 Shix
1259 M: Magnus Damm <[email protected]> 1260 S: Odd Fixes
1261 F: hw/sh4/shix.c
1262
1263 SPARC Machines
1264 --------------
1265 Sun4m
1266 M: Mark Cave-Ayland <[email protected]> 1267 S: Maintained
1268 F: hw/sparc/sun4m.c
1269 F: hw/sparc/sun4m_iommu.c
....

1455 Devices
1456 -------
1457 EDU
1458 M: Jiri Slaby <[email protected]>
1459 S: Maintained
1460 F: hw/misc/edu.c
1461
1462 IDE
1463 M: John Snow <[email protected]>
1464 L: [email protected]
1465 S: Supported
1466 F: include/hw/ide.h
1467 F: include/hw/ide/
1468 F: hw/ide/
....

1919 PIIX4 South Bridge (i82371AB)
1920 M: Hervé Poussineau <[email protected]> 1921 M: Philippe Mathieu-Daudé <[email protected]> 1922 S: Maintained
1923 F: hw/isa/piix4.c
1924 F: include/hw/southbridge/piix.h
1925
1926 Firmware configuration (fw_cfg)
1927 M: Philippe Mathieu-Daudé <[email protected]> 1928 R: Laszlo Ersek <[email protected]>
1929 R: Gerd Hoffmann <[email protected]>
1930 S: Supported
1931 F: docs/specs/fw_cfg.txt
1932 F: hw/nvram/fw_cfg.c
1933 F: stubs/fw_cfg.c
1934 F: include/hw/nvram/fw_cfg.h
1935 F: include/standard-headers/linux/qemu_fw_cfg.h 1936 F: tests/qtest/libqos/fw_cfg.c
1937 F: tests/qtest/fw_cfg-test.c
1938 T: git https://github.com/philmd/qemu.git fw_cfg-next 1939
1940 XIVE
1941 M: David Gibson <[email protected]> 1942 M: Cédric Le Goater <[email protected]>
1943 L: [email protected]
1944 S: Supported
1945 F: hw/*/*xive*
1946 F: include/hw/*/*xive*
1947 F: docs/*/*xive*
1948
1949 SH4 Hardware
1950 S: Orphan
1951 F: hw/sh4/
1952 F: hw/char/sh_serial.c
1953 F: hw/intc/sh_intc.c
1954 F: hw/timer/sh_timer.c
1955 F: include/hw/sh4/

^ The section is placed under the "Devices" category.

1956
1957 Subsystems
1958 ----------
1959 Audio
1960 M: Gerd Hoffmann <[email protected]> 1961 S: Maintained
1962 F: audio/
....

Where do you think this entry should be placed?

Quoted 55 lines

On top of that, it creates a new
precedent, leaving many unanswered questions, like: Should other targets follow the same pattern?

I personally think that creating a new subsection is just a code churn, waste of everybody's time on unimportant things.

Wouldn't it be simpler that you just changed statuses of all Aurelien sh4 sections to "Orphaned", as he already said he approves, and leave sh4 sections reorganization to a future maintainer?

If you really want to reorganize sh4 sections, these changes should be in a separate patch. "Orphaning" patch should contain only changes of statuses.

Regards,
Aleksandar

Quoted 36 lines
 MAINTAINERS | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
MAINTAINERS +8 -3
index 6e7890ce82..49d90c70de 100644
@@ -299,9 +299,7 @@ SH4 TCG CPUs
 M: Aurelien Jarno <[email protected]>
 S: Odd Fixes
 F: target/sh4/
-F: hw/sh4/
 F: disas/sh4.c
-F: include/hw/sh4/
 
 SPARC TCG CPUs
 M: Mark Cave-Ayland <[email protected]>
@@ -1948,6 +1946,14 @@ F: hw/*/*xive*
 F: include/hw/*/*xive*
 F: docs/*/*xive*
 
+SH4 Hardware
+S: Orphan
+F: hw/sh4/
+F: hw/char/sh_serial.c
+F: hw/intc/sh_intc.c
+F: hw/timer/sh_timer.c
+F: include/hw/sh4/
+
 Subsystems
 ----------
 Audio
--

2.21.3

#8 lore raw

PATCH v2 2/8 MAINTAINERS: Mark SH4 based R2D & Shix machines orphan

In reply to Philippe Mathieu-Daudé

Last commit from Magnus Damm is fc8e320ef583, which date is Fri Nov 13 2009. As nobody else seems to care about the patches posted [*] related to the R2D and Shix machines, mark them orphan.

Many thanks to Magnus for his substantial contributions to QEMU, and for introducing these SH4 based machine!

[*] https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08519.html

---
 MAINTAINERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
MAINTAINERS +3 -2
index 49d90c70de..a012d9b74e 100644
@@ -1250,14 +1250,15 @@ SH4 Machines
 ------------
 R2D
 M: Magnus Damm <[email protected]>
-S: Maintained
+S: Orphan
 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
 M: Magnus Damm <[email protected]>
-S: Odd Fixes
+S: Orphan
 F: hw/sh4/shix.c
 
 SPARC Machines
Signature · 1 line
2.21.3
#9 lore raw

Re: [PATCH v2 2/8] MAINTAINERS: Mark SH4 based R2D & Shix machines orphan

Quoted 25 lines · Philippe Mathieu-Daudé

Last commit from Magnus Damm is fc8e320ef583, which date is Fri Nov 13 2009. As nobody else seems to care about the patches posted [*] related to the R2D and Shix machines, mark them orphan.

Many thanks to Magnus for his substantial contributions to QEMU, and for introducing these SH4 based machine!

[*] https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08519.html

---
 MAINTAINERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
MAINTAINERS +1 -1
index 49d90c70de..a012d9b74e 100644
@@ -1250,14 +1250,15 @@ SH4 Machines
 ------------
 R2D
 M: Magnus Damm <[email protected]>
-S: Maintained
+S: Orphan

MAINTAINERS SH4 Machines · line 1262

Quoted 10 lines
MAINTAINERS +2 -1
 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
 M: Magnus Damm <[email protected]>
-S: Odd Fixes
+S: Orphan
 F: hw/sh4/shix.c

Having both, an "M:" entry and "S: Orphan" in a section sounds weird. Magnus, are you still interested in these sections? If not, I think the "M:" line should be removed...?

Thomas

#10 lore raw

Re: [PATCH v2 2/8] MAINTAINERS: Mark SH4 based R2D & Shix machines orphan

Quoted 7 lines · Thomas Huth
Quoted 6 lines · Philippe Mathieu-Daudé

Last commit from Magnus Damm is fc8e320ef583, which date is Fri Nov 13 2009. As nobody else seems to care about the patches posted [*] related to the R2D and Shix machines, mark them orphan.

Many thanks to Magnus for his substantial contributions to QEMU, and for introducing these SH4 based machine!

s/machine/machines/

Quoted 24 lines
Quoted 24 lines

[*] https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08519.html

---
 MAINTAINERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
MAINTAINERS +2 -1
index 49d90c70de..a012d9b74e 100644
@@ -1250,14 +1250,15 @@ SH4 Machines
 ------------
 R2D
 M: Magnus Damm <[email protected]>
-S: Maintained
+S: Orphan
 F: hw/sh4/r2d.c
 F: hw/intc/sh_intc.c
 F: hw/timer/sh_timer.c
+F: include/hw/sh4/sh_intc.h
 
Quoted 9 lines

MAINTAINERS SH4 Machines · line 1262

Quoted 5 lines
MAINTAINERS +1 -1
 Shix
 M: Magnus Damm <[email protected]>
-S: Odd Fixes
+S: Orphan
 F: hw/sh4/shix.c

Having both, an "M:" entry and "S: Orphan" in a section sounds weird. Magnus, are you still interested in these sections? If not, I think the "M:" line should be removed...?

Concur. Of course, let's give Magnus a chance to chime in.

#11 lore raw

Re: [PATCH v2 2/8] MAINTAINERS: Mark SH4 based R2D & Shix machines orphan

Hi Markus and Thomas,

Quoted 47 lines · Markus Armbruster
Quoted 7 lines · Thomas Huth
Quoted 6 lines · Philippe Mathieu-Daudé

Last commit from Magnus Damm is fc8e320ef583, which date is Fri Nov 13 2009. As nobody else seems to care about the patches posted [*] related to the R2D and Shix machines, mark them orphan.

Many thanks to Magnus for his substantial contributions to QEMU, and for introducing these SH4 based machine!

s/machine/machines/

Quoted 24 lines
Quoted 24 lines

[*] https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08519.html

---
 MAINTAINERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
MAINTAINERS +2 -1
index 49d90c70de..a012d9b74e 100644
@@ -1250,14 +1250,15 @@ SH4 Machines
 ------------
 R2D
 M: Magnus Damm <[email protected]>
-S: Maintained
+S: Orphan
 F: hw/sh4/r2d.c
 F: hw/intc/sh_intc.c
 F: hw/timer/sh_timer.c
+F: include/hw/sh4/sh_intc.h
 
Quoted 9 lines

MAINTAINERS SH4 Machines · line 1262

Quoted 5 lines
MAINTAINERS +1 -1
 Shix
 M: Magnus Damm <[email protected]>
-S: Odd Fixes
+S: Orphan
 F: hw/sh4/shix.c

Having both, an "M:" entry and "S: Orphan" in a section sounds weird. Magnus, are you still interested in these sections? If not, I think the "M:" line should be removed...?

Quoted 1 line

Concur. Of course, let's give Magnus a chance to chime in.

Thanks guys! I'm interested but don't have so much time available to commit to this I'm afraid. In particular I'm keen on trying to keep R2D around since I happen to have a physical machine setup in my remote access rack. SH4 with FPU used to have alright gcc + binutils toolchain and glibc support once while other SuperH SoCs lacked some portions. So keeping SH4 (sh775x) around would be nice IMO.

Cheers,

/ magnus

#12 lore raw

Re: [PATCH v2 2/8] MAINTAINERS: Mark SH4 based R2D & Shix machines orphan

Hi Magnus,

Quoted 50 lines · Magnus Damm

Hi Markus and Thomas,

Quoted 47 lines · Markus Armbruster
Quoted 7 lines · Thomas Huth
Quoted 6 lines · Philippe Mathieu-Daudé

Last commit from Magnus Damm is fc8e320ef583, which date is Fri Nov 13 2009. As nobody else seems to care about the patches posted [*] related to the R2D and Shix machines, mark them orphan.

Many thanks to Magnus for his substantial contributions to QEMU, and for introducing these SH4 based machine!

s/machine/machines/

Quoted 33 lines
Quoted 19 lines

[*] https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08519.html

---
 MAINTAINERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
MAINTAINERS +1 -1
index 49d90c70de..a012d9b74e 100644
@@ -1250,14 +1250,15 @@ SH4 Machines
 ------------
 R2D
 M: Magnus Damm <[email protected]>
-S: Maintained
+S: Orphan

MAINTAINERS SH4 Machines · line 1262

Quoted 10 lines
MAINTAINERS +2 -1
 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
 M: Magnus Damm <[email protected]>
-S: Odd Fixes
+S: Orphan
 F: hw/sh4/shix.c

Having both, an "M:" entry and "S: Orphan" in a section sounds weird. Magnus, are you still interested in these sections? If not, I think the "M:" line should be removed...?

Quoted 8 lines
Quoted 1 line

Concur. Of course, let's give Magnus a chance to chime in.

Thanks guys! I'm interested but don't have so much time available to commit to this I'm afraid. In particular I'm keen on trying to keep R2D around since I happen to have a physical machine setup in my remote access rack. SH4 with FPU used to have alright gcc + binutils toolchain and glibc support once while other SuperH SoCs lacked some portions. So keeping SH4 (sh775x) around would be nice IMO.

Great news!

FYI Yoshinori Sato did a great job on updating the Renesas hardware, see:
https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08584.html

He might be able to help with the UART/TIMER peripherals used by the R2D, see a suggestion to add a 'Renesas hardware' entry:
https://www.mail-archive.com/[email protected]/msg708478.html

If Yoshinori accept the suggestion to add a Renesas hardware entry, do you agree to be listed as there too? Maybe with a 'R:' tag for designated reviewer instead of maintainer.

So I'll respin this series with these changes:

R2D: S: 'Maintained' -> 'Odd Fixes'

So contributors don't wait for you to take the patches, and they can go via qemu-trivial.

And Shix -> No maintainer, S: 'Obsolete'.

The TCG backend stay orphan.

Regards,

Phil.

Quoted 5 lines

Cheers,

/ magnus

#13 lore raw

Re: [PATCH v2 2/8] MAINTAINERS: Mark SH4 based R2D & Shix machines orphan

Quoted 84 lines · Philippe Mathieu-Daudé

Hi Magnus,

Quoted 50 lines · Magnus Damm

Hi Markus and Thomas,

Quoted 47 lines · Markus Armbruster
Quoted 7 lines · Thomas Huth
Quoted 6 lines · Philippe Mathieu-Daudé

Last commit from Magnus Damm is fc8e320ef583, which date is Fri Nov 13 2009. As nobody else seems to care about the patches posted [*] related to the R2D and Shix machines, mark them orphan.

Many thanks to Magnus for his substantial contributions to QEMU, and for introducing these SH4 based machine!

s/machine/machines/

Quoted 33 lines
Quoted 19 lines

[*] https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08519.html

---
 MAINTAINERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
MAINTAINERS +1 -1
index 49d90c70de..a012d9b74e 100644
@@ -1250,14 +1250,15 @@ SH4 Machines
 ------------
 R2D
 M: Magnus Damm <[email protected]>
-S: Maintained
+S: Orphan

MAINTAINERS SH4 Machines · line 1262

Quoted 10 lines
MAINTAINERS +2 -1
 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
 M: Magnus Damm <[email protected]>
-S: Odd Fixes
+S: Orphan
 F: hw/sh4/shix.c

Having both, an "M:" entry and "S: Orphan" in a section sounds weird. Magnus, are you still interested in these sections? If not, I think the "M:" line should be removed...?

Quoted 8 lines
Quoted 1 line

Concur. Of course, let's give Magnus a chance to chime in.

Thanks guys! I'm interested but don't have so much time available to commit to this I'm afraid. In particular I'm keen on trying to keep R2D around since I happen to have a physical machine setup in my remote access rack. SH4 with FPU used to have alright gcc + binutils toolchain and glibc support once while other SuperH SoCs lacked some portions. So keeping SH4 (sh775x) around would be nice IMO.

Great news!

FYI Yoshinori Sato did a great job on updating the Renesas hardware, see:
https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08584.html

He might be able to help with the UART/TIMER peripherals used by the R2D, see a suggestion to add a 'Renesas hardware' entry:
https://www.mail-archive.com/[email protected]/msg708478.html

If Yoshinori accept the suggestion to add a Renesas hardware entry, do you agree to be listed as there too? Maybe with a 'R:' tag for designated reviewer instead of maintainer.

So I'll respin this series with these changes:

R2D: S: 'Maintained' -> 'Odd Fixes'

So contributors don't wait for you to take the patches, and they can go via qemu-trivial.

Quoted 14 lines

And Shix -> No maintainer, S: 'Obsolete'.

The TCG backend stay orphan.

Regards,

Phil.

Quoted 5 lines

Cheers,

/ magnus

OK.
I also need sh4, so I will perform maintenance.

Signature · 1 line
Yosinori Sato
#14 lore raw

Re: [PATCH v2 2/8] MAINTAINERS: Mark SH4 based R2D & Shix machines orphan

In reply to Philippe Mathieu-Daudé

пон, 8. јун 2020. у 11:03 Philippe Mathieu-Daudé <[email protected]> је написао/ла:

Quoted 5 lines

Last commit from Magnus Damm is fc8e320ef583, which date is Fri Nov 13 2009. As nobody else seems to care about the patches posted [*] related to the R2D and Shix machines, mark them orphan.

Quoted 8 lines

Many thanks to Magnus for his substantial contributions to QEMU, and for introducing these SH4 based machine!

[*] https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08519.html

---

I think, regarding both patches 1 and 2 of this series, we just got overly complicated.

I suggest simple replacement of Aurelien's and Magnus' name with Yoshimori's, with possible exception of addition of the line:

+F: include/hw/sh4/sh_intc.h

And that's it!

And let's finish this unpleasant episode!

Regards,
Aleksandar

P.S. I now expect that Thomas will complain about my usage of the words "unpleasant" and "overly".

Quoted 29 lines
 MAINTAINERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
MAINTAINERS +3 -3
index 49d90c70de..a012d9b74e 100644
@@ -1250,14 +1250,15 @@ SH4 Machines
 ------------
 R2D
 M: Magnus Damm <[email protected]>
-S: Maintained
+S: Orphan
 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
 M: Magnus Damm <[email protected]>
-S: Odd Fixes
+S: Orphan
 F: hw/sh4/shix.c
 
 SPARC Machines
--

2.21.3

#15 lore raw

PATCH v2 3/8 MAINTAINERS: Mark SH4 TCG target orphan

In reply to Philippe Mathieu-Daudé

Aurelien Jarno expressed his desire to orphan the SH4 target [*]:

I don't mind being [...] removed from there.
I do not really have time to work on that.

Mark the SH4 TCG target orphan.

Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 TCG target 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
index a012d9b74e..cd65bce72b 100644
@@ -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: disas/sh4.c
 
Signature · 1 line
2.21.3
Acked-by on v2 3/8
#16 lore raw

Re: [PATCH v2 3/8] MAINTAINERS: Mark SH4 TCG target orphan

Quoted 24 lines · Philippe Mathieu-Daudé

Aurelien Jarno expressed his desire to orphan the SH4 target [*]:

I don't mind being [...] removed from there.
I do not really have time to work on that.

Mark the SH4 TCG target orphan.

Many thanks to Aurelien for his substantial contributions to QEMU, and for maintaining the SH4 TCG target 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 +0 -0
index a012d9b74e..cd65bce72b 100644

MAINTAINERS F: tests/tcg/s390x/ · line 301

Quoted 8 lines
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: disas/sh4.c
Signature · 2 lines
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
[email protected]                 http://www.aurel32.net
#17 lore raw

PATCH v2 4/8 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.

Message-Id: <[email protected]>

---
 include/hw/sh4/sh.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
include/hw/sh4/sh.h +2 -3
index 767a2df7e2..fe773cb01d 100644
@@ -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
Reviewed-by on v2 4/8
#18 lore raw

Re: [PATCH v2 4/8] hw/sh4: Use MemoryRegion typedef

Quoted 27 lines · Philippe Mathieu-Daudé

Use the MemoryRegion type defined in "qemu/typedefs.h", to keep the repository style consistent.

Message-Id: <[email protected]>

---
 include/hw/sh4/sh.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
include/hw/sh4/sh.h +1 -2
index 767a2df7e2..fe773cb01d 100644
@@ -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 */

include/hw/sh4/sh.h int sh7750_register_io_device(struct SH7750State *s, · line 37

Quoted 8 lines
include/hw/sh4/sh.h +1 -1
@@ -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);
#19 lore raw

PATCH v2 5/8 hw/sh4: Extract timer definitions to 'hw/timer/tmu012.h'

In reply to Philippe Mathieu-Daudé

Extract timer definitions to 'hw/timer/tmu012.h'.

Message-Id: <[email protected]>

---
 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
index fe773cb01d..93f464bf4c 100644
@@ -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
new file mode 100644
index 0000000000..808ed8de1d
@@ -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
index d660714443..f8ac3ec6e3 100644
@@ -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
index 13c4051808..b9cbacf5d0 100644
@@ -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
#20 lore raw

PATCH v2 6/8 hw/timer/sh_timer: Remove unused 'qemu/timer.h' include

In reply to Philippe Mathieu-Daudé

Remove unused "qemu/timer.h" include.

Message-Id: <[email protected]>

---
 hw/timer/sh_timer.c | 1 -
 1 file changed, 1 deletion(-)
hw/timer/sh_timer.c +0 -1
index b9cbacf5d0..bb0e1c8ee5 100644
@@ -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
#21 lore raw

PATCH v2 7/8 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]>

[PMD: Split .travis.yml change in separate patch]
---
 tests/acceptance/boot_linux_console.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
tests/acceptance/boot_linux_console.py +11 -2
index 12725d4529..d4fb2bce82 100644
@@ -827,12 +827,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()
@@ -906,6 +906,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
#22 lore raw

PATCH v2 8/8 .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]>

[PMD: Split tests/acceptance/boot_linux_console.py in previous commit]
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
.travis.yml +1 -1
index 564be50a3c..e2003565d8 100644
@@ -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