[PATCH-for-8.2] target/nios2: Deprecate the Nios II architecture

[PATCH-for-8.2] target/nios2: Deprecate the Nios II architecture

[Philippe Mathieu-Daudé]

See commit 9ba1caf510 ("MAINTAINERS: Mark the Nios II CPU as orphan"),
last contribution from Chris was in 2012 [1] and Marek in 2018 [2].

[1] https://lore.kernel.org/qemu-devel/1352607539-10455-2-git-send-email-crwulff@gmail.com/
[2] https://lore.kernel.org/qemu-devel/805fc7b5-03f0-56d4-abfd-ed010d4fa769@denx.de/

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 docs/about/deprecated.rst | 15 +++++++++++++++
 hw/nios2/10m50_devboard.c |  1 +
 hw/nios2/generic_nommu.c  |  1 +
 3 files changed, 17 insertions(+)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 78550c07bf..f7aa556294 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -236,6 +236,16 @@ it. Since all recent x86 hardware from the past >10 years is capable of the
 64-bit x86 extensions, a corresponding 64-bit OS should be used instead.
 
 
+System emulator CPUs
+--------------------
+
+Nios II CPU (since 8.2)
+'''''''''''''''''''''''
+
+The Nios II architecture is orphan. The ``nios2`` guest CPU support is
+deprecated and will be removed in a future version of QEMU.
+
+
 System emulator machines
 ------------------------
 
@@ -254,6 +264,11 @@ These old machine types are quite neglected nowadays and thus might have
 various pitfalls with regards to live migration. Use a newer machine type
 instead.
 
+Nios II ``10m50-ghrd`` and ``nios2-generic-nommu`` machines (since 8.2)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+The Nios II architecture is orphan.
+
 
 Backend options
 ---------------
diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
index 952a0dc33e..6cb32f777b 100644
--- a/hw/nios2/10m50_devboard.c
+++ b/hw/nios2/10m50_devboard.c
@@ -160,6 +160,7 @@ static void nios2_10m50_ghrd_class_init(ObjectClass *oc, void *data)
     mc->desc = "Altera 10M50 GHRD Nios II design";
     mc->init = nios2_10m50_ghrd_init;
     mc->is_default = true;
+    mc->deprecation_reason = "Nios II architecture is deprecated";
 
     object_class_property_add_bool(oc, "vic", get_vic, set_vic);
     object_class_property_set_description(oc, "vic",
diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
index 48edb3ae37..defa16953f 100644
--- a/hw/nios2/generic_nommu.c
+++ b/hw/nios2/generic_nommu.c
@@ -95,6 +95,7 @@ static void nios2_generic_nommu_machine_init(struct MachineClass *mc)
 {
     mc->desc = "Generic NOMMU Nios II design";
     mc->init = nios2_generic_nommu_init;
+    mc->deprecation_reason = "Nios II architecture is deprecated";
 }
 
 DEFINE_MACHINE("nios2-generic-nommu", nios2_generic_nommu_machine_init);
-- 
2.41.0

Re: [PATCH-for-8.2] target/nios2: Deprecate the Nios II architecture

[Thomas Huth]

On 17/11/2023 08.02, Philippe Mathieu-Daudé wrote:
> See commit 9ba1caf510 ("MAINTAINERS: Mark the Nios II CPU as orphan"),
> last contribution from Chris was in 2012 [1] and Marek in 2018 [2].
> 
> [1] https://lore.kernel.org/qemu-devel/1352607539-10455-2-git-send-email-crwulff@gmail.com/
> [2] https://lore.kernel.org/qemu-devel/805fc7b5-03f0-56d4-abfd-ed010d4fa769@denx.de/
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   docs/about/deprecated.rst | 15 +++++++++++++++
>   hw/nios2/10m50_devboard.c |  1 +
>   hw/nios2/generic_nommu.c  |  1 +
>   3 files changed, 17 insertions(+)

Being orphan for so long in QEMU, I guess it makes sense to mark it as 
deprecated here now. We can still reconsider if a new maintainer shows up...

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH-for-8.2] target/nios2: Deprecate the Nios II architecture

[Sandra Loosemore]

On 11/17/23 01:46, Thomas Huth wrote:
> 
> Being orphan for so long in QEMU, I guess it makes sense to mark it as 
> deprecated here now. We can still reconsider if a new maintainer shows up...
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 

I agree, but I'd be surprised if anybody steps forward, since Intel has pretty 
much dropped all support for the nios2 architecture now (their current FPGA 
products based on risc-v).  At this point it looks very much like the upcoming 
GCC 14 release will be the last that includes support for this target.

-Sandra

Re: [PATCH-for-8.2] target/nios2: Deprecate the Nios II architecture

[Richard Henderson]

On 11/16/23 23:02, Philippe Mathieu-Daudé wrote:
> See commit 9ba1caf510 ("MAINTAINERS: Mark the Nios II CPU as orphan"),
> last contribution from Chris was in 2012 [1] and Marek in 2018 [2].
> 
> [1] https://lore.kernel.org/qemu-devel/1352607539-10455-2-git-send-email-crwulff@gmail.com/
> [2] https://lore.kernel.org/qemu-devel/805fc7b5-03f0-56d4-abfd-ed010d4fa769@denx.de/
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   docs/about/deprecated.rst | 15 +++++++++++++++
>   hw/nios2/10m50_devboard.c |  1 +
>   hw/nios2/generic_nommu.c  |  1 +
>   3 files changed, 17 insertions(+)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

Re: [PATCH-for-8.2] target/nios2: Deprecate the Nios II architecture

[Marek Vasut]

On 11/17/23 08:02, Philippe Mathieu-Daudé wrote:
> See commit 9ba1caf510 ("MAINTAINERS: Mark the Nios II CPU as orphan"),
> last contribution from Chris was in 2012 [1] and Marek in 2018 [2].
> 
> [1] https://lore.kernel.org/qemu-devel/1352607539-10455-2-git-send-email-crwulff@gmail.com/
> [2] https://lore.kernel.org/qemu-devel/805fc7b5-03f0-56d4-abfd-ed010d4fa769@denx.de/
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Yes please, go for it, from my side:

Acked-by: Marek Vasut <marex@denx.de>

Re: [PATCH-for-8.2] target/nios2: Deprecate the Nios II architecture

[Alex Bennée]

Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> See commit 9ba1caf510 ("MAINTAINERS: Mark the Nios II CPU as orphan"),
> last contribution from Chris was in 2012 [1] and Marek in 2018 [2].
>
> [1] https://lore.kernel.org/qemu-devel/1352607539-10455-2-git-send-email-crwulff@gmail.com/
> [2] https://lore.kernel.org/qemu-devel/805fc7b5-03f0-56d4-abfd-ed010d4fa769@denx.de/
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Queued to for-8.2/random-fixes, thanks.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro