@samitouri / QOSamiQemu / commits / 4ef278c904

hw/misc/aspeed_i3c: Move to i3c directory

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: Patrick Venture <venture@google.com> Reviewed-by: Titus Rwantare <titusr@google.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Reviewed-by: Jamin Lin <jamin_lin@aspeedtech.com> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Tested-by: Jithu Joseph <jithu.joseph@oss.qualcomm.com> Link: https://lore.kernel.org/qemu-devel/20260225021158.1586584-2-jamin_lin@aspeedtech.com Signed-off-by: Cédric Le Goater <clg@redhat.com>

Jamin Lin committed Feb 25, 2026 at 02:12 UTC 4ef278c904e8a0a81b9fd73b805edbb51ff07760
13 files changed +20 -9
hw/Kconfig
+1
@@ -13,6 +13,7 @@ source fsi/Kconfig
13 source gpio/Kconfig
14 source hyperv/Kconfig
15 source i2c/Kconfig
16 +source i3c/Kconfig
17 source ide/Kconfig
18 source input/Kconfig
19 source intc/Kconfig
hw/arm/Kconfig
+1
@@ -545,6 +545,7 @@ config ASPEED_SOC
545 select DS1338
546 select FTGMAC100
547 select I2C
548 + select I3C
549 select DPS310
550 select PCA9552
551 select PCA9554
hw/i3c/Kconfig new
+2
@@ -0,0 +1,2 @@
1 +config I3C
2 + bool
hw/i3c/aspeed_i3c.c renamed
+1 -1
@@ -10,7 +10,7 @@
10 #include "qemu/osdep.h"
11 #include "qemu/log.h"
12 #include "qemu/error-report.h"
13 -#include "hw/misc/aspeed_i3c.h"
13 +#include "hw/i3c/aspeed_i3c.h"
14 #include "hw/core/registerfields.h"
15 #include "hw/core/qdev-properties.h"
16 #include "qapi/error.h"
hw/i3c/meson.build new
+3
@@ -0,0 +1,3 @@
1 +i3c_ss = ss.source_set()
2 +i3c_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_i3c.c'))
3 +system_ss.add_all(when: 'CONFIG_I3C', if_true: i3c_ss)
hw/i3c/trace-events new
+7
@@ -0,0 +1,7 @@
1 +# See docs/devel/tracing.rst for syntax documentation.
2 +
3 +# aspeed_i3c.c
4 +aspeed_i3c_read(uint64_t offset, uint64_t data) "I3C read: offset 0x%" PRIx64 " data 0x%" PRIx64
5 +aspeed_i3c_write(uint64_t offset, uint64_t data) "I3C write: offset 0x%" PRIx64 " data 0x%" PRIx64
6 +aspeed_i3c_device_read(uint32_t deviceid, uint64_t offset, uint64_t data) "I3C Dev[%u] read: offset 0x%" PRIx64 " data 0x%" PRIx64
7 +aspeed_i3c_device_write(uint32_t deviceid, uint64_t offset, uint64_t data) "I3C Dev[%u] write: offset 0x%" PRIx64 " data 0x%" PRIx64
hw/i3c/trace.h new
+2
@@ -0,0 +1,2 @@
1 +/* SPDX-License-Identifier: GPL-2.0-or-later */
2 +#include "trace/trace-hw_i3c.h"
hw/meson.build
+1
@@ -35,6 +35,7 @@ subdir('dma')
35 subdir('gpio')
36 subdir('hyperv')
37 subdir('i2c')
38 +subdir('i3c')
39 subdir('ide')
40 subdir('input')
41 subdir('intc')
hw/misc/meson.build
-1
@@ -135,7 +135,6 @@ system_ss.add(when: 'CONFIG_PVPANIC_MMIO', if_true: files('pvpanic-mmio.c'))
135 system_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c'))
136 system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
137 'aspeed_hace.c',
138 - 'aspeed_i3c.c',
138 'aspeed_lpc.c',
139 'aspeed_ltpi.c',
140 'aspeed_pwm.c',
hw/misc/trace-events
-6
@@ -293,12 +293,6 @@ armsse_mhu_write(uint64_t offset, uint64_t data, unsigned size) "SSE-200 MHU wri
293 # aspeed_xdma.c
294 aspeed_xdma_write(uint64_t offset, uint64_t data) "XDMA write: offset 0x%" PRIx64 " data 0x%" PRIx64
295
296 -# aspeed_i3c.c
297 -aspeed_i3c_read(uint64_t offset, uint64_t data) "I3C read: offset 0x%" PRIx64 " data 0x%" PRIx64
298 -aspeed_i3c_write(uint64_t offset, uint64_t data) "I3C write: offset 0x%" PRIx64 " data 0x%" PRIx64
299 -aspeed_i3c_device_read(uint32_t deviceid, uint64_t offset, uint64_t data) "I3C Dev[%u] read: offset 0x%" PRIx64 " data 0x%" PRIx64
300 -aspeed_i3c_device_write(uint32_t deviceid, uint64_t offset, uint64_t data) "I3C Dev[%u] write: offset 0x%" PRIx64 " data 0x%" PRIx64
301 -
296 # aspeed_pwm.c
297 aspeed_pwm_read(uint64_t offset, uint64_t data) "read: offset 0x%" PRIx64 " data 0x%" PRIx64
298 aspeed_pwm_write(uint64_t offset, uint64_t data) "write: offset 0x%" PRIx64 " data 0x%" PRIx64
include/hw/arm/aspeed_soc.h
+1 -1
@@ -23,7 +23,7 @@
23 #include "hw/timer/aspeed_timer.h"
24 #include "hw/rtc/aspeed_rtc.h"
25 #include "hw/i2c/aspeed_i2c.h"
26 -#include "hw/misc/aspeed_i3c.h"
26 +#include "hw/i3c/aspeed_i3c.h"
27 #include "hw/ssi/aspeed_smc.h"
28 #include "hw/misc/aspeed_hace.h"
29 #include "hw/misc/aspeed_sbc.h"
include/hw/i3c/aspeed_i3c.h renamed
meson.build
+1
@@ -3614,6 +3614,7 @@ if have_system
3614 'hw/fsi',
3615 'hw/hyperv',
3616 'hw/i2c',
3617 + 'hw/i3c',
3618 'hw/i386',
3619 'hw/i386/xen',
3620 'hw/i386/kvm',