Re: [PATCH 01/19] hw/misc/aspeed_i3c: Move to i3c directory

["Cédric Le Goater" <clg@kaod.org>]

On 6/13/25 02:03, Joe Komlodi wrote:
> Moves the Aspeed I3C model and traces into hw/i3c and creates I3C build
> files.
> 
> Signed-off-by: Joe Komlodi <komlodi@google.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

> Reviewed-by: Patrick Venture <venture@google.com>
> Reviewed-by: Titus Rwantare <titusr@google.com>

Internal reviews are not of much value. It's better to send without
these tags and restart the assessment on the public mailing lists.


Thanks,

C.




> ---
>   hw/Kconfig                            | 1 +
>   hw/arm/Kconfig                        | 1 +
>   hw/i3c/Kconfig                        | 2 ++
>   hw/{misc => i3c}/aspeed_i3c.c         | 2 +-
>   hw/i3c/meson.build                    | 3 +++
>   hw/i3c/trace-events                   | 7 +++++++
>   hw/i3c/trace.h                        | 2 ++
>   hw/meson.build                        | 1 +
>   hw/misc/meson.build                   | 1 -
>   hw/misc/trace-events                  | 6 ------
>   include/hw/arm/aspeed_soc.h           | 2 +-
>   include/hw/{misc => i3c}/aspeed_i3c.h | 0
>   meson.build                           | 1 +
>   13 files changed, 20 insertions(+), 9 deletions(-)
>   create mode 100644 hw/i3c/Kconfig
>   rename hw/{misc => i3c}/aspeed_i3c.c (99%)
>   create mode 100644 hw/i3c/meson.build
>   create mode 100644 hw/i3c/trace-events
>   create mode 100644 hw/i3c/trace.h
>   rename include/hw/{misc => i3c}/aspeed_i3c.h (100%)
> 
> diff --git a/hw/Kconfig b/hw/Kconfig
> index 9a86a6a28a..61b8b2a142 100644
> --- a/hw/Kconfig
> +++ b/hw/Kconfig
> @@ -13,6 +13,7 @@ source fsi/Kconfig
>   source gpio/Kconfig
>   source hyperv/Kconfig
>   source i2c/Kconfig
> +source i3c/Kconfig
>   source ide/Kconfig
>   source input/Kconfig
>   source intc/Kconfig
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index f543d944c3..427d0f0271 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -530,6 +530,7 @@ config ASPEED_SOC
>       select DS1338
>       select FTGMAC100
>       select I2C
> +    select I3C
>       select DPS310
>       select PCA9552
>       select SERIAL_MM
> diff --git a/hw/i3c/Kconfig b/hw/i3c/Kconfig
> new file mode 100644
> index 0000000000..e07fe445c6
> --- /dev/null
> +++ b/hw/i3c/Kconfig
> @@ -0,0 +1,2 @@
> +config I3C
> +    bool
> diff --git a/hw/misc/aspeed_i3c.c b/hw/i3c/aspeed_i3c.c
> similarity index 99%
> rename from hw/misc/aspeed_i3c.c
> rename to hw/i3c/aspeed_i3c.c
> index 3bef1c84dd..e56822f928 100644
> --- a/hw/misc/aspeed_i3c.c
> +++ b/hw/i3c/aspeed_i3c.c
> @@ -10,7 +10,7 @@
>   #include "qemu/osdep.h"
>   #include "qemu/log.h"
>   #include "qemu/error-report.h"
> -#include "hw/misc/aspeed_i3c.h"
> +#include "hw/i3c/aspeed_i3c.h"
>   #include "hw/registerfields.h"
>   #include "hw/qdev-properties.h"
>   #include "qapi/error.h"
> diff --git a/hw/i3c/meson.build b/hw/i3c/meson.build
> new file mode 100644
> index 0000000000..ebf20325cb
> --- /dev/null
> +++ b/hw/i3c/meson.build
> @@ -0,0 +1,3 @@
> +i3c_ss = ss.source_set()
> +i3c_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_i3c.c'))
> +system_ss.add_all(when: 'CONFIG_I3C', if_true: i3c_ss)
> diff --git a/hw/i3c/trace-events b/hw/i3c/trace-events
> new file mode 100644
> index 0000000000..3ead84eb45
> --- /dev/null
> +++ b/hw/i3c/trace-events
> @@ -0,0 +1,7 @@
> +# See docs/devel/tracing.rst for syntax documentation.
> +
> +# aspeed_i3c.c
> +aspeed_i3c_read(uint64_t offset, uint64_t data) "I3C read: offset 0x%" PRIx64 " data 0x%" PRIx64
> +aspeed_i3c_write(uint64_t offset, uint64_t data) "I3C write: offset 0x%" PRIx64 " data 0x%" PRIx64
> +aspeed_i3c_device_read(uint32_t deviceid, uint64_t offset, uint64_t data) "I3C Dev[%u] read: offset 0x%" PRIx64 " data 0x%" PRIx64
> +aspeed_i3c_device_write(uint32_t deviceid, uint64_t offset, uint64_t data) "I3C Dev[%u] write: offset 0x%" PRIx64 " data 0x%" PRIx64
> diff --git a/hw/i3c/trace.h b/hw/i3c/trace.h
> new file mode 100644
> index 0000000000..1e0c4eadf0
> --- /dev/null
> +++ b/hw/i3c/trace.h
> @@ -0,0 +1,2 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +#include "trace/trace-hw_i3c.h"
> diff --git a/hw/meson.build b/hw/meson.build
> index b91f761fe0..31786f03d0 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -12,6 +12,7 @@ subdir('dma')
>   subdir('gpio')
>   subdir('hyperv')
>   subdir('i2c')
> +subdir('i3c')
>   subdir('ide')
>   subdir('input')
>   subdir('intc')
> diff --git a/hw/misc/meson.build b/hw/misc/meson.build
> index 6d47de482c..4a41716625 100644
> --- a/hw/misc/meson.build
> +++ b/hw/misc/meson.build
> @@ -130,7 +130,6 @@ system_ss.add(when: 'CONFIG_PVPANIC_MMIO', if_true: files('pvpanic-mmio.c'))
>   system_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c'))
>   system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
>     'aspeed_hace.c',
> -  'aspeed_i3c.c',
>     'aspeed_lpc.c',
>     'aspeed_scu.c',
>     'aspeed_sbc.c',
> diff --git a/hw/misc/trace-events b/hw/misc/trace-events
> index e3f64c0ff6..f70459b3b7 100644
> --- a/hw/misc/trace-events
> +++ b/hw/misc/trace-events
> @@ -287,12 +287,6 @@ armsse_mhu_write(uint64_t offset, uint64_t data, unsigned size) "SSE-200 MHU wri
>   # aspeed_xdma.c
>   aspeed_xdma_write(uint64_t offset, uint64_t data) "XDMA write: offset 0x%" PRIx64 " data 0x%" PRIx64
>   
> -# aspeed_i3c.c
> -aspeed_i3c_read(uint64_t offset, uint64_t data) "I3C read: offset 0x%" PRIx64 " data 0x%" PRIx64
> -aspeed_i3c_write(uint64_t offset, uint64_t data) "I3C write: offset 0x%" PRIx64 " data 0x%" PRIx64
> -aspeed_i3c_device_read(uint32_t deviceid, uint64_t offset, uint64_t data) "I3C Dev[%u] read: offset 0x%" PRIx64 " data 0x%" PRIx64
> -aspeed_i3c_device_write(uint32_t deviceid, uint64_t offset, uint64_t data) "I3C Dev[%u] write: offset 0x%" PRIx64 " data 0x%" PRIx64
> -
>   # aspeed_sdmc.c
>   aspeed_sdmc_write(uint64_t reg, uint64_t data) "reg @0x%" PRIx64 " data: 0x%" PRIx64
>   aspeed_sdmc_read(uint64_t reg, uint64_t data) "reg @0x%" PRIx64 " data: 0x%" PRIx64
> diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
> index 217ef0eafd..07265f26cf 100644
> --- a/include/hw/arm/aspeed_soc.h
> +++ b/include/hw/arm/aspeed_soc.h
> @@ -23,7 +23,7 @@
>   #include "hw/timer/aspeed_timer.h"
>   #include "hw/rtc/aspeed_rtc.h"
>   #include "hw/i2c/aspeed_i2c.h"
> -#include "hw/misc/aspeed_i3c.h"
> +#include "hw/i3c/aspeed_i3c.h"
>   #include "hw/ssi/aspeed_smc.h"
>   #include "hw/misc/aspeed_hace.h"
>   #include "hw/misc/aspeed_sbc.h"
> diff --git a/include/hw/misc/aspeed_i3c.h b/include/hw/i3c/aspeed_i3c.h
> similarity index 100%
> rename from include/hw/misc/aspeed_i3c.h
> rename to include/hw/i3c/aspeed_i3c.h
> diff --git a/meson.build b/meson.build
> index 34729c2a3d..186effb84f 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -3651,6 +3651,7 @@ if have_system
>       'hw/fsi',
>       'hw/hyperv',
>       'hw/i2c',
> +    'hw/i3c',
>       'hw/i386',
>       'hw/i386/xen',
>       'hw/i386/kvm',