[PATCH v3 0/3] i.MX 8M Plus EVK Fixes

[PATCH v3 0/3] i.MX 8M Plus EVK Fixes

[Bernhard Beschow]

As discussed in [1], this series modifies the SoC class be derived from
TYPE_SYS_BUS_DEVICE to fix the reset mechanism and to prevent it from being
user-creatable. It also removes an unused define.

v3:
* Fix reference counting in separate commit (Peter)

v2:
* Do not set user_creatable = false; (Zoltan, Peter)

[1] https://lore.kernel.org/qemu-devel/1cdb6643-8fcc-4bd8-93fc-fcc93589c9a3@redhat.com/

Bernhard Beschow (3):
  hw/arm/imx8mp-evk: Fix reference count of SoC object
  hw/arm/fsl-imx8mp: Derive struct FslImx8mpState from
    TYPE_SYS_BUS_DEVICE
  hw/arm/fsl-imx8mp: Remove unused define

 include/hw/arm/fsl-imx8mp.h | 4 ++--
 hw/arm/fsl-imx8mp.c         | 2 +-
 hw/arm/imx8mp-evk.c         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.49.0

[PATCH v3 1/3] hw/arm/imx8mp-evk: Fix reference count of SoC object

[Bernhard Beschow]

TYPE_FSL_IMX8MP is created using object_new(), so must be realized with
qdev_realize_and_unref() to keep the reference counting intact.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/arm/imx8mp-evk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c
index e1a7892fd7..e1a21e52f9 100644
--- a/hw/arm/imx8mp-evk.c
+++ b/hw/arm/imx8mp-evk.c
@@ -37,7 +37,7 @@ static void imx8mp_evk_init(MachineState *machine)
     s = FSL_IMX8MP(object_new(TYPE_FSL_IMX8MP));
     object_property_add_child(OBJECT(machine), "soc", OBJECT(s));
     object_property_set_uint(OBJECT(s), "fec1-phy-num", 1, &error_fatal);
-    qdev_realize(DEVICE(s), NULL, &error_fatal);
+    qdev_realize_and_unref(DEVICE(s), NULL, &error_fatal);
 
     memory_region_add_subregion(get_system_memory(), FSL_IMX8MP_RAM_START,
                                 machine->ram);
-- 
2.49.0

[PATCH v3 2/3] hw/arm/fsl-imx8mp: Derive struct FslImx8mpState from TYPE_SYS_BUS_DEVICE

[Bernhard Beschow]

Deriving from TYPE_SYS_BUS_DEVICE fixes the SoC object to be reset upon machine
reset. It also makes the SoC implementation not user-creatable which can trigger
the following crash:

  $ ./qemu-system-aarch64  -M virt -device fsl-imx8mp
  **
  ERROR:../../devel/qemu/tcg/tcg.c:1006:tcg_register_thread: assertion failed:
  (n < tcg_max_ctxs)
  Bail out! ERROR:../../devel/qemu/tcg/tcg.c:1006:tcg_register_thread:
  assertion failed: (n < tcg_max_ctxs)
  Aborted (core dumped)

Fixes: a4eefc69b237 "hw/arm: Add i.MX 8M Plus EVK board"
Reported-by: Thomas Huth <thuth@redhat.com>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 include/hw/arm/fsl-imx8mp.h | 3 ++-
 hw/arm/fsl-imx8mp.c         | 2 +-
 hw/arm/imx8mp-evk.c         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h
index bc97fc416e..22fdc0d67c 100644
--- a/include/hw/arm/fsl-imx8mp.h
+++ b/include/hw/arm/fsl-imx8mp.h
@@ -26,6 +26,7 @@
 #include "hw/timer/imx_gpt.h"
 #include "hw/usb/hcd-dwc3.h"
 #include "hw/watchdog/wdt_imx2.h"
+#include "hw/sysbus.h"
 #include "qom/object.h"
 #include "qemu/units.h"
 
@@ -49,7 +50,7 @@ enum FslImx8mpConfiguration {
 };
 
 struct FslImx8mpState {
-    DeviceState    parent_obj;
+    SysBusDevice   parent_obj;
 
     ARMCPU             cpu[FSL_IMX8MP_NUM_CPUS];
     GICv3State         gic;
diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c
index c3f6da6322..82edf61082 100644
--- a/hw/arm/fsl-imx8mp.c
+++ b/hw/arm/fsl-imx8mp.c
@@ -702,7 +702,7 @@ static void fsl_imx8mp_class_init(ObjectClass *oc, void *data)
 static const TypeInfo fsl_imx8mp_types[] = {
     {
         .name = TYPE_FSL_IMX8MP,
-        .parent = TYPE_DEVICE,
+        .parent = TYPE_SYS_BUS_DEVICE,
         .instance_size = sizeof(FslImx8mpState),
         .instance_init = fsl_imx8mp_init,
         .class_init = fsl_imx8mp_class_init,
diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c
index e1a21e52f9..f17d5db466 100644
--- a/hw/arm/imx8mp-evk.c
+++ b/hw/arm/imx8mp-evk.c
@@ -37,7 +37,7 @@ static void imx8mp_evk_init(MachineState *machine)
     s = FSL_IMX8MP(object_new(TYPE_FSL_IMX8MP));
     object_property_add_child(OBJECT(machine), "soc", OBJECT(s));
     object_property_set_uint(OBJECT(s), "fec1-phy-num", 1, &error_fatal);
-    qdev_realize_and_unref(DEVICE(s), NULL, &error_fatal);
+    sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal);
 
     memory_region_add_subregion(get_system_memory(), FSL_IMX8MP_RAM_START,
                                 machine->ram);
-- 
2.49.0

[PATCH v3 3/3] hw/arm/fsl-imx8mp: Remove unused define

[Bernhard Beschow]

The SoC has three SPI controllers, not four. Remove the extra define of an SPI
IRQ.

Fixes: 06908a84f036 "hw/arm/fsl-imx8mp: Add SPI controllers"
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 include/hw/arm/fsl-imx8mp.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h
index 22fdc0d67c..d016f7d337 100644
--- a/include/hw/arm/fsl-imx8mp.h
+++ b/include/hw/arm/fsl-imx8mp.h
@@ -238,7 +238,6 @@ enum FslImx8mpIrqs {
     FSL_IMX8MP_ECSPI1_IRQ   = 31,
     FSL_IMX8MP_ECSPI2_IRQ   = 32,
     FSL_IMX8MP_ECSPI3_IRQ   = 33,
-    FSL_IMX8MP_ECSPI4_IRQ   = 34,
 
     FSL_IMX8MP_I2C1_IRQ     = 35,
     FSL_IMX8MP_I2C2_IRQ     = 36,
-- 
2.49.0

Re: [PATCH v3 1/3] hw/arm/imx8mp-evk: Fix reference count of SoC object

[Bernhard Beschow]

Am 18. März 2025 20:57:07 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>TYPE_FSL_IMX8MP is created using object_new(), so must be realized with
>qdev_realize_and_unref() to keep the reference counting intact.
>

Fixes: a4eefc69b237 "hw/arm: Add i.MX 8M Plus EVK board"

>Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>---
> hw/arm/imx8mp-evk.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c
>index e1a7892fd7..e1a21e52f9 100644
>--- a/hw/arm/imx8mp-evk.c
>+++ b/hw/arm/imx8mp-evk.c
>@@ -37,7 +37,7 @@ static void imx8mp_evk_init(MachineState *machine)
>     s = FSL_IMX8MP(object_new(TYPE_FSL_IMX8MP));
>     object_property_add_child(OBJECT(machine), "soc", OBJECT(s));
>     object_property_set_uint(OBJECT(s), "fec1-phy-num", 1, &error_fatal);
>-    qdev_realize(DEVICE(s), NULL, &error_fatal);
>+    qdev_realize_and_unref(DEVICE(s), NULL, &error_fatal);
> 
>     memory_region_add_subregion(get_system_memory(), FSL_IMX8MP_RAM_START,
>                                 machine->ram);

Re: [PATCH v3 1/3] hw/arm/imx8mp-evk: Fix reference count of SoC object

[Peter Maydell]

On Tue, 18 Mar 2025 at 20:57, Bernhard Beschow <shentey@gmail.com> wrote:
>
> TYPE_FSL_IMX8MP is created using object_new(), so must be realized with
> qdev_realize_and_unref() to keep the reference counting intact.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH v3 1/3] hw/arm/imx8mp-evk: Fix reference count of SoC object

[Bernhard Beschow]

Am 19. März 2025 18:06:14 UTC schrieb Peter Maydell <peter.maydell@linaro.org>:
>On Tue, 18 Mar 2025 at 20:57, Bernhard Beschow <shentey@gmail.com> wrote:
>>
>> TYPE_FSL_IMX8MP is created using object_new(), so must be realized with
>> qdev_realize_and_unref() to keep the reference counting intact.
>>
>> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>> ---
>
>Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Ping for the series

>
>thanks
>-- PMM

Re: [PATCH v3 0/3] i.MX 8M Plus EVK Fixes

[Philippe Mathieu-Daudé]

> Bernhard Beschow (3):
>    hw/arm/imx8mp-evk: Fix reference count of SoC object
>    hw/arm/fsl-imx8mp: Derive struct FslImx8mpState from
>      TYPE_SYS_BUS_DEVICE
>    hw/arm/fsl-imx8mp: Remove unused define

Series queued to hw-misc, thanks!

Re: [PATCH v3 0/3] i.MX 8M Plus EVK Fixes

[Bernhard Beschow]

Am 27. März 2025 16:19:32 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>
>> Bernhard Beschow (3):
>>    hw/arm/imx8mp-evk: Fix reference count of SoC object
>>    hw/arm/fsl-imx8mp: Derive struct FslImx8mpState from
>>      TYPE_SYS_BUS_DEVICE
>>    hw/arm/fsl-imx8mp: Remove unused define
>
>Series queued to hw-misc, thanks!

Thanks, Phil!