hw/arm/aspeed: AST1700 LTPI support and device hookups
Subsystems (2)
v3 cover hw/arm/aspeed: AST1700 LTPI support and device hookups
From: Kane-Chen-AS <[email protected]>
Hi all,
LTPI (LVDS Tunneling Protocol & Interface) is defined in the OCP DC-SCM 2.0 specification (see Figure 2):
https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-pdf
LTPI provides a protocol and physical interface for tunneling various low-speed signals between the Host Processor Module (HPM) and the Satellite Controller Module (SCM). In Figure 2 of the specification, the AST27x0 SoC (left) integrates two LTPI controllers, allowing it to connect to up to two AST1700 boards. On the other side, the AST1700 consolidates HPM FPGA functions and multiple peripheral interfaces (GPIO, UART, I2C, I3C, etc.) onto a single board.
Because the AST1700 exposes additional I/O interfaces (GPIO, I2C, I3C, and others), it acts as an I/O expander. Once connected over LTPI, the AST27x0 can control additional downstream devices through this link.
This patch series is based on the SGPIO changes:
https://lore.kernel.org/qemu-devel/[email protected]/
It introduces a basic LTPI controller model and wires it into the AST27x0 SoC. The series also adds the AST1700-specific LTPI expander device and incrementally connects common peripherals on the AST1700 model. For the I3C block, which may cause kernel crashes, its MMIO region is modeled as an unimplemented device to reserve address space and make the missing functionality explicit, ensuring stable guest probing.
In the official release images, the AST1700 functions are not included by default. To test the AST1700-related functionality, please include the following DTS files for probing:
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/arm64/boot/dts/aspeed/aspeed-ltpi0.dtsi
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/arm64/boot/dts/aspeed/aspeed-ltpi1.dtsi
After including these DTS files in the BMC image, you can verify LTPI functionality using the following scenarios:
1. In U-Boot:
Run the ltpi command to trigger the LTPI connection and display the current connection status.
2. In BMC Linux:
Run i2cdetect -y <16-38> to scan and test the I2C buses exposed by the AST1700.
Any feedback or suggestions are appreciated!
Kane
---
ChangeLog
---------
v3:
- Add PWM model
- Integrate the SGPIO model
- Fix I2C test case failure
- Refine code structure
v2:
- Separate the AST1700 model into a standalone implementation
- Refine the mechanism for assigning the AST1700 board number
v1:
- Initial version
---
Kane-Chen-AS (18):
hw/misc: Add LTPI controller
hw/arm/aspeed: Attach LTPI controller to AST27X0 platform hw/misc: Add basic Aspeed PWM model
hw/arm/aspeed: Add AST1700 LTPI expander device model hw/arm/aspeed: Integrate AST1700 device into AST27X0 hw/arm/aspeed: Integrate interrupt controller for AST1700 hw/arm/aspeed: Attach LTPI controller to AST1700 model hw/arm/aspeed: Attach UART device to AST1700 model hw/arm/aspeed: Attach SRAM device to AST1700 model hw/arm/aspeed: Attach SPI device to AST1700 model hw/arm/aspeed: Attach ADC device to AST1700 model hw/arm/aspeed: Attach SCU device to AST1700 model hw/arm/aspeed: Attach GPIO device to AST1700 model hw/arm/aspeed: attach I2C device to AST1700 model hw/arm/aspeed: Attach WDT device to AST1700 model hw/arm/aspeed: Attach PWM device to AST1700 model hw/arm/aspeed: Attach SGPIOM device to AST1700 model hw/arm/aspeed: Model AST1700 I3C block as unimplemented device
include/hw/arm/aspeed_ast1700.h | 53 +++++++ include/hw/arm/aspeed_soc.h | 25 ++- include/hw/i2c/aspeed_i2c.h | 1 + include/hw/intc/aspeed_intc.h | 2 + include/hw/misc/aspeed_ltpi.h | 32 ++++ include/hw/misc/aspeed_pwm.h | 31 ++++ hw/arm/aspeed_ast1700.c | 269 ++++++++++++++++++++++++++++++++ hw/arm/aspeed_ast27x0.c | 163 +++++++++++++++++-- hw/i2c/aspeed_i2c.c | 19 ++- hw/intc/aspeed_intc.c | 60 +++++++ hw/misc/aspeed_ltpi.c | 194 +++++++++++++++++++++++ hw/misc/aspeed_pwm.c | 121 ++++++++++++++ hw/arm/meson.build | 1 + hw/misc/meson.build | 2 + hw/misc/trace-events | 4 + 15 files changed, 957 insertions(+), 20 deletions(-) create mode 100644 include/hw/arm/aspeed_ast1700.h create mode 100644 include/hw/misc/aspeed_ltpi.h create mode 100644 include/hw/misc/aspeed_pwm.h create mode 100644 hw/arm/aspeed_ast1700.c create mode 100644 hw/misc/aspeed_ltpi.c create mode 100644 hw/misc/aspeed_pwm.c
Signature · 1 line
2.43.0
PATCH v3 1/18 hw/misc: Add LTPI controller
From: Kane-Chen-AS <[email protected]>
LTPI (LVDS Tunneling Protocol & Interface) is defined in the OCP DC-SCM 2.0 specification:
https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-pdf
LTPI is a protocol and physical interface for tunneling various low-speed signals between the HPM and SCM. As shown in Figure 2, the AST27x0 (left) integrates two LTPI controllers, allowing it to connect to up to two extended boards.
This commit introduces a simple device model for the ASPEED LTPI controller in QEMU.
The model includes basic MMIO read/write operations and sets default register values during reset to emulate a link-up state.
Implements register space with read/write callbacks.
--- include/hw/misc/aspeed_ltpi.h | 32 ++++++ hw/misc/aspeed_ltpi.c | 194 ++++++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + 3 files changed, 227 insertions(+) create mode 100644 include/hw/misc/aspeed_ltpi.h create mode 100644 hw/misc/aspeed_ltpi.c
include/hw/misc/aspeed_ltpi.h new file +32 -0
@@ -0,0 +1,32 @@ +/* +* ASPEED LTPI Controller +* +* Copyright (C) 2025 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef ASPEED_LTPI_H +#define ASPEED_LTPI_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_LTPI "aspeed.ltpi-ctrl" +OBJECT_DECLARE_SIMPLE_TYPE(AspeedLTPIState, ASPEED_LTPI) + +#define ASPEED_LTPI_CTRL_SIZE 0x200 +#define ASPEED_LTPI_PHY_SIZE 0x100 +#define ASPEED_LTPI_TOP_SIZE 0x100 + +struct AspeedLTPIState { +SysBusDevice parent; +MemoryRegion mmio; +MemoryRegion mmio_ctrl; +MemoryRegion mmio_phy; +MemoryRegion mmio_top; + +uint32_t ctrl_regs[ASPEED_LTPI_CTRL_SIZE >>2 ]; +uint32_t phy_regs[ASPEED_LTPI_PHY_SIZE >>2 ]; +uint32_t top_regs[ASPEED_LTPI_TOP_SIZE >>2 ]; +}; + +#endif /* ASPEED_LTPI_H */
hw/misc/aspeed_ltpi.c new file +194 -0
194 lines not on this page · raw message
hw/misc/meson.build +1 -0
@@ -136,6 +136,7 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_hace.c', 'aspeed_i3c.c', 'aspeed_lpc.c', + 'aspeed_ltpi.c', 'aspeed_scu.c', 'aspeed_sbc.c', 'aspeed_sdmc.c',
Signature · 1 line
2.43.0
Re: [PATCH v3 01/18] hw/misc: Add LTPI controller
Quoted 43 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
LTPI (LVDS Tunneling Protocol & Interface) is defined in the OCP DC-SCM 2.0 specification:
https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-pdfLTPI is a protocol and physical interface for tunneling various low-speed signals between the HPM and SCM. As shown in Figure 2, the AST27x0 (left) integrates two LTPI controllers, allowing it to connect to up to two extended boards.
This commit introduces a simple device model for the ASPEED LTPI controller in QEMU.
The model includes basic MMIO read/write operations and sets default register values during reset to emulate a link-up state.
Implements register space with read/write callbacks.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/misc/aspeed_ltpi.h | 32 ++++++ hw/misc/aspeed_ltpi.c | 194 ++++++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + 3 files changed, 227 insertions(+) create mode 100644 include/hw/misc/aspeed_ltpi.h create mode 100644 hw/misc/aspeed_ltpi.cinclude/hw/misc/aspeed_ltpi.h new file +8
-0@@ -0,0 +1,32 @@ +/* +* ASPEED LTPI Controller +* +* Copyright (C) 2025 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef ASPEED_LTPI_H
include/hw/misc/aspeed_ltpi.h line 18
Quoted 10 lines
include/hw/misc/aspeed_ltpi.h new file +10
-0+#define ASPEED_LTPI_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_LTPI "aspeed.ltpi-ctrl" +OBJECT_DECLARE_SIMPLE_TYPE(AspeedLTPIState, ASPEED_LTPI) + +#define ASPEED_LTPI_CTRL_SIZE 0x200 +#define ASPEED_LTPI_PHY_SIZE 0x100 +#define ASPEED_LTPI_TOP_SIZE 0x100
Is there any specific reason to has ASPEED_LTPI_TOTAL_SIZE declared in the header, but the rest of the sizes in the main file? More of a nit, but we should group them all together (probably in the header)
Quoted 230 lines
include/hw/misc/aspeed_ltpi.h new file +14
-0+ +struct AspeedLTPIState { +SysBusDevice parent; +MemoryRegion mmio; +MemoryRegion mmio_ctrl; +MemoryRegion mmio_phy; +MemoryRegion mmio_top; + +uint32_t ctrl_regs[ASPEED_LTPI_CTRL_SIZE >>2 ]; +uint32_t phy_regs[ASPEED_LTPI_PHY_SIZE >>2 ]; +uint32_t top_regs[ASPEED_LTPI_TOP_SIZE >>2 ]; +}; + +#endif /* ASPEED_LTPI_H */ hw/misc/aspeed_ltpi.c new file +194
-0@@ -0,0 +1,194 @@ +/* +* ASPEED LTPI Controller +* +* Copyright (C) 2025 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "migration/vmstate.h" +#include "hw/misc/aspeed_ltpi.h" + +#define ASPEED_LTPI_TOTAL_SIZE 0x900 +#define ASPEED_LTPI_CTRL_BASE 0x000 +#define ASPEED_LTPI_PHY_BASE 0x200 +#define ASPEED_LTPI_TOP_BASE 0x800 + +#define LTPI_CTRL_LINK_MNG 0x42 +#define LTPI_PHY_MODE 0x0 + +static uint64_t aspeed_ltpi_top_read (void *opaque,hwaddr offset,unsigned size) +{ +AspeedLTPIState *s = opaque; +uint32_t idx = offset >>2 ; + +return s->top_regs[idx]; +} + +static void aspeed_ltpi_top_write (void *opaque,hwaddr offset, +uint64_t val,unsigned size) +{ +AspeedLTPIState *s = opaque; +uint32_t idx = offset >>2 ; + +switch (offset) { +default : + s->top_regs[idx] = (uint32_t )val; +break ; + } +} + +static const MemoryRegionOps aspeed_ltpi_top_ops = { + .read = aspeed_ltpi_top_read, + .write = aspeed_ltpi_top_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static uint64_t aspeed_ltpi_phy_read (void *opaque,hwaddr offset,unsigned size) +{ +AspeedLTPIState *s = opaque; +uint32_t idx = offset >>2 ; + +return s->phy_regs[idx]; +} + +static void aspeed_ltpi_phy_write (void *opaque,hwaddr offset, +uint64_t val,unsigned size) +{ +AspeedLTPIState *s = opaque; +uint32_t idx = offset >>2 ; + +switch (offset) { +default : + s->phy_regs[idx] = (uint32_t )val; +break ; + } +} + +static const MemoryRegionOps aspeed_ltpi_phy_ops = { + .read = aspeed_ltpi_phy_read, + .write = aspeed_ltpi_phy_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static uint64_t aspeed_ltpi_ctrl_read (void *opaque, +hwaddr offset,unsigned size) +{ +AspeedLTPIState *s = opaque; +uint32_t idx = offset >>2 ; + +return s->ctrl_regs[idx]; +} + +static void aspeed_ltpi_ctrl_write (void *opaque,hwaddr offset, +uint64_t val,unsigned size) +{ +AspeedLTPIState *s = opaque; +uint32_t idx = offset >>2 ; + +switch (offset) { +default : + s->ctrl_regs[idx] = (uint32_t )val; +break ; + } +} + +static const MemoryRegionOps aspeed_ltpi_ctrl_ops = { + .read = aspeed_ltpi_ctrl_read, + .write = aspeed_ltpi_ctrl_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static void aspeed_ltpi_reset (DeviceState *dev) +{ +AspeedLTPIState *s =ASPEED_LTPI (dev); + +memset (s->ctrl_regs,0 ,sizeof (s->ctrl_regs)); +memset (s->phy_regs,0 ,sizeof (s->phy_regs)); +memset (s->top_regs,0 ,sizeof (s->top_regs)); +/* set default values */ + s->ctrl_regs[LTPI_CTRL_LINK_MNG ] =0x11900007 ; + s->phy_regs[LTPI_PHY_MODE ] =0x2 ; +} + + +static const VMStateDescription vmstate_aspeed_ltpi = { + .name =TYPE_ASPEED_LTPI , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_UINT32_ARRAY (ctrl_regs, AspeedLTPIState, +ASPEED_LTPI_CTRL_SIZE >>2 ), +VMSTATE_UINT32_ARRAY (phy_regs, AspeedLTPIState, +ASPEED_LTPI_PHY_SIZE >>2 ), +VMSTATE_UINT32_ARRAY (top_regs, AspeedLTPIState, +ASPEED_LTPI_TOP_SIZE >>2 ), + +VMSTATE_END_OF_LIST () + } +}; + +static void aspeed_ltpi_realize (DeviceState *dev,Error **errp) +{ +AspeedLTPIState *s =ASPEED_LTPI (dev); + +memory_region_init (&s->mmio,OBJECT (s),TYPE_ASPEED_LTPI , +ASPEED_LTPI_TOTAL_SIZE ); + +memory_region_init_io (&s->mmio_ctrl,OBJECT (s), + &aspeed_ltpi_ctrl_ops, s, +"aspeed-ltpi-ctrl" ,ASPEED_LTPI_CTRL_SIZE ); + +memory_region_init_io (&s->mmio_phy,OBJECT (s), + &aspeed_ltpi_phy_ops, s, +"aspeed-ltpi-phy" ,ASPEED_LTPI_PHY_SIZE ); + +memory_region_init_io (&s->mmio_top,OBJECT (s), + &aspeed_ltpi_top_ops, s, +"aspeed-ltpi-top" ,ASPEED_LTPI_TOP_SIZE ); + +memory_region_add_subregion (&s->mmio, +ASPEED_LTPI_CTRL_BASE , &s->mmio_ctrl); +memory_region_add_subregion (&s->mmio, +ASPEED_LTPI_PHY_BASE , &s->mmio_phy); +memory_region_add_subregion (&s->mmio, +ASPEED_LTPI_TOP_BASE , &s->mmio_top); + +sysbus_init_mmio (SYS_BUS_DEVICE (s), &s->mmio); +} + +static void aspeed_ltpi_class_init (ObjectClass *klass,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + dc->realize = aspeed_ltpi_realize; + dc->vmsd = &vmstate_aspeed_ltpi; +device_class_set_legacy_reset (dc, aspeed_ltpi_reset); +} + +static const TypeInfo aspeed_ltpi_info = { + .name =TYPE_ASPEED_LTPI , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (AspeedLTPIState), + .class_init = aspeed_ltpi_class_init, +}; + +static void aspeed_ltpi_register_types (void ) +{ +type_register_static (&aspeed_ltpi_info); +} + +type_init (aspeed_ltpi_register_types);hw/misc/meson.build +1
-1@@ -136,6 +136,7 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_hace.c', 'aspeed_i3c.c', 'aspeed_lpc.c', + 'aspeed_ltpi.c', 'aspeed_scu.c', 'aspeed_sbc.c', 'aspeed_sdmc.c', --2.43.0
PATCH v3 2/18 hw/arm/aspeed: Attach LTPI controller to AST27X0 platform
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the LTPI controller device (representing the AST1700 I/O expander) to the AST27X0 SoC model. This patch sets up the memory mapping and device registration according to the AST2700 SoC design, where the LTPI controller is exposed at fixed MMIO regions.
This change only handles device instantiation and integration, without implementing the controller's internal logic.
--- include/hw/arm/aspeed_soc.h | 5 +++++ hw/arm/aspeed_ast27x0.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+)
include/hw/arm/aspeed_soc.h +5 -0
@@ -43,6 +43,7 @@#include "hw/fsi/aspeed_apb2opb.h" #include "hw/char/serial-mm.h" #include "hw/intc/arm_gicv3.h" +#include "hw/misc/aspeed_ltpi.h" #define VBOOTROM_FILE_NAME "ast27x0_bootrom.bin"
@@ -55,6 +56,7 @@#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2#define ASPEED_PCIE_NUM 3 +#define ASPEED_IOEXP_NUM 2struct AspeedSoCState {DeviceState parent;
@@ -112,6 +114,7 @@ struct AspeedSoCState {UnimplementedDeviceState ltpi;UnimplementedDeviceState jtag[ASPEED_JTAG_NUM ];AspeedAPB2OPBState fsi[2 ]; +AspeedLTPIState ltpi_ctrl[ASPEED_IOEXP_NUM ]; };#define TYPE_ASPEED_SOC "aspeed-soc"
@@ -279,6 +282,8 @@ enum {ASPEED_GIC_REDIST ,ASPEED_DEV_IPC0 ,ASPEED_DEV_IPC1 , +ASPEED_DEV_LTPI_CTRL1 , + ASPEED_DEV_LTPI_CTRL2, };const char *aspeed_soc_cpu_type (const char *const *valid_cpu_types);
hw/arm/aspeed_ast27x0.c +21 -0
@@ -88,6 +88,8 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_UART10] = 0x14C33900, [ASPEED_DEV_UART11] = 0x14C33A00, [ASPEED_DEV_UART12] = 0x14C33B00, + [ASPEED_DEV_LTPI_CTRL1] = 0x14C34000, + [ASPEED_DEV_LTPI_CTRL2] = 0x14C35000, [ASPEED_DEV_WDT] = 0x14C37000, [ASPEED_DEV_LTPI] = 0x30000000, [ASPEED_DEV_PCIE_MMIO0] = 0x60000000,
@@ -556,6 +558,11 @@ static void aspeed_soc_ast2700_init(Object *obj)object_property_set_int (OBJECT (&s->pcie[i]),"id" , i, &error_abort); } +for (i =0 ; i <ASPEED_IOEXP_NUM ; i++) { +object_initialize_child (obj,"ltpi-ctrl[*]" , + &s->ltpi_ctrl[i],TYPE_ASPEED_LTPI ); + } +object_initialize_child (obj,"dpmcu" , &s->dpmcu,TYPE_UNIMPLEMENTED_DEVICE ); object_initialize_child(obj, "ltpi", &s->ltpi,
@@ -1047,6 +1054,20 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)return ; } +/* LTPI controller */ +for (i =0 ; i <ASPEED_IOEXP_NUM ; i++) { +AspeedLTPIState *ltpi_ctrl; +hwaddr ltpi_base; + + ltpi_ctrl =ASPEED_LTPI (&s->ltpi_ctrl[i]); + ltpi_base = sc->memmap[ASPEED_DEV_LTPI_CTRL1 + i]; + +if (!sysbus_realize (SYS_BUS_DEVICE (ltpi_ctrl), errp)) { +return ; + } +aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (ltpi_ctrl),0 , ltpi_base); + } + aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu), "aspeed.dpmcu", sc->memmap[ASPEED_DEV_DPMCU],
Signature · 1 line
2.43.0
Re: [PATCH v3 02/18] hw/arm/aspeed: Attach LTPI controller to AST27X0 platform
Quoted 104 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Connect the LTPI controller device (representing the AST1700 I/O expander) to the AST27X0 SoC model. This patch sets up the memory mapping and device registration according to the AST2700 SoC design, where the LTPI controller is exposed at fixed MMIO regions.
This change only handles device instantiation and integration, without implementing the controller's internal logic.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_soc.h | 5 +++++ hw/arm/aspeed_ast27x0.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+)include/hw/arm/aspeed_soc.h +5
-0@@ -43,6 +43,7 @@#include "hw/fsi/aspeed_apb2opb.h" #include "hw/char/serial-mm.h" #include "hw/intc/arm_gicv3.h" +#include "hw/misc/aspeed_ltpi.h" #define VBOOTROM_FILE_NAME "ast27x0_bootrom.bin"@@ -55,6 +56,7 @@#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2#define ASPEED_PCIE_NUM 3 +#define ASPEED_IOEXP_NUM 2struct AspeedSoCState {DeviceState parent;@@ -112,6 +114,7 @@ struct AspeedSoCState {UnimplementedDeviceState ltpi;UnimplementedDeviceState jtag[ASPEED_JTAG_NUM ];AspeedAPB2OPBState fsi[2 ]; +AspeedLTPIState ltpi_ctrl[ASPEED_IOEXP_NUM ]; };#define TYPE_ASPEED_SOC "aspeed-soc"@@ -279,6 +282,8 @@ enum {ASPEED_GIC_REDIST ,ASPEED_DEV_IPC0 ,ASPEED_DEV_IPC1 , +ASPEED_DEV_LTPI_CTRL1 , + ASPEED_DEV_LTPI_CTRL2, };const char *aspeed_soc_cpu_type (const char *const *valid_cpu_types);hw/arm/aspeed_ast27x0.c +21
-1@@ -88,6 +88,8 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_UART10] = 0x14C33900, [ASPEED_DEV_UART11] = 0x14C33A00, [ASPEED_DEV_UART12] = 0x14C33B00, + [ASPEED_DEV_LTPI_CTRL1] = 0x14C34000, + [ASPEED_DEV_LTPI_CTRL2] = 0x14C35000, [ASPEED_DEV_WDT] = 0x14C37000, [ASPEED_DEV_LTPI] = 0x30000000, [ASPEED_DEV_PCIE_MMIO0] = 0x60000000,@@ -556,6 +558,11 @@ static void aspeed_soc_ast2700_init(Object *obj)object_property_set_int (OBJECT (&s->pcie[i]),"id" , i, &error_abort); } +for (i =0 ; i <ASPEED_IOEXP_NUM ; i++) { +object_initialize_child (obj,"ltpi-ctrl[*]" , + &s->ltpi_ctrl[i],TYPE_ASPEED_LTPI ); + } +object_initialize_child (obj,"dpmcu" , &s->dpmcu,TYPE_UNIMPLEMENTED_DEVICE ); object_initialize_child(obj, "ltpi", &s->ltpi,@@ -1047,6 +1054,20 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)return ; } +/* LTPI controller */ +for (i =0 ; i <ASPEED_IOEXP_NUM ; i++) { +AspeedLTPIState *ltpi_ctrl; +hwaddr ltpi_base; + + ltpi_ctrl =ASPEED_LTPI (&s->ltpi_ctrl[i]); + ltpi_base = sc->memmap[ASPEED_DEV_LTPI_CTRL1 + i]; + +if (!sysbus_realize (SYS_BUS_DEVICE (ltpi_ctrl), errp)) { +return ; + } +aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (ltpi_ctrl),0 , ltpi_base); + } + aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu), "aspeed.dpmcu", sc->memmap[ASPEED_DEV_DPMCU], --2.43.0
Re: [SPAM] [PATCH v3 02/18] hw/arm/aspeed: Attach LTPI controller to AST27X0 platform
In reply to Kane Chen viaQuoted 11 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the LTPI controller device (representing the AST1700 I/O expander) to the AST27X0 SoC model. This patch sets up the memory mapping and device registration according to the AST2700 SoC design, where the LTPI controller is exposed at fixed MMIO regions.
This change only handles device instantiation and integration, without implementing the controller's internal logic.
Signed-off-by Kane-Chen-AS <[email protected]>
Quoted 88 lines
--- include/hw/arm/aspeed_soc.h | 5 +++++ hw/arm/aspeed_ast27x0.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+)include/hw/arm/aspeed_soc.h +5
-0@@ -43,6 +43,7 @@#include "hw/fsi/aspeed_apb2opb.h" #include "hw/char/serial-mm.h" #include "hw/intc/arm_gicv3.h" +#include "hw/misc/aspeed_ltpi.h" #define VBOOTROM_FILE_NAME "ast27x0_bootrom.bin"@@ -55,6 +56,7 @@#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2#define ASPEED_PCIE_NUM 3 +#define ASPEED_IOEXP_NUM 2struct AspeedSoCState {DeviceState parent;@@ -112,6 +114,7 @@ struct AspeedSoCState {UnimplementedDeviceState ltpi;UnimplementedDeviceState jtag[ASPEED_JTAG_NUM ];AspeedAPB2OPBState fsi[2 ]; +AspeedLTPIState ltpi_ctrl[ASPEED_IOEXP_NUM ]; };#define TYPE_ASPEED_SOC "aspeed-soc"@@ -279,6 +282,8 @@ enum {ASPEED_GIC_REDIST ,ASPEED_DEV_IPC0 ,ASPEED_DEV_IPC1 , +ASPEED_DEV_LTPI_CTRL1 , + ASPEED_DEV_LTPI_CTRL2, };const char *aspeed_soc_cpu_type (const char *const *valid_cpu_types);hw/arm/aspeed_ast27x0.c +21
-0@@ -88,6 +88,8 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_UART10] = 0x14C33900, [ASPEED_DEV_UART11] = 0x14C33A00, [ASPEED_DEV_UART12] = 0x14C33B00, + [ASPEED_DEV_LTPI_CTRL1] = 0x14C34000, + [ASPEED_DEV_LTPI_CTRL2] = 0x14C35000, [ASPEED_DEV_WDT] = 0x14C37000, [ASPEED_DEV_LTPI] = 0x30000000, [ASPEED_DEV_PCIE_MMIO0] = 0x60000000,@@ -556,6 +558,11 @@ static void aspeed_soc_ast2700_init(Object *obj)object_property_set_int (OBJECT (&s->pcie[i]),"id" , i, &error_abort); } +for (i =0 ; i <ASPEED_IOEXP_NUM ; i++) { +object_initialize_child (obj,"ltpi-ctrl[*]" , + &s->ltpi_ctrl[i],TYPE_ASPEED_LTPI ); + } +object_initialize_child (obj,"dpmcu" , &s->dpmcu,TYPE_UNIMPLEMENTED_DEVICE ); object_initialize_child(obj, "ltpi", &s->ltpi,@@ -1047,6 +1054,20 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)return ; } +/* LTPI controller */ +for (i =0 ; i <ASPEED_IOEXP_NUM ; i++) { +AspeedLTPIState *ltpi_ctrl; +hwaddr ltpi_base; + + ltpi_ctrl =ASPEED_LTPI (&s->ltpi_ctrl[i]); + ltpi_base = sc->memmap[ASPEED_DEV_LTPI_CTRL1 + i]; + +if (!sysbus_realize (SYS_BUS_DEVICE (ltpi_ctrl), errp)) { +return ; + } +aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (ltpi_ctrl),0 , ltpi_base); + } + aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu), "aspeed.dpmcu", sc->memmap[ASPEED_DEV_DPMCU],
PATCH v3 3/18 hw/misc: Add basic Aspeed PWM model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Add an initial PWM model for Aspeed SoCs, including device state, register definitions, and basic initialization as a sysbus device.
--- include/hw/arm/aspeed_soc.h | 3 +- include/hw/misc/aspeed_pwm.h | 31 +++++++++ hw/misc/aspeed_pwm.c | 121 +++++++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + hw/misc/trace-events | 4 ++ 5 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 include/hw/misc/aspeed_pwm.h create mode 100644 hw/misc/aspeed_pwm.c
include/hw/arm/aspeed_soc.h +2 -1
@@ -28,6 +28,7 @@#include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" #include "hw/misc/aspeed_sli.h" +#include "hw/misc/aspeed_pwm.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h"
@@ -108,7 +109,7 @@ struct AspeedSoCState {UnimplementedDeviceState video;UnimplementedDeviceState emmc_boot_controller;UnimplementedDeviceState dpmcu; -UnimplementedDeviceState pwm; +AspeedPWMState pwm;UnimplementedDeviceState espi;UnimplementedDeviceState udc;UnimplementedDeviceState ltpi;
include/hw/misc/aspeed_pwm.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#ifndef ASPEED_PWM_H +#define ASPEED_PWM_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_PWM "aspeed.pwm" +#define ASPEED_PWM (obj) OBJECT_CHECK(AspeedPWMState, (obj), TYPE_ASPEED_PWM) + +#define ASPEED_PWM_NR_REGS (0x10C >> 2) + +typedef struct AspeedPWMState { +/* <private> */ +SysBusDevice parent; + +/*< public >*/ +MemoryRegion iomem; +qemu_irq irq; + +uint32_t regs[ASPEED_PWM_NR_REGS ]; +}AspeedPWMState ; + +#endif /* _ASPEED_PWM_H_ */
hw/misc/aspeed_pwm.c new file +121 -0
121 lines not on this page · raw message
hw/misc/meson.build +1 -0
@@ -137,6 +137,7 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_i3c.c', 'aspeed_lpc.c', 'aspeed_ltpi.c', + 'aspeed_pwm.c', 'aspeed_scu.c', 'aspeed_sbc.c', 'aspeed_sdmc.c',
hw/misc/trace-events +4 -0
@@ -299,6 +299,10 @@ aspeed_i3c_write(uint64_t offset, uint64_t data) "I3C write: offset 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_pwm.c +aspeed_pwm_read(uint64_t offset, uint64_t data) "read: offset 0x%" PRIx64 " data 0x%" PRIx64 +aspeed_pwm_write(uint64_t offset, uint64_t data) "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
Signature · 1 line
2.43.0
Re: [PATCH v3 03/18] hw/misc: Add basic Aspeed PWM model
Quoted 11 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Add an initial PWM model for Aspeed SoCs, including device state, register definitions, and basic initialization as a sysbus device.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_soc.h | 3 +- include/hw/misc/aspeed_pwm.h | 31 +++++++++ hw/misc/aspeed_pwm.c | 121 +++++++++++++++++++++++++++++++++++
checkpatch.pl complains that the new files don't fall under any of the existing MAINTAINERS clauses. Should we add a new one/update an existing one for this?
Quoted 19 lines
hw/misc/meson.build | 1 + hw/misc/trace-events | 4 ++ 5 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 include/hw/misc/aspeed_pwm.h create mode 100644 hw/misc/aspeed_pwm.cinclude/hw/arm/aspeed_soc.h +1
-0@@ -28,6 +28,7 @@#include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" #include "hw/misc/aspeed_sli.h" +#include "hw/misc/aspeed_pwm.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h"
include/hw/arm/aspeed_soc.h struct AspeedSoCState { · line 112
Quoted 5 lines
include/hw/arm/aspeed_soc.h +1
-1@@ -108,7 +109,7 @@ struct AspeedSoCState {UnimplementedDeviceState video;UnimplementedDeviceState emmc_boot_controller;UnimplementedDeviceState dpmcu; -UnimplementedDeviceState pwm; +AspeedPWMState pwm;
Should this be moved up so the UnimplementedDeviceStates are all at the bottom without interruption?
Quoted 198 lines
include/hw/arm/aspeed_soc.h +0
-0UnimplementedDeviceState espi;UnimplementedDeviceState udc;UnimplementedDeviceState ltpi;include/hw/misc/aspeed_pwm.h new file +31
-0@@ -0,0 +1,31 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#ifndef ASPEED_PWM_H +#define ASPEED_PWM_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_PWM "aspeed.pwm" +#define ASPEED_PWM (obj) OBJECT_CHECK(AspeedPWMState, (obj), TYPE_ASPEED_PWM) + +#define ASPEED_PWM_NR_REGS (0x10C >> 2) + +typedef struct AspeedPWMState { +/* <private> */ +SysBusDevice parent; + +/*< public >*/ +MemoryRegion iomem; +qemu_irq irq; + +uint32_t regs[ASPEED_PWM_NR_REGS ]; +}AspeedPWMState ; + +#endif /* _ASPEED_PWM_H_ */ hw/misc/aspeed_pwm.c new file +121
-0@@ -0,0 +1,121 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/error-report.h" +#include "hw/misc/aspeed_pwm.h" +#include "qapi/error.h" +#include "migration/vmstate.h" + +#include "trace.h" + +static uint64_t aspeed_pwm_read (void *opaque,hwaddr addr, +unsigned int size) +{ +AspeedPWMState *s =ASPEED_PWM (opaque); +uint64_t val =0 ; + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx"\n" , + __func__, addr <<2 ); + }else { + val = s->regs[addr]; + } + +trace_aspeed_pwm_read (addr <<2 , val); + +return val; +} + +static void aspeed_pwm_write (void *opaque,hwaddr addr,uint64_t data, +unsigned int size) +{ +AspeedPWMState *s =ASPEED_PWM (opaque); + +trace_aspeed_pwm_write (addr, data); + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx"\n" , + __func__, addr <<2 ); +return ; + } + + s->regs[addr] = data; +} + +static const MemoryRegionOps aspeed_pwm_ops = { + .read = aspeed_pwm_read, + .write = aspeed_pwm_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static void aspeed_pwm_reset (DeviceState *dev) +{ +struct AspeedPWMState *s =ASPEED_PWM (dev); + +memset (s->regs,0 ,sizeof (s->regs)); +} + +static void aspeed_pwm_realize (DeviceState *dev,Error **errp) +{ +AspeedPWMState *s =ASPEED_PWM (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); + +sysbus_init_irq (sbd, &s->irq); + +memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_pwm_ops, s, +TYPE_ASPEED_PWM ,0x1000 ); + +sysbus_init_mmio (sbd, &s->iomem); +} + +static const VMStateDescription vmstate_aspeed_pwm = { + .name =TYPE_ASPEED_PWM , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_UINT32_ARRAY (regs, AspeedPWMState,ASPEED_PWM_NR_REGS ), +VMSTATE_END_OF_LIST (), + } +}; + +static void aspeed_pwm_class_init (ObjectClass *klass,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = aspeed_pwm_realize; +device_class_set_legacy_reset (dc, aspeed_pwm_reset); + dc->desc ="Aspeed PWM Controller" ; + dc->vmsd = &vmstate_aspeed_pwm; +} + +static const TypeInfo aspeed_pwm_info = { + .name =TYPE_ASPEED_PWM , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (AspeedPWMState), + .class_init = aspeed_pwm_class_init, +}; + +static void aspeed_pwm_register_types (void ) +{ +type_register_static (&aspeed_pwm_info); +} + +type_init (aspeed_pwm_register_types);hw/misc/meson.build +1
-0@@ -137,6 +137,7 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_i3c.c', 'aspeed_lpc.c', 'aspeed_ltpi.c', + 'aspeed_pwm.c', 'aspeed_scu.c', 'aspeed_sbc.c', 'aspeed_sdmc.c',hw/misc/trace-events +4
-1@@ -299,6 +299,10 @@ aspeed_i3c_write(uint64_t offset, uint64_t data) "I3C write: offset 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_pwm.c +aspeed_pwm_read(uint64_t offset, uint64_t data) "read: offset 0x%" PRIx64 " data 0x%" PRIx64 +aspeed_pwm_write(uint64_t offset, uint64_t data) "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 --2.43.0
Re: [SPAM] [PATCH v3 03/18] hw/misc: Add basic Aspeed PWM model
In reply to Kane Chen viaQuoted 1 line · Kane Chen
From: Kane-Chen-AS <[email protected]>
Please keep the original Author name.
Quoted 4 lines
Add an initial PWM model for Aspeed SoCs, including device state, register definitions, and basic initialization as a sysbus device.
Signed-off-by Kane-Chen-AS <[email protected]>
Also keep his S-o-b and add yours too.
Thanks,
C.
Quoted 222 lines
--- include/hw/arm/aspeed_soc.h | 3 +- include/hw/misc/aspeed_pwm.h | 31 +++++++++ hw/misc/aspeed_pwm.c | 121 +++++++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + hw/misc/trace-events | 4 ++ 5 files changed, 159 insertions(+), 1 deletion(-)create mode 100644
include/hw/misc/aspeed_pwm.h
create mode 100644hw/misc/aspeed_pwm.cinclude/hw/arm/aspeed_soc.h +2
-1@@ -28,6 +28,7 @@#include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" #include "hw/misc/aspeed_sli.h" +#include "hw/misc/aspeed_pwm.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -108,7 +109,7 @@ struct AspeedSoCState {UnimplementedDeviceState video;UnimplementedDeviceState emmc_boot_controller;UnimplementedDeviceState dpmcu; -UnimplementedDeviceState pwm; +AspeedPWMState pwm;UnimplementedDeviceState espi;UnimplementedDeviceState udc;UnimplementedDeviceState ltpi;include/hw/misc/aspeed_pwm.h new file +31
-0@@ -0,0 +1,31 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#ifndef ASPEED_PWM_H +#define ASPEED_PWM_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_PWM "aspeed.pwm" +#define ASPEED_PWM (obj) OBJECT_CHECK(AspeedPWMState, (obj), TYPE_ASPEED_PWM) + +#define ASPEED_PWM_NR_REGS (0x10C >> 2) + +typedef struct AspeedPWMState { +/* <private> */ +SysBusDevice parent; + +/*< public >*/ +MemoryRegion iomem; +qemu_irq irq; + +uint32_t regs[ASPEED_PWM_NR_REGS ]; +}AspeedPWMState ; + +#endif /* _ASPEED_PWM_H_ */ hw/misc/aspeed_pwm.c new file +121
-0@@ -0,0 +1,121 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/error-report.h" +#include "hw/misc/aspeed_pwm.h" +#include "qapi/error.h" +#include "migration/vmstate.h" + +#include "trace.h" + +static uint64_t aspeed_pwm_read (void *opaque,hwaddr addr, +unsigned int size) +{ +AspeedPWMState *s =ASPEED_PWM (opaque); +uint64_t val =0 ; + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx"\n" , + __func__, addr <<2 ); + }else { + val = s->regs[addr]; + } + +trace_aspeed_pwm_read (addr <<2 , val); + +return val; +} + +static void aspeed_pwm_write (void *opaque,hwaddr addr,uint64_t data, +unsigned int size) +{ +AspeedPWMState *s =ASPEED_PWM (opaque); + +trace_aspeed_pwm_write (addr, data); + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx"\n" , + __func__, addr <<2 ); +return ; + } + + s->regs[addr] = data; +} + +static const MemoryRegionOps aspeed_pwm_ops = { + .read = aspeed_pwm_read, + .write = aspeed_pwm_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static void aspeed_pwm_reset (DeviceState *dev) +{ +struct AspeedPWMState *s =ASPEED_PWM (dev); + +memset (s->regs,0 ,sizeof (s->regs)); +} + +static void aspeed_pwm_realize (DeviceState *dev,Error **errp) +{ +AspeedPWMState *s =ASPEED_PWM (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); + +sysbus_init_irq (sbd, &s->irq); + +memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_pwm_ops, s, +TYPE_ASPEED_PWM ,0x1000 ); + +sysbus_init_mmio (sbd, &s->iomem); +} + +static const VMStateDescription vmstate_aspeed_pwm = { + .name =TYPE_ASPEED_PWM , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_UINT32_ARRAY (regs, AspeedPWMState,ASPEED_PWM_NR_REGS ), +VMSTATE_END_OF_LIST (), + } +}; + +static void aspeed_pwm_class_init (ObjectClass *klass,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = aspeed_pwm_realize; +device_class_set_legacy_reset (dc, aspeed_pwm_reset); + dc->desc ="Aspeed PWM Controller" ; + dc->vmsd = &vmstate_aspeed_pwm; +} + +static const TypeInfo aspeed_pwm_info = { + .name =TYPE_ASPEED_PWM , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (AspeedPWMState), + .class_init = aspeed_pwm_class_init, +}; + +static void aspeed_pwm_register_types (void ) +{ +type_register_static (&aspeed_pwm_info); +} + +type_init (aspeed_pwm_register_types);hw/misc/meson.build +1
-0@@ -137,6 +137,7 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_i3c.c', 'aspeed_lpc.c', 'aspeed_ltpi.c', + 'aspeed_pwm.c', 'aspeed_scu.c', 'aspeed_sbc.c', 'aspeed_sdmc.c',hw/misc/trace-events +4
-0@@ -299,6 +299,10 @@ aspeed_i3c_write(uint64_t offset, uint64_t data) "I3C write: offset 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_pwm.c +aspeed_pwm_read(uint64_t offset, uint64_t data) "read: offset 0x%" PRIx64 " data 0x%" PRIx64 +aspeed_pwm_write(uint64_t offset, uint64_t data) "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
RE: [SPAM] [PATCH v3 03/18] hw/misc: Add basic Aspeed PWM model
Quoted 22 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Saturday, December 20, 2025 12:58 AM
To: Kane Chen <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>
Subject: Re: [SPAM] [PATCH v3 03/18] hw/misc: Add basic Aspeed PWM modelQuoted 1 line · Kane Chen
From: Kane-Chen-AS <[email protected]>
Please keep the original Author name.
Quoted 4 lines
Add an initial PWM model for Aspeed SoCs, including device state, register definitions, and basic initialization as a sysbus device.
Signed-off-by Kane-Chen-AS <[email protected]>
Quoted 7 lines
Also keep his S-o-b and add yours too.
Thanks,
C.
Hi Cédric,
Sorry, I missed the original author information.
For the next revision, should I use the original email address <[email protected]>, or your current one <[email protected]>?
Best Regards,
Kane
Quoted 226 lines
Quoted 5 lines
--- include/hw/arm/aspeed_soc.h | 3 +- include/hw/misc/aspeed_pwm.h | 31 +++++++++ hw/misc/aspeed_pwm.c | 121+++++++++++++++++++++++++++++++++++
hw/misc/aspeed_pwm.c new file
Quoted 65 lines
hw/misc/meson.build | 1 + hw/misc/trace-events | 4 ++ 5 files changed, 159 insertions(+), 1 deletion(-)create mode 100644
include/hw/misc/aspeed_pwm.h
create mode 100644hw/misc/aspeed_pwm.cinclude/hw/arm/aspeed_soc.h +2
-1@@ -28,6 +28,7 @@#include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" #include "hw/misc/aspeed_sli.h" +#include "hw/misc/aspeed_pwm.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -108,7 +109,7 @@ struct AspeedSoCState {UnimplementedDeviceState video;UnimplementedDeviceState emmc_boot_controller;UnimplementedDeviceState dpmcu; -UnimplementedDeviceState pwm; +AspeedPWMState pwm;UnimplementedDeviceState espi;UnimplementedDeviceState udc;UnimplementedDeviceState ltpi;(quoted diff) +0
-0
b/include/hw/misc/aspeed_pwm.hnew file mode 100644 index 0000000000..13dc3ea45binclude/hw/misc/aspeed_pwm.h new file +31
-0@@ -0,0 +1,31 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#ifndef ASPEED_PWM_H +#define ASPEED_PWM_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_PWM "aspeed.pwm" +#define ASPEED_PWM (obj) OBJECT_CHECK(AspeedPWMState, (obj), +TYPE_ASPEED_PWM) + +#define ASPEED_PWM_NR_REGS (0x10C >> 2) + +typedef struct AspeedPWMState { +/* <private> */ +SysBusDevice parent; + +/*< public >*/ +MemoryRegion iomem; +qemu_irq irq; + +uint32_t regs[ASPEED_PWM_NR_REGS ]; }AspeedPWMState ; + +#endif /* _ASPEED_PWM_H_ */ hw/misc/aspeed_pwm.c new file renamed from hw/misc/aspeed_pwm.c +0
-0mode
Quoted 22 lines
100644 index 0000000000..de209274af
hw/misc/aspeed_pwm.c new file +18
-0@@ -0,0 +1,121 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/error-report.h" +#include "hw/misc/aspeed_pwm.h" +#include "qapi/error.h" +#include "migration/vmstate.h" + +#include "trace.h" +hw/misc/aspeed_pwm.c line 28
Quoted 10 lines
hw/misc/aspeed_pwm.c new file +10
-0+static uint64_t aspeed_pwm_read (void *opaque,hwaddr addr, +unsigned int size) { +AspeedPWMState *s =ASPEED_PWM (opaque); +uint64_t val =0 ; + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , + "%s: Out-of-bounds read at offset 0x%"
HWADDR_PRIx"\n",Quoted 11 lines
hw/misc/aspeed_pwm.c new file +11
-0+ __func__, addr << 2); + }else { + val = s->regs[addr]; + } + +trace_aspeed_pwm_read (addr <<2 , val); + +return val; +} + +static void aspeed_pwm_write(void *opaque, hwaddr addr, uint64_t data,hw/misc/aspeed_pwm.c
Quoted 10 lines
hw/misc/aspeed_pwm.c new file +10
-0+ unsigned int size) { +AspeedPWMState *s =ASPEED_PWM (opaque); + +trace_aspeed_pwm_write (addr, data); + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , + "%s: Out-of-bounds write at offset 0x%"
HWADDR_PRIx"\n",Quoted 29 lines
hw/misc/aspeed_pwm.c new file +29
-0+ __func__, addr << 2); +return ; + } + + s->regs[addr] = data; +} + +static const MemoryRegionOps aspeed_pwm_ops = { + .read = aspeed_pwm_read, + .write = aspeed_pwm_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static void aspeed_pwm_reset (DeviceState *dev) { +struct AspeedPWMState *s =ASPEED_PWM (dev); + +memset (s->regs,0 ,sizeof (s->regs)); } + +static void aspeed_pwm_realize (DeviceState *dev,Error **errp) { +AspeedPWMState *s =ASPEED_PWM (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); + +sysbus_init_irq (sbd, &s->irq); + + memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_pwm_ops, s,hw/misc/aspeed_pwm.c
Quoted 10 lines
hw/misc/aspeed_pwm.c new file +10
-0+ TYPE_ASPEED_PWM, 0x1000); + +sysbus_init_mmio (sbd, &s->iomem); } + +static const VMStateDescription vmstate_aspeed_pwm = { + .name =TYPE_ASPEED_PWM , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { + VMSTATE_UINT32_ARRAY(regs, AspeedPWMState,
ASPEED_PWM_NR_REGS),hw/misc/meson.build system_ss.add(when: 'CONFIG_ASPEED_SOC',
Quoted 30 lines
hw/misc/aspeed_pwm.c new file +25
-0+ VMSTATE_END_OF_LIST(), + } +}; + +static void aspeed_pwm_class_init (ObjectClass *klass,const void +*data) { +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = aspeed_pwm_realize; +device_class_set_legacy_reset (dc, aspeed_pwm_reset); + dc->desc ="Aspeed PWM Controller" ; + dc->vmsd = &vmstate_aspeed_pwm; +} + +static const TypeInfo aspeed_pwm_info = { + .name =TYPE_ASPEED_PWM , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (AspeedPWMState), + .class_init = aspeed_pwm_class_init, }; + +static void aspeed_pwm_register_types (void ) { +type_register_static (&aspeed_pwm_info); +} + +type_init (aspeed_pwm_register_types);hw/misc/meson.build index renamed from hw/misc/meson.build +0
-0
45b16e7797..7afe1d0009100644hw/misc/meson.build +0
-0@@ -137,6 +137,7 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC',
if_true: files(hw/misc/trace-events aspeed_i3c_write(uint64_t offset, uint64_t data)
Quoted 12 lines
hw/misc/meson.build +1
-0'aspeed_i3c.c', 'aspeed_lpc.c', 'aspeed_ltpi.c', + 'aspeed_pwm.c', 'aspeed_scu.c', 'aspeed_sbc.c', 'aspeed_sdmc.c',hw/misc/trace-events index renamed from hw/misc/trace-events +0
-0
eeb9243898..f7870babba100644hw/misc/trace-events +0
-0@@ -299,6 +299,10 @@ aspeed_i3c_write(uint64_t offset, uint64_t data)"I3C write: offset 0x%" PRIx64
hw/misc/trace-events aspeed_i3c_write(uint64_t offset, uint64_t data) · line 299
Quoted 1 line
hw/misc/trace-events +0
-0aspeed_i3c_device_read(uint32_t deviceid, uint64_t offset, uint64_t data)"I3C Dev[%u] read: offset 0x%" PRIx64 " data 0x%" PRIx64
hw/misc/trace-events
Quoted 10 lines
hw/misc/trace-events +0
-0aspeed_i3c_device_write(uint32_t deviceid, uint64_t offset, uint64_tdata) "I3C Dev[%u] write: offset 0x%" PRIx64 " data 0x%" PRIx64
hw/misc/trace-events +5
-0+# aspeed_pwm.c +aspeed_pwm_read(uint64_t offset, uint64_t data) "read: offset 0x%" +PRIx64 " data 0x%" PRIx64 aspeed_pwm_write(uint64_t offset, uint64_t +data) "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
Quoted 2 lines
aspeed_sdmc_read(uint64_t reg, uint64_t data)"reg @0x%" PRIx64 "
data: 0x%" PRIx64
Re: [SPAM] [PATCH v3 03/18] hw/misc: Add basic Aspeed PWM model
Quoted 28 lines · Kane Chen
Quoted 28 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Saturday, December 20, 2025 12:58 AM
To: Kane Chen <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>
Subject: Re: [SPAM] [PATCH v3 03/18] hw/misc: Add basic Aspeed PWM modelQuoted 1 line · Kane Chen
From: Kane-Chen-AS <[email protected]>
Please keep the original Author name.
Quoted 4 lines
Add an initial PWM model for Aspeed SoCs, including device state, register definitions, and basic initialization as a sysbus device.
Signed-off-by Kane-Chen-AS <[email protected]>Also keep his S-o-b and add yours too.
Thanks,
Quoted 7 lines
Quoted 1 line
C.
Hi Cédric,
Sorry, I missed the original author information.
For the next revision, should I use the original email address <[email protected]>,
[email protected] please.
Thanks,
C.
Quoted 231 lines
or your current one <[email protected]>?
Best Regards,
KaneQuoted 226 lines
Quoted 5 lines
--- include/hw/arm/aspeed_soc.h | 3 +- include/hw/misc/aspeed_pwm.h | 31 +++++++++ hw/misc/aspeed_pwm.c | 121+++++++++++++++++++++++++++++++++++
hw/misc/aspeed_pwm.c new file
Quoted 65 lines
hw/misc/meson.build | 1 + hw/misc/trace-events | 4 ++ 5 files changed, 159 insertions(+), 1 deletion(-)create mode 100644
include/hw/misc/aspeed_pwm.hcreate mode 100644hw/misc/aspeed_pwm.cinclude/hw/arm/aspeed_soc.h +2
-1@@ -28,6 +28,7 @@#include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" #include "hw/misc/aspeed_sli.h" +#include "hw/misc/aspeed_pwm.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -108,7 +109,7 @@ struct AspeedSoCState {UnimplementedDeviceState video;UnimplementedDeviceState emmc_boot_controller;UnimplementedDeviceState dpmcu; -UnimplementedDeviceState pwm; +AspeedPWMState pwm;UnimplementedDeviceState espi;UnimplementedDeviceState udc;UnimplementedDeviceState ltpi;(quoted diff) +0
-0
b/include/hw/misc/aspeed_pwm.hnew file mode 100644 index 0000000000..13dc3ea45binclude/hw/misc/aspeed_pwm.h new file +31
-0@@ -0,0 +1,31 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#ifndef ASPEED_PWM_H +#define ASPEED_PWM_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_PWM "aspeed.pwm" +#define ASPEED_PWM (obj) OBJECT_CHECK(AspeedPWMState, (obj), +TYPE_ASPEED_PWM) + +#define ASPEED_PWM_NR_REGS (0x10C >> 2) + +typedef struct AspeedPWMState { +/* <private> */ +SysBusDevice parent; + +/*< public >*/ +MemoryRegion iomem; +qemu_irq irq; + +uint32_t regs[ASPEED_PWM_NR_REGS ]; }AspeedPWMState ; + +#endif /* _ASPEED_PWM_H_ */ hw/misc/aspeed_pwm.c new file renamed from hw/misc/aspeed_pwm.c +0
-0mode
Quoted 22 lines
100644 index 0000000000..de209274af
hw/misc/aspeed_pwm.c new file +18
-0@@ -0,0 +1,121 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/error-report.h" +#include "hw/misc/aspeed_pwm.h" +#include "qapi/error.h" +#include "migration/vmstate.h" + +#include "trace.h" +hw/misc/aspeed_pwm.c line 28
Quoted 10 lines
hw/misc/aspeed_pwm.c new file +10
-0+static uint64_t aspeed_pwm_read (void *opaque,hwaddr addr, +unsigned int size) { +AspeedPWMState *s =ASPEED_PWM (opaque); +uint64_t val =0 ; + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , + "%s: Out-of-bounds read at offset 0x%"
HWADDR_PRIx"\n",Quoted 11 lines
hw/misc/aspeed_pwm.c new file +11
-0+ __func__, addr << 2); + }else { + val = s->regs[addr]; + } + +trace_aspeed_pwm_read (addr <<2 , val); + +return val; +} + +static void aspeed_pwm_write(void *opaque, hwaddr addr, uint64_t data,hw/misc/aspeed_pwm.c
Quoted 10 lines
hw/misc/aspeed_pwm.c new file +10
-0+ unsigned int size) { +AspeedPWMState *s =ASPEED_PWM (opaque); + +trace_aspeed_pwm_write (addr, data); + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , + "%s: Out-of-bounds write at offset 0x%"
HWADDR_PRIx"\n",Quoted 29 lines
hw/misc/aspeed_pwm.c new file +29
-0+ __func__, addr << 2); +return ; + } + + s->regs[addr] = data; +} + +static const MemoryRegionOps aspeed_pwm_ops = { + .read = aspeed_pwm_read, + .write = aspeed_pwm_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static void aspeed_pwm_reset (DeviceState *dev) { +struct AspeedPWMState *s =ASPEED_PWM (dev); + +memset (s->regs,0 ,sizeof (s->regs)); } + +static void aspeed_pwm_realize (DeviceState *dev,Error **errp) { +AspeedPWMState *s =ASPEED_PWM (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); + +sysbus_init_irq (sbd, &s->irq); + + memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_pwm_ops, s,hw/misc/aspeed_pwm.c
Quoted 10 lines
hw/misc/aspeed_pwm.c new file +10
-0+ TYPE_ASPEED_PWM, 0x1000); + +sysbus_init_mmio (sbd, &s->iomem); } + +static const VMStateDescription vmstate_aspeed_pwm = { + .name =TYPE_ASPEED_PWM , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { + VMSTATE_UINT32_ARRAY(regs, AspeedPWMState,
ASPEED_PWM_NR_REGS),hw/misc/meson.build system_ss.add(when: 'CONFIG_ASPEED_SOC',
Quoted 30 lines
hw/misc/aspeed_pwm.c new file +25
-0+ VMSTATE_END_OF_LIST(), + } +}; + +static void aspeed_pwm_class_init (ObjectClass *klass,const void +*data) { +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = aspeed_pwm_realize; +device_class_set_legacy_reset (dc, aspeed_pwm_reset); + dc->desc ="Aspeed PWM Controller" ; + dc->vmsd = &vmstate_aspeed_pwm; +} + +static const TypeInfo aspeed_pwm_info = { + .name =TYPE_ASPEED_PWM , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (AspeedPWMState), + .class_init = aspeed_pwm_class_init, }; + +static void aspeed_pwm_register_types (void ) { +type_register_static (&aspeed_pwm_info); +} + +type_init (aspeed_pwm_register_types);hw/misc/meson.build index renamed from hw/misc/meson.build +0
-0
45b16e7797..7afe1d0009100644hw/misc/meson.build +0
-0@@ -137,6 +137,7 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC',
if_true: files(hw/misc/trace-events aspeed_i3c_write(uint64_t offset, uint64_t data)
Quoted 12 lines
hw/misc/meson.build +1
-0'aspeed_i3c.c', 'aspeed_lpc.c', 'aspeed_ltpi.c', + 'aspeed_pwm.c', 'aspeed_scu.c', 'aspeed_sbc.c', 'aspeed_sdmc.c',hw/misc/trace-events index renamed from hw/misc/trace-events +0
-0
eeb9243898..f7870babba100644hw/misc/trace-events +0
-0@@ -299,6 +299,10 @@ aspeed_i3c_write(uint64_t offset, uint64_t data)"I3C write: offset 0x%" PRIx64
hw/misc/trace-events aspeed_i3c_write(uint64_t offset, uint64_t data) · line 299
Quoted 1 line
hw/misc/trace-events +0
-0aspeed_i3c_device_read(uint32_t deviceid, uint64_t offset, uint64_t data)"I3C Dev[%u] read: offset 0x%" PRIx64 " data 0x%" PRIx64
hw/misc/trace-events
Quoted 10 lines
hw/misc/trace-events +0
-0aspeed_i3c_device_write(uint32_t deviceid, uint64_t offset, uint64_tdata) "I3C Dev[%u] write: offset 0x%" PRIx64 " data 0x%" PRIx64
hw/misc/trace-events +5
-0+# aspeed_pwm.c +aspeed_pwm_read(uint64_t offset, uint64_t data) "read: offset 0x%" +PRIx64 " data 0x%" PRIx64 aspeed_pwm_write(uint64_t offset, uint64_t +data) "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
Quoted 2 lines
aspeed_sdmc_read(uint64_t reg, uint64_t data) "reg @0x%" PRIx64 "data: 0x%" PRIx64
RE: [SPAM] [PATCH v3 03/18] hw/misc: Add basic Aspeed PWM model
Quoted 51 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Monday, December 22, 2025 5:45 PM
To: Kane Chen <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>
Subject: Re: [SPAM] [PATCH v3 03/18] hw/misc: Add basic Aspeed PWM modelQuoted 29 lines · Kane Chen
Quoted 29 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Saturday, December 20, 2025 12:58 AM
To: Kane Chen <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>
Subject: Re: [SPAM] [PATCH v3 03/18] hw/misc: Add basic Aspeed PWM modelQuoted 1 line · Kane Chen
From: Kane-Chen-AS <[email protected]>
Please keep the original Author name.
Quoted 4 lines
Add an initial PWM model for Aspeed SoCs, including device state, register definitions, and basic initialization as a sysbus device.
Signed-off-by Kane-Chen-AS <[email protected]>Also keep his S-o-b and add yours too.
Thanks,
Quoted 7 lines
Quoted 1 line
C.
Hi Cédric,
Sorry, I missed the original author information.
For the next revision, should I use the original email address <[email protected]>,
Quoted 5 lines
[email protected] please.
Thanks,
C.
Hi Cédric,
Got it. I will update it in the next patch.
Best Regards,
Kane
Quoted 239 lines
Quoted 32 lines
or your current one <[email protected]>?
Best Regards,
KaneQuoted 26 lines
Quoted 5 lines
--- include/hw/arm/aspeed_soc.h | 3 +- include/hw/misc/aspeed_pwm.h | 31 +++++++++ hw/misc/aspeed_pwm.c | 121+++++++++++++++++++++++++++++++++++
Quoted 20 lines
hw/misc/meson.build | 1 + hw/misc/trace-events | 4 ++ 5 files changed, 159 insertions(+), 1 deletion(-)create mode 100644
include/hw/misc/aspeed_pwm.hcreate mode 100644hw/misc/aspeed_pwm.c(quoted diff) +0
-0
b/include/hw/arm/aspeed_soc.hindexbca10c387b..5b0680f319100644include/hw/arm/aspeed_soc.h +1
-0@@ -28,6 +28,7 @@#include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" #include "hw/misc/aspeed_sli.h" +#include "hw/misc/aspeed_pwm.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -108,7 +109,7 @@ struct AspeedSoCState {UnimplementedDeviceState video;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/hw/arm/aspeed_soc.h +1
-1UnimplementedDeviceState emmc_boot_controller;UnimplementedDeviceState dpmcu; -UnimplementedDeviceState pwm; +AspeedPWMState pwm;UnimplementedDeviceState espi;UnimplementedDeviceState udc; UnimplementedDeviceState ltpi; diff --git
a/include/hw/misc/aspeed_pwm.hb/include/hw/misc/aspeed_pwm.hnew
Quoted 70 lines
Quoted 70 lines
hw/misc/aspeed_pwm.c new file
Quoted 36 lines
file mode 100644 index 0000000000..13dc3ea45b
include/hw/misc/aspeed_pwm.h new file +31
-0@@ -0,0 +1,31 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#ifndef ASPEED_PWM_H +#define ASPEED_PWM_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_PWM "aspeed.pwm" +#define ASPEED_PWM (obj) OBJECT_CHECK(AspeedPWMState, (obj), +TYPE_ASPEED_PWM) + +#define ASPEED_PWM_NR_REGS (0x10C >> 2) + +typedef struct AspeedPWMState { +/* <private> */ +SysBusDevice parent; + +/*< public >*/ +MemoryRegion iomem; +qemu_irq irq; + +uint32_t regs[ASPEED_PWM_NR_REGS ]; }AspeedPWMState ; + +#endif /* _ASPEED_PWM_H_ */ hw/misc/aspeed_pwm.c new file renamed from hw/misc/aspeed_pwm.c +0
-0mode
Quoted 22 lines
100644 index 0000000000..de209274af
hw/misc/aspeed_pwm.c new file +18
-0@@ -0,0 +1,121 @@ +/* +* ASPEED PWM Controller +* +* Copyright (C) 2017-2021 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/error-report.h" +#include "hw/misc/aspeed_pwm.h" +#include "qapi/error.h" +#include "migration/vmstate.h" + +#include "trace.h" +hw/misc/aspeed_pwm.c line 28
Quoted 10 lines
hw/misc/aspeed_pwm.c new file +10
-0+static uint64_t aspeed_pwm_read (void *opaque,hwaddr addr, +unsigned int size) { +AspeedPWMState *s =ASPEED_PWM (opaque); +uint64_t val =0 ; + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , + "%s: Out-of-bounds read at offset 0x%"
HWADDR_PRIx"\n",Quoted 11 lines
Quoted 11 lines
hw/misc/aspeed_pwm.c
Quoted 11 lines
hw/misc/aspeed_pwm.c new file +11
-0+ __func__, addr << 2); + }else { + val = s->regs[addr]; + } + +trace_aspeed_pwm_read (addr <<2 , val); + +return val; +} + +static void aspeed_pwm_write(void *opaque, hwaddr addr, uint64_tdata,
Quoted 32 lines
Quoted 32 lines
hw/misc/aspeed_pwm.c
Quoted 10 lines
hw/misc/aspeed_pwm.c new file +10
-0+ unsigned int size) { +AspeedPWMState *s =ASPEED_PWM (opaque); + +trace_aspeed_pwm_write (addr, data); + + addr >>=2 ; + +if (addr >=ASPEED_PWM_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , + "%s: Out-of-bounds write at offset 0x%"
HWADDR_PRIx"\n",Quoted 21 lines
hw/misc/aspeed_pwm.c new file +21
-0+ __func__, addr << 2); +return ; + } + + s->regs[addr] = data; +} + +static const MemoryRegionOps aspeed_pwm_ops = { + .read = aspeed_pwm_read, + .write = aspeed_pwm_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static void aspeed_pwm_reset (DeviceState *dev) { +struct AspeedPWMState *s =ASPEED_PWM (dev); + +memset (s->regs,0 ,sizeof (s->regs)); }Quoted 8 lines
Quoted 8 lines
hw/misc/aspeed_pwm.c
Quoted 8 lines
hw/misc/aspeed_pwm.c new file +8
-0+ +static void aspeed_pwm_realize (DeviceState *dev,Error **errp) { +AspeedPWMState *s =ASPEED_PWM (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); + +sysbus_init_irq (sbd, &s->irq); + + memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_pwm_ops,s,
Quoted 62 lines
Quoted 62 lines
hw/misc/aspeed_pwm.c
Quoted 10 lines
hw/misc/aspeed_pwm.c new file +10
-0+ TYPE_ASPEED_PWM, 0x1000); + +sysbus_init_mmio (sbd, &s->iomem); } + +static const VMStateDescription vmstate_aspeed_pwm = { + .name =TYPE_ASPEED_PWM , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { + VMSTATE_UINT32_ARRAY(regs, AspeedPWMState,
ASPEED_PWM_NR_REGS),hw/misc/meson.build system_ss.add(when: 'CONFIG_ASPEED_SOC',
Quoted 29 lines
hw/misc/aspeed_pwm.c new file +24
-0+ VMSTATE_END_OF_LIST(), + } +}; + +static void aspeed_pwm_class_init (ObjectClass *klass,const void +*data) { +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = aspeed_pwm_realize; +device_class_set_legacy_reset (dc, aspeed_pwm_reset); + dc->desc ="Aspeed PWM Controller" ; + dc->vmsd = &vmstate_aspeed_pwm; } + +static const TypeInfo aspeed_pwm_info = { + .name =TYPE_ASPEED_PWM , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (AspeedPWMState), + .class_init = aspeed_pwm_class_init, }; + +static void aspeed_pwm_register_types (void ) { +type_register_static (&aspeed_pwm_info); +} + +type_init (aspeed_pwm_register_types);hw/misc/meson.build index renamed from hw/misc/meson.build +0
-0
45b16e7797..7afe1d0009100644hw/misc/meson.build +0
-0@@ -137,6 +137,7 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC',
if_true: files(hw/misc/trace-events aspeed_i3c_write(uint64_t offset, uint64_t · line 299
Quoted 13 lines
hw/misc/meson.build +1
-0'aspeed_i3c.c', 'aspeed_lpc.c', 'aspeed_ltpi.c', + 'aspeed_pwm.c', 'aspeed_scu.c', 'aspeed_sbc.c', 'aspeed_sdmc.c',hw/misc/trace-events index renamed from hw/misc/trace-events +0
-0
eeb9243898..f7870babba100644hw/misc/trace-events +0
-0@@ -299,6 +299,10 @@ aspeed_i3c_write(uint64_t offset, uint64_t data)"I3C write: offset 0x%" PRIx64
hw/misc/trace-events aspeed_i3c_write(uint64_t offset, uint64_t · line 301
Quoted 2 lines
hw/misc/trace-events +0
-0aspeed_i3c_device_read(uint32_t deviceid, uint64_t offset, uint64_t data)"I3C Dev[%u] read: offset 0x%" PRIx64 " data 0x%" PRIx64
Quoted 4 lines
hw/misc/trace-events +0
-0aspeed_i3c_device_write(uint32_t deviceid, uint64_t offset,
uint64_t
data) "I3C Dev[%u] write: offset 0x%" PRIx64 " data 0x%" PRIx64Quoted 8 lines
Quoted 8 lines
hw/misc/trace-events
Quoted 8 lines
hw/misc/trace-events +6
-0+# aspeed_pwm.c +aspeed_pwm_read(uint64_t offset, uint64_t data) "read: offset 0x%" +PRIx64 " data 0x%" PRIx64 aspeed_pwm_write(uint64_t offset, +uint64_t +data) "write: offset 0x%" PRIx64 " data 0x%" PRIx64 + # aspeed_sdmc.c aspeed_sdmc_write(uint64_t reg, uint64_t data) "reg @0x%" PRIx64"
Quoted 4 lines
Quoted 3 lines
data: 0x%" PRIx64
Quoted 2 lines
aspeed_sdmc_read(uint64_t reg, uint64_t data) "reg @0x%" PRIx64 "data: 0x%" PRIx64
PATCH v3 4/18 hw/arm/aspeed: Add AST1700 LTPI expander device model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Introduce a minimal QEMU device model for the ASPEED AST1700, an MCU-less I/O expander used in the LTPI topology defined by the DC-SCM 2.0 specification (see figure 2):
https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-pdf
This initial implementation includes:
* Definition of aspeed.ast1700 as a SysBusDevice
* Setup of a basic memory region to reserve I/O space for future peripheral modeling
This stub establishes the foundation for LTPI-related device emulation, without implementing any functional peripherals at this stage.
--- include/hw/arm/aspeed_ast1700.h | 23 ++++++++++++++++ hw/arm/aspeed_ast1700.c | 48 +++++++++++++++++++++++++++++++++ hw/arm/meson.build | 1 + 3 files changed, 72 insertions(+) create mode 100644 include/hw/arm/aspeed_ast1700.h create mode 100644 hw/arm/aspeed_ast1700.c
include/hw/arm/aspeed_ast1700.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* ASPEED AST1700 IO Expander +* +* Copyright (C) 2025 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef ASPEED_AST1700_H +#define ASPEED_AST1700_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_AST1700 "aspeed.ast1700" + +OBJECT_DECLARE_SIMPLE_TYPE(AspeedAST1700SoCState, ASPEED_AST1700) + +struct AspeedAST1700SoCState { +SysBusDevice parent_obj; + +MemoryRegion iomem; +}; + +#endif /* ASPEED_AST1700_H */
hw/arm/aspeed_ast1700.c new file +48 -0
48 lines not on this page · raw message
hw/arm/meson.build +1 -0
@@ -42,6 +42,7 @@ arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', + 'aspeed_ast1700.c', 'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2400_palmetto.c',
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 04/18] hw/arm/aspeed: Add AST1700 LTPI expander device model
Quoted 91 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Introduce a minimal QEMU device model for the ASPEED AST1700, an MCU-less I/O expander used in the LTPI topology defined by the DC-SCM 2.0 specification (see figure 2):
https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-pdfThis initial implementation includes:
* Definition of aspeed.ast1700 as a SysBusDevice
* Setup of a basic memory region to reserve I/O space for future peripheral modeling
This stub establishes the foundation for LTPI-related device emulation, without implementing any functional peripherals at this stage.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 23 ++++++++++++++++ hw/arm/aspeed_ast1700.c | 48 +++++++++++++++++++++++++++++++++ hw/arm/meson.build | 1 + 3 files changed, 72 insertions(+)create mode 100644
include/hw/arm/aspeed_ast1700.hcreate mode 100644hw/arm/aspeed_ast1700.cinclude/hw/arm/aspeed_ast1700.h new file +23
-0@@ -0,0 +1,23 @@ +/* +* ASPEED AST1700 IO Expander +* +* Copyright (C) 2025 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef ASPEED_AST1700_H +#define ASPEED_AST1700_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_AST1700 "aspeed.ast1700" + +OBJECT_DECLARE_SIMPLE_TYPE(AspeedAST1700SoCState, ASPEED_AST1700) + +struct AspeedAST1700SoCState { +SysBusDevice parent_obj; + +MemoryRegion iomem; +}; + +#endif /* ASPEED_AST1700_H */ hw/arm/aspeed_ast1700.c new file +30
-0@@ -0,0 +1,48 @@ +/* +* ASPEED AST1700 IO Expander +* +* Copyright (C) 2025 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "hw/boards.h" +#include "hw/qdev-core.h" +#include "qom/object.h" +#include "hw/arm/aspeed_ast1700.h" + +#define AST2700_SOC_LTPI_SIZE 0x01000000 + +static void aspeed_ast1700_realize (DeviceState *dev,Error **errp) +{ +AspeedAST1700SoCState *s =ASPEED_AST1700 (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); + +/* Occupy memory space for all controllers in AST1700 */ +memory_region_init (&s->iomem,OBJECT (s),TYPE_ASPEED_AST1700 , +AST2700_SOC_LTPI_SIZE ); +sysbus_init_mmio (sbd, &s->iomem); +} + +static void aspeed_ast1700_class_init (ObjectClass *klass,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass);
hw/arm/aspeed_ast1700.c line 40
Quoted 10 lines
hw/arm/aspeed_ast1700.c new file +10
-0+ + dc->realize = aspeed_ast1700_realize; +} + +static const TypeInfo aspeed_ast1700_info = { + .name =TYPE_ASPEED_AST1700 , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (AspeedAST1700SoCState), + .class_init = aspeed_ast1700_class_init, + .abstract = false,
You can drop the .abstract assignment.
Quoted 13 lines
hw/arm/aspeed_ast1700.c new file +8
-0+}; + +static void aspeed_ast1700_register_types (void ) +{ +type_register_static (&aspeed_ast1700_info); +} + +type_init (aspeed_ast1700_register_types);hw/arm/meson.build +0
-0
hw/arm/meson.build arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c · line 45
Quoted 4 lines
hw/arm/meson.build +1
-0@@ -42,6 +42,7 @@ arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', + 'aspeed_ast1700.c',
This should be under TARGET_AARCH64 ? right ?
Thanks,
C.
Quoted 3 lines
hw/arm/meson.build +0
-0'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2400_palmetto.c',
RE: [SPAM] [PATCH v3 04/18] hw/arm/aspeed: Add AST1700 LTPI expander device model
Quoted 134 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Saturday, December 20, 2025 1:00 AM
To: Kane Chen <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>
Subject: Re: [SPAM] [PATCH v3 04/18] hw/arm/aspeed: Add AST1700 LTPI expander device modelQuoted 14 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Introduce a minimal QEMU device model for the ASPEED AST1700, an MCU-less I/O expander used in the LTPI topology defined by the DC-SCM 2.0 specification (see figure 2):
https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-pdfThis initial implementation includes:
* Definition of aspeed.ast1700 as a SysBusDevice
* Setup of a basic memory region to reserve I/O space for future peripheral modeling
Quoted 7 lines
This stub establishes the foundation for LTPI-related device emulation, without implementing any functional peripherals at this stage.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 23 ++++++++++++++++ hw/arm/aspeed_ast1700.c | 48+++++++++++++++++++++++++++++++++
Quoted 14 lines
hw/arm/meson.build | 1 + 3 files changed, 72 insertions(+)create mode 100644
include/hw/arm/aspeed_ast1700.hcreate mode 100644hw/arm/aspeed_ast1700.c(quoted diff) +0
-0
b/include/hw/arm/aspeed_ast1700.hnew file mode 100644 index 0000000000..2a95ebfe89include/hw/arm/aspeed_ast1700.h new file +3
-0@@ -0,0 +1,23 @@ +/* +* ASPEED AST1700 IO Expander +* include/hw/arm/aspeed_ast1700.h line 13
Quoted 10 lines
include/hw/arm/aspeed_ast1700.h new file +10
-0+* Copyright (C) 2025 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef +ASPEED_AST1700_H #define ASPEED_AST1700_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_AST1700 "aspeed.ast1700" + +OBJECT_DECLARE_SIMPLE_TYPE(AspeedAST1700SoCState,
ASPEED_AST1700)Quoted 39 lines
include/hw/arm/aspeed_ast1700.h new file +8
-0+ +struct AspeedAST1700SoCState { +SysBusDevice parent_obj; + +MemoryRegion iomem; +}; + +#endif /* ASPEED_AST1700_H */ hw/arm/aspeed_ast1700.c new renamed from hw/arm/aspeed_ast1700.c +0
-0file mode 100644 index 0000000000..f564b9b242
hw/arm/aspeed_ast1700.c new file +26
-0@@ -0,0 +1,48 @@ +/* +* ASPEED AST1700 IO Expander +* +* Copyright (C) 2025 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "hw/boards.h" +#include "hw/qdev-core.h" +#include "qom/object.h" +#include "hw/arm/aspeed_ast1700.h" + +#define AST2700_SOC_LTPI_SIZE 0x01000000 + +static void aspeed_ast1700_realize (DeviceState *dev,Error **errp) { +AspeedAST1700SoCState *s =ASPEED_AST1700 (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); + +/* Occupy memory space for all controllers in AST1700 */ +memory_region_init (&s->iomem,OBJECT (s),TYPE_ASPEED_AST1700 , +AST2700_SOC_LTPI_SIZE ); +sysbus_init_mmio (sbd, &s->iomem); } + +static void aspeed_ast1700_class_init (ObjectClass *klass,const void +*data) {hw/arm/aspeed_ast1700.c line 36
Quoted 10 lines
hw/arm/aspeed_ast1700.c new file +10
-0+DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = aspeed_ast1700_realize; } + +static const TypeInfo aspeed_ast1700_info = { + .name =TYPE_ASPEED_AST1700 , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (AspeedAST1700SoCState), + .class_init = aspeed_ast1700_class_init, + .abstract = false,You can drop the .abstract assignment.
hw/arm/meson.build arm_common_ss.add(when: 'CONFIG_FSL_IMX31',
Quoted 13 lines
hw/arm/aspeed_ast1700.c new file +8
-0+}; + +static void aspeed_ast1700_register_types (void ) +{ +type_register_static (&aspeed_ast1700_info); +} + +type_init (aspeed_ast1700_register_types);hw/arm/meson.build index renamed from hw/arm/meson.build +0
-0
aeaf654790..ee26a05dc9100644hw/arm/meson.build +0
-0@@ -42,6 +42,7 @@ arm_common_ss.add(when: 'CONFIG_FSL_IMX31',
if_true: files('fsl-imx31.c', 'kzm.chw/arm/meson.build arm_common_ss.add(when: 'CONFIG_FSL_IMX31', · line 42
Quoted 1 line
hw/arm/meson.build +0
-0arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true:files('fsl-imx6.c'))
hw/arm/meson.build arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c · line 45
Quoted 3 lines
hw/arm/meson.build +1
-0arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', + 'aspeed_ast1700.c',
Quoted 5 lines
This should be under
TARGET_AARCH64? right ?Thanks,
C.
Hi Cédric,
Yes, TARGET_AARCH64 should be the correct one for current usage. I will remove the .abstract assignment in the next patch. Thank you.
Best Regards,
Kane
Quoted 4 lines
Quoted 4 lines
hw/arm/meson.build +0
-0'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2400_palmetto.c',
PATCH v3 5/18 hw/arm/aspeed: Integrate AST1700 device into AST27X0
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the AST1700 device as a child of the AST27X0 model to reflect its role in DC-SCM 2.0 LTPI-based architectures. This patch wires the AST1700 device into the platform without introducing functional peripherals.
This forms the base for LTPI expander emulation in QEMU using AST27X0 as the host controller.
--- include/hw/arm/aspeed_soc.h | 7 +++++-- hw/arm/aspeed_ast27x0.c | 26 ++++++++++++++++++-------- 2 files changed, 23 insertions(+), 10 deletions(-)
include/hw/arm/aspeed_soc.h +5 -2
@@ -45,6 +45,7 @@#include "hw/char/serial-mm.h" #include "hw/intc/arm_gicv3.h" #include "hw/misc/aspeed_ltpi.h" +#include "hw/arm/aspeed_ast1700.h" #define VBOOTROM_FILE_NAME "ast27x0_bootrom.bin"
@@ -112,10 +113,10 @@ struct AspeedSoCState {AspeedPWMState pwm;UnimplementedDeviceState espi;UnimplementedDeviceState udc; -UnimplementedDeviceState ltpi;UnimplementedDeviceState jtag[ASPEED_JTAG_NUM ];AspeedAPB2OPBState fsi[2 ];AspeedLTPIState ltpi_ctrl[ASPEED_IOEXP_NUM ]; +AspeedAST1700SoCState ioexp[ASPEED_IOEXP_NUM ]; };#define TYPE_ASPEED_SOC "aspeed-soc"
@@ -178,6 +179,7 @@ struct AspeedSoCClass {int macs_num;int uarts_num;int uarts_base; +int ioexp_num;const int *irqmap;const hwaddr *memmap;uint32_t num_cpus;
@@ -190,7 +192,6 @@ enum {ASPEED_DEV_IOMEM ,ASPEED_DEV_IOMEM0 ,ASPEED_DEV_IOMEM1 , -ASPEED_DEV_LTPI ,ASPEED_DEV_UART0 ,ASPEED_DEV_UART1 , ASPEED_DEV_UART2,
@@ -285,6 +286,8 @@ enum {ASPEED_DEV_IPC1 ,ASPEED_DEV_LTPI_CTRL1 ,ASPEED_DEV_LTPI_CTRL2 , +ASPEED_DEV_LTPI_IO0 , + ASPEED_DEV_LTPI_IO1, };const char *aspeed_soc_cpu_type (const char *const *valid_cpu_types);
hw/arm/aspeed_ast27x0.c +18 -8
@@ -26,7 +26,6 @@#define AST2700_SOC_IO_SIZE 0x00FE0000#define AST2700_SOC_IOMEM_SIZE 0x01000000#define AST2700_SOC_DPMCU_SIZE 0x00040000 -#define AST2700_SOC_LTPI_SIZE 0x01000000static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_VBOOTROM ] =0x00000000 ,
@@ -91,7 +90,8 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_LTPI_CTRL1] = 0x14C34000, [ASPEED_DEV_LTPI_CTRL2] = 0x14C35000, [ASPEED_DEV_WDT] = 0x14C37000, - [ASPEED_DEV_LTPI] = 0x30000000, + [ASPEED_DEV_LTPI_IO0] = 0x30000000, + [ASPEED_DEV_LTPI_IO1] = 0x50000000, [ASPEED_DEV_PCIE_MMIO0] = 0x60000000, [ASPEED_DEV_PCIE_MMIO1] = 0x80000000, [ASPEED_DEV_PCIE_MMIO2] = 0xA0000000,
@@ -563,10 +563,14 @@ static void aspeed_soc_ast2700_init(Object *obj) &s->ltpi_ctrl[i], TYPE_ASPEED_LTPI); } +for (i =0 ; i < sc->ioexp_num; i++) { +/* AST1700 IOEXP */ +object_initialize_child (obj,"ioexp[*]" , &s->ioexp[i], +TYPE_ASPEED_AST1700 ); + } +object_initialize_child (obj,"dpmcu" , &s->dpmcu,TYPE_UNIMPLEMENTED_DEVICE ); -object_initialize_child (obj,"ltpi" , &s->ltpi, -TYPE_UNIMPLEMENTED_DEVICE );object_initialize_child (obj,"iomem" , &s->iomem,TYPE_UNIMPLEMENTED_DEVICE ); object_initialize_child(obj, "iomem0", &s->iomem0,
@@ -1068,14 +1072,19 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (ltpi_ctrl),0 , ltpi_base); } +/* IO Expander */ +for (i =0 ; i < sc->ioexp_num; i++) { +if (!sysbus_realize (SYS_BUS_DEVICE (&s->ioexp[i]), errp)) { +return ; + } +sysbus_mmio_map (SYS_BUS_DEVICE (&s->ioexp[i]),0 , + sc->memmap[ASPEED_DEV_LTPI_IO0 + i]); + } +aspeed_mmio_map_unimplemented (s->memory,SYS_BUS_DEVICE (&s->dpmcu),"aspeed.dpmcu" , sc->memmap[ASPEED_DEV_DPMCU ],AST2700_SOC_DPMCU_SIZE ); -aspeed_mmio_map_unimplemented (s->memory,SYS_BUS_DEVICE (&s->ltpi), -"aspeed.ltpi" , - sc->memmap[ASPEED_DEV_LTPI ], -AST2700_SOC_LTPI_SIZE ); aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->iomem), "aspeed.io", sc->memmap[ASPEED_DEV_IOMEM],
@@ -1143,6 +1152,7 @@ static void aspeed_soc_ast2700a1_class_init(ObjectClass *oc, const void *data) sc->macs_num =3 ; sc->uarts_num =13 ; sc->num_cpus =4 ; + sc->ioexp_num =2 ; sc->uarts_base =ASPEED_DEV_UART0 ; sc->irqmap = aspeed_soc_ast2700a1_irqmap; sc->memmap = aspeed_soc_ast2700_memmap;
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 05/18] hw/arm/aspeed: Integrate AST1700 device into AST27X0
Quoted 7 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the AST1700 device as a child of the AST27X0 model to reflect its role in DC-SCM 2.0 LTPI-based architectures. This patch wires the AST1700 device into the platform without introducing functional peripherals.
Quoted 8 lines
This forms the base for LTPI expander emulation in QEMU using AST27X0 as the host controller.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_soc.h | 7 +++++-- hw/arm/aspeed_ast27x0.c | 26 ++++++++++++++++++-------- 2 files changed, 23 insertions(+), 10 deletions(-)
Thanks,
C.
PATCH v3 6/18 hw/arm/aspeed: Integrate interrupt controller for AST1700
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the AST1700 interrupt lines to the GIC in AST27X0, enabling the propagation of AST1700-originated interrupts to the host SoC.
This patch does not implement interrupt sources in AST1700 itself, only the wiring into AST27X0.
--- include/hw/arm/aspeed_soc.h | 6 +++- include/hw/intc/aspeed_intc.h | 2 ++ hw/arm/aspeed_ast27x0.c | 37 +++++++++++++++++++++ hw/intc/aspeed_intc.c | 60 +++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 1 deletion(-)
include/hw/arm/aspeed_soc.h +5 -1
@@ -58,6 +58,7 @@#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2#define ASPEED_PCIE_NUM 3 +#define ASPEED_INTC_NUM 2#define ASPEED_IOEXP_NUM 2struct AspeedSoCState {
@@ -146,7 +147,8 @@ struct Aspeed27x0SoCState {AspeedSoCState parent;ARMCPU cpu[ASPEED_CPUS_NUM ]; -AspeedINTCState intc[2 ]; +AspeedINTCState intc[ASPEED_INTC_NUM ]; +AspeedINTCState intcioexp[ASPEED_IOEXP_NUM ];GICv3State gic;MemoryRegion dram_empty; };
@@ -288,6 +290,8 @@ enum {ASPEED_DEV_LTPI_CTRL2 ,ASPEED_DEV_LTPI_IO0 ,ASPEED_DEV_LTPI_IO1 , +ASPEED_DEV_IOEXP0_INTCIO , + ASPEED_DEV_IOEXP1_INTCIO, };const char *aspeed_soc_cpu_type (const char *const *valid_cpu_types);
include/hw/intc/aspeed_intc.h +2 -0
@@ -15,6 +15,8 @@#define TYPE_ASPEED_INTC "aspeed.intc"#define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"#define TYPE_ASPEED_2700_INTCIO TYPE_ASPEED_INTC "io-ast2700" +#define TYPE_ASPEED_2700_INTCIOEXP1 TYPE_ASPEED_INTC "ast2700-ioexp1" +#define TYPE_ASPEED_2700_INTCIOEXP2 TYPE_ASPEED_INTC "ast2700-ioexp2"#define TYPE_ASPEED_2700SSP_INTC TYPE_ASPEED_INTC "-ast2700ssp"#define TYPE_ASPEED_2700SSP_INTCIO TYPE_ASPEED_INTC "io-ast2700ssp"#define TYPE_ASPEED_2700TSP_INTC TYPE_ASPEED_INTC "-ast2700tsp"
hw/arm/aspeed_ast27x0.c +37 -0
@@ -91,7 +91,9 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_LTPI_CTRL2] = 0x14C35000, [ASPEED_DEV_WDT] = 0x14C37000, [ASPEED_DEV_LTPI_IO0] = 0x30000000, + [ASPEED_DEV_IOEXP0_INTCIO] = 0x30C18000, [ASPEED_DEV_LTPI_IO1] = 0x50000000, + [ASPEED_DEV_IOEXP1_INTCIO] = 0x50C18000, [ASPEED_DEV_PCIE_MMIO0] = 0x60000000, [ASPEED_DEV_PCIE_MMIO1] = 0x80000000, [ASPEED_DEV_PCIE_MMIO2] = 0xA0000000,
@@ -511,6 +513,10 @@ static void aspeed_soc_ast2700_init(Object *obj)object_initialize_child (obj,"intc" , &a->intc[0 ],TYPE_ASPEED_2700_INTC );object_initialize_child (obj,"intcio" , &a->intc[1 ],TYPE_ASPEED_2700_INTCIO ); +object_initialize_child (obj,"intcioexp0" , &a->intcioexp[0 ], +TYPE_ASPEED_2700_INTCIOEXP1 ); +object_initialize_child (obj,"intcioexp1" , &a->intcioexp[1 ], +TYPE_ASPEED_2700_INTCIOEXP2 );snprintf (typename,sizeof (typename),"aspeed.adc-%s" , socname);object_initialize_child (obj,"adc" , &s->adc, typename);
@@ -755,6 +761,22 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (&a->intc[1 ]),0 , sc->memmap[ASPEED_DEV_INTCIO ]); +/* INTCIOEXP0 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intcioexp[0 ]), errp)) { +return ; + } + +aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (&a->intcioexp[0 ]),0 , + sc->memmap[ASPEED_DEV_IOEXP0_INTCIO ]); + +/* INTCIOEXP1 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intcioexp[1 ]), errp)) { +return ; + } + +aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (&a->intcioexp[1 ]),0 , + sc->memmap[ASPEED_DEV_IOEXP1_INTCIO ]); +/* irq sources -> orgates -> INTC */ for (i =0 ; i < ic->num_inpins; i++) { qdev_connect_gpio_out(DEVICE(&a->intc[0].orgates[i]), 0,
@@ -1079,6 +1101,21 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) }sysbus_mmio_map (SYS_BUS_DEVICE (&s->ioexp[i]),0 , sc->memmap[ASPEED_DEV_LTPI_IO0 + i]); + + icio =ASPEED_INTC_GET_CLASS (&a->intc[2 + i]); +/* INTC_IOEXP internal: orgate[i] -> input[i] */ +for (int j =0 ; j < icio->num_inpins; j++) { + irq =qdev_get_gpio_in (DEVICE (&a->intcioexp[i]), j); +qdev_connect_gpio_out (DEVICE (&a->intcioexp[i].orgates[j]),0 , + irq); + } + +/* INTC_IOEXP output[i] -> INTC0.orgate[0].input[i] */ +for (int j =0 ; j < icio->num_outpins; j++) { + irq =qdev_get_gpio_in (DEVICE (&a->intc[0 ].orgates[0 ]), j); +sysbus_connect_irq (SYS_BUS_DEVICE (&a->intcioexp[i]), j, + irq); + } } aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu),
hw/intc/aspeed_intc.c +60 -0
72 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v3 06/18] hw/arm/aspeed: Integrate interrupt controller for AST1700
Quoted 110 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Connect the AST1700 interrupt lines to the GIC in AST27X0, enabling the propagation of AST1700-originated interrupts to the host SoC.
This patch does not implement interrupt sources in AST1700 itself, only the wiring into AST27X0.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_soc.h | 6 +++- include/hw/intc/aspeed_intc.h | 2 ++ hw/arm/aspeed_ast27x0.c | 37 +++++++++++++++++++++ hw/intc/aspeed_intc.c | 60 +++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 1 deletion(-)include/hw/arm/aspeed_soc.h +5
-1@@ -58,6 +58,7 @@#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2#define ASPEED_PCIE_NUM 3 +#define ASPEED_INTC_NUM 2#define ASPEED_IOEXP_NUM 2struct AspeedSoCState {@@ -146,7 +147,8 @@ struct Aspeed27x0SoCState {AspeedSoCState parent;ARMCPU cpu[ASPEED_CPUS_NUM ]; -AspeedINTCState intc[2 ]; +AspeedINTCState intc[ASPEED_INTC_NUM ]; +AspeedINTCState intcioexp[ASPEED_IOEXP_NUM ];GICv3State gic;MemoryRegion dram_empty; };@@ -288,6 +290,8 @@ enum {ASPEED_DEV_LTPI_CTRL2 ,ASPEED_DEV_LTPI_IO0 ,ASPEED_DEV_LTPI_IO1 , +ASPEED_DEV_IOEXP0_INTCIO , + ASPEED_DEV_IOEXP1_INTCIO, };const char *aspeed_soc_cpu_type (const char *const *valid_cpu_types);include/hw/intc/aspeed_intc.h +2
-0@@ -15,6 +15,8 @@#define TYPE_ASPEED_INTC "aspeed.intc"#define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"#define TYPE_ASPEED_2700_INTCIO TYPE_ASPEED_INTC "io-ast2700" +#define TYPE_ASPEED_2700_INTCIOEXP1 TYPE_ASPEED_INTC "ast2700-ioexp1" +#define TYPE_ASPEED_2700_INTCIOEXP2 TYPE_ASPEED_INTC "ast2700-ioexp2"#define TYPE_ASPEED_2700SSP_INTC TYPE_ASPEED_INTC "-ast2700ssp"#define TYPE_ASPEED_2700SSP_INTCIO TYPE_ASPEED_INTC "io-ast2700ssp"#define TYPE_ASPEED_2700TSP_INTC TYPE_ASPEED_INTC "-ast2700tsp"hw/arm/aspeed_ast27x0.c +22
-0@@ -91,7 +91,9 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_LTPI_CTRL2] = 0x14C35000, [ASPEED_DEV_WDT] = 0x14C37000, [ASPEED_DEV_LTPI_IO0] = 0x30000000, + [ASPEED_DEV_IOEXP0_INTCIO] = 0x30C18000, [ASPEED_DEV_LTPI_IO1] = 0x50000000, + [ASPEED_DEV_IOEXP1_INTCIO] = 0x50C18000, [ASPEED_DEV_PCIE_MMIO0] = 0x60000000, [ASPEED_DEV_PCIE_MMIO1] = 0x80000000, [ASPEED_DEV_PCIE_MMIO2] = 0xA0000000,@@ -511,6 +513,10 @@ static void aspeed_soc_ast2700_init(Object *obj)object_initialize_child (obj,"intc" , &a->intc[0 ],TYPE_ASPEED_2700_INTC );object_initialize_child (obj,"intcio" , &a->intc[1 ],TYPE_ASPEED_2700_INTCIO ); +object_initialize_child (obj,"intcioexp0" , &a->intcioexp[0 ], +TYPE_ASPEED_2700_INTCIOEXP1 ); +object_initialize_child (obj,"intcioexp1" , &a->intcioexp[1 ], +TYPE_ASPEED_2700_INTCIOEXP2 );snprintf (typename,sizeof (typename),"aspeed.adc-%s" , socname);object_initialize_child (obj,"adc" , &s->adc, typename);@@ -755,6 +761,22 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (&a->intc[1 ]),0 , sc->memmap[ASPEED_DEV_INTCIO ]); +/* INTCIOEXP0 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intcioexp[0 ]), errp)) { +return ; + } + +aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (&a->intcioexp[0 ]),0 , + sc->memmap[ASPEED_DEV_IOEXP0_INTCIO ]); + +/* INTCIOEXP1 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intcioexp[1 ]), errp)) { +return ; + } + +aspeed_mmio_map (s->memory,SYS_BUS_DEVICE (&a->intcioexp[1 ]),0 , + sc->memmap[ASPEED_DEV_IOEXP1_INTCIO ]); +/* irq sources -> orgates -> INTC */ for (i =0 ; i < ic->num_inpins; i++) { qdev_connect_gpio_out(DEVICE(&a->intc[0].orgates[i]), 0,
hw/arm/aspeed_ast27x0.c static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) · line 1105
Quoted 5 lines
hw/arm/aspeed_ast27x0.c +2
-0@@ -1079,6 +1101,21 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) }sysbus_mmio_map (SYS_BUS_DEVICE (&s->ioexp[i]),0 , sc->memmap[ASPEED_DEV_LTPI_IO0 + i]); + + icio =ASPEED_INTC_GET_CLASS (&a->intc[2 + i]);
I'm seeing this fail qtest locally:
runtime error: index 3 out of bounds for type 'AspeedINTCState[2]' (aka 'struct AspeedINTCState[2]')
Presumably, it's because even though we use ASPEED_INTC_NUM to declare soc->intc, it's only
declaring 2 of them. Should we declare more controllers in intc?
Thanks,
Nabih
Quoted 98 lines
hw/arm/aspeed_ast27x0.c +13
-0+/* INTC_IOEXP internal: orgate[i] -> input[i] */ +for (int j =0 ; j < icio->num_inpins; j++) { + irq =qdev_get_gpio_in (DEVICE (&a->intcioexp[i]), j); +qdev_connect_gpio_out (DEVICE (&a->intcioexp[i].orgates[j]),0 , + irq); + } + +/* INTC_IOEXP output[i] -> INTC0.orgate[0].input[i] */ +for (int j =0 ; j < icio->num_outpins; j++) { + irq =qdev_get_gpio_in (DEVICE (&a->intc[0 ].orgates[0 ]), j); +sysbus_connect_irq (SYS_BUS_DEVICE (&a->intcioexp[i]), j, + irq); + } } aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu),hw/intc/aspeed_intc.c +60
-1@@ -924,6 +924,64 @@ static const TypeInfo aspeed_2700_intc_info = { .class_init = aspeed_2700_intc_class_init, }; +static AspeedINTCIRQ aspeed_2700_intcioexp2_irqs[ASPEED_INTC_MAX_INPINS ] = { + {0 ,8 ,1 ,R_GICINT192_EN ,R_GICINT192_STATUS }, + {1 ,9 ,1 ,R_GICINT193_EN ,R_GICINT193_STATUS }, +}; + +static void aspeed_2700_intcioexp2_class_init (ObjectClass *klass, +const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedINTCClass *aic =ASPEED_INTC_CLASS (klass); + + dc->desc ="ASPEED 2700 IOEXP2 INTC Controller" ; + aic->num_lines =32 ; + aic->num_inpins =2 ; + aic->num_outpins =10 ; + aic->mem_size =0x400 ; + aic->nr_regs =0x58 >>2 ; + aic->reg_offset =0x100 ; + aic->reg_ops = &aspeed_intcio_ops; + aic->irq_table = aspeed_2700_intcioexp2_irqs; + aic->irq_table_count =ARRAY_SIZE (aspeed_2700_intcioexp2_irqs); +} + +static const TypeInfo aspeed_2700_intcioexp2_info = { + .name =TYPE_ASPEED_2700_INTCIOEXP2 , + .parent =TYPE_ASPEED_INTC , + .class_init = aspeed_2700_intcioexp2_class_init, +}; + +static AspeedINTCIRQ aspeed_2700_intcioexp1_irqs[ASPEED_INTC_MAX_INPINS ] = { + {0 ,6 ,1 ,R_GICINT192_EN ,R_GICINT192_STATUS }, + {1 ,7 ,1 ,R_GICINT193_EN ,R_GICINT193_STATUS }, +}; + +static void aspeed_2700_intcioexp1_class_init (ObjectClass *klass, +const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedINTCClass *aic =ASPEED_INTC_CLASS (klass); + + dc->desc ="ASPEED 2700 IOEXP1 INTC Controller" ; + aic->num_lines =32 ; + aic->num_inpins =2 ; + aic->num_outpins =10 ; + aic->mem_size =0x400 ; + aic->nr_regs =0x58 >>2 ; + aic->reg_offset =0x100 ; + aic->reg_ops = &aspeed_intcio_ops; + aic->irq_table = aspeed_2700_intcioexp1_irqs; + aic->irq_table_count =ARRAY_SIZE (aspeed_2700_intcioexp1_irqs); +} + +static const TypeInfo aspeed_2700_intcioexp1_info = { + .name =TYPE_ASPEED_2700_INTCIOEXP1 , + .parent =TYPE_ASPEED_INTC , + .class_init = aspeed_2700_intcioexp1_class_init, +}; +static AspeedINTCIRQ aspeed_2700_intcio_irqs[ASPEED_INTC_MAX_INPINS ] = { {0 ,0 ,1 ,R_GICINT192_EN ,R_GICINT192_STATUS }, {1 ,1 ,1 ,R_GICINT193_EN ,R_GICINT193_STATUS },@@ -1099,6 +1157,8 @@ static void aspeed_intc_register_types(void)type_register_static (&aspeed_intc_info);type_register_static (&aspeed_2700_intc_info);type_register_static (&aspeed_2700_intcio_info); +type_register_static (&aspeed_2700_intcioexp1_info); +type_register_static (&aspeed_2700_intcioexp2_info);type_register_static (&aspeed_2700ssp_intc_info);type_register_static (&aspeed_2700ssp_intcio_info);type_register_static (&aspeed_2700tsp_intc_info); --2.43.0
RE: [PATCH v3 06/18] hw/arm/aspeed: Integrate interrupt controller for AST1700
Quoted 149 lines
-----Original Message-----
From: Nabih Estefan <[email protected]>
Sent: Tuesday, December 9, 2025 5:04 AM
To: Kane Chen <[email protected]>
Cc: Cédric Le Goater <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>; Troy Lee <[email protected]>
Subject: Re: [PATCH v3 06/18] hw/arm/aspeed: Integrate interrupt controller for AST1700Quoted 9 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Connect the AST1700 interrupt lines to the GIC in AST27X0, enabling the propagation of AST1700-originated interrupts to the host SoC.
This patch does not implement interrupt sources in AST1700 itself, only the wiring into AST27X0.
Quoted 6 lines
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_soc.h | 6 +++- include/hw/intc/aspeed_intc.h | 2 ++ hw/arm/aspeed_ast27x0.c | 37 +++++++++++++++++++++ hw/intc/aspeed_intc.c | 60+++++++++++++++++++++++++++++++++++
Quoted 38 lines
4 files changed, 104 insertions(+), 1 deletion(-)include/hw/arm/aspeed_soc.h +5
-1@@ -58,6 +58,7 @@#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2#define ASPEED_PCIE_NUM 3 +#define ASPEED_INTC_NUM 2#define ASPEED_IOEXP_NUM 2struct AspeedSoCState {@@ -146,7 +147,8 @@ struct Aspeed27x0SoCState {AspeedSoCState parent;ARMCPU cpu[ASPEED_CPUS_NUM ]; -AspeedINTCState intc[2 ]; +AspeedINTCState intc[ASPEED_INTC_NUM ]; +AspeedINTCState intcioexp[ASPEED_IOEXP_NUM ];GICv3State gic;MemoryRegion dram_empty; };@@ -288,6 +290,8 @@ enum {ASPEED_DEV_LTPI_CTRL2 ,ASPEED_DEV_LTPI_IO0 ,ASPEED_DEV_LTPI_IO1 , +ASPEED_DEV_IOEXP0_INTCIO , + ASPEED_DEV_IOEXP1_INTCIO, };const char *aspeed_soc_cpu_type (const char *const *valid_cpu_types);(quoted diff) +0
-0
b/include/hw/intc/aspeed_intc.hindex51288384a5..4565bbab84100644include/hw/intc/aspeed_intc.h line 18
Quoted 4 lines
include/hw/intc/aspeed_intc.h +1
-0@@ -15,6 +15,8 @@#define TYPE_ASPEED_INTC "aspeed.intc"#define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"#define TYPE_ASPEED_2700_INTCIO TYPE_ASPEED_INTC "io-ast2700" +#define TYPE_ASPEED_2700_INTCIOEXP1 TYPE_ASPEED_INTC"ast2700-ioexp1"
include/hw/intc/aspeed_intc.h line 19
Quoted 1 line
include/hw/intc/aspeed_intc.h +1
-0+#define TYPE_ASPEED_2700_INTCIOEXP2 TYPE_ASPEED_INTC"ast2700-ioexp2"
include/hw/intc/aspeed_intc.h line 21
Quoted 2 lines
include/hw/intc/aspeed_intc.h +0
-0#define TYPE_ASPEED_2700SSP_INTC TYPE_ASPEED_INTC "-ast2700ssp"#define TYPE_ASPEED_2700SSP_INTCIO TYPE_ASPEED_INTC"io-ast2700ssp"
hw/arm/aspeed_ast27x0.c static const hwaddr aspeed_soc_ast2700_memmap[]
Quoted 6 lines
include/hw/intc/aspeed_intc.h +0
-0#define TYPE_ASPEED_2700TSP_INTC TYPE_ASPEED_INTC "-ast2700tsp"hw/arm/aspeed_ast27x0.c index renamed from hw/arm/aspeed_ast27x0.c +0
-0
7d3bede39d..33800dffc5100644hw/arm/aspeed_ast27x0.c +0
-0@@ -91,7 +91,9 @@ static const hwaddr aspeed_soc_ast2700_memmap[]= {
hw/arm/aspeed_ast27x0.c static const hwaddr aspeed_soc_ast2700_memmap[] = {
Quoted 9 lines
hw/arm/aspeed_ast27x0.c +2
-0[ASPEED_DEV_LTPI_CTRL2] = 0x14C35000, [ASPEED_DEV_WDT] = 0x14C37000, [ASPEED_DEV_LTPI_IO0] = 0x30000000, + [ASPEED_DEV_IOEXP0_INTCIO] = 0x30C18000, [ASPEED_DEV_LTPI_IO1] = 0x50000000, + [ASPEED_DEV_IOEXP1_INTCIO] = 0x50C18000, [ASPEED_DEV_PCIE_MMIO0] = 0x60000000, [ASPEED_DEV_PCIE_MMIO1] = 0x80000000, [ASPEED_DEV_PCIE_MMIO2] = 0xA0000000, @@ -511,6 +513,10@@ static
Quoted 2 lines
void
aspeed_soc_ast2700_init(Object *obj)object_initialize_child(obj, "intc", &a->intc[0],
TYPE_ASPEED_2700_INTC);hw/arm/aspeed_ast27x0.c static void aspeed_soc_ast2700_init(Object *obj)
Quoted 10 lines
object_initialize_child(obj, "intcio", &a->intc[1], TYPE_ASPEED_2700_INTCIO);hw/arm/aspeed_ast27x0.c +5
-0+object_initialize_child (obj,"intcioexp0" , &a->intcioexp[0 ], +TYPE_ASPEED_2700_INTCIOEXP1 ); +object_initialize_child (obj,"intcioexp1" , &a->intcioexp[1 ], +TYPE_ASPEED_2700_INTCIOEXP2 );snprintf (typename,sizeof (typename),"aspeed.adc-%s" , socname); object_initialize_child(obj, "adc", &s->adc, typename); @@ -755,6 +761,22 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev,Error **errp)
hw/arm/aspeed_ast27x0.c static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
Quoted 9 lines
aspeed_mmio_map(s->memory, SYS_BUS_DEVICE(&a->intc[1]), 0, sc->memmap[ASPEED_DEV_INTCIO]);hw/arm/aspeed_ast27x0.c +6
-0+/* INTCIOEXP0 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intcioexp[0 ]), errp)) { +return ; + } + + aspeed_mmio_map(s->memory, SYS_BUS_DEVICE(&a->intcioexp[0]),0,
hw/arm/aspeed_ast27x0.c static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
Quoted 8 lines
hw/arm/aspeed_ast27x0.c +8
-0+ sc->memmap[ASPEED_DEV_IOEXP0_INTCIO]); + +/* INTCIOEXP1 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intcioexp[1 ]), errp)) { +return ; + } + + aspeed_mmio_map(s->memory, SYS_BUS_DEVICE(&a->intcioexp[1]),0,
hw/arm/aspeed_ast27x0.c static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
Quoted 6 lines
hw/arm/aspeed_ast27x0.c +2
-1+ sc->memmap[ASPEED_DEV_IOEXP1_INTCIO]); +/* irq sources -> orgates -> INTC */ for (i =0 ; i < ic->num_inpins; i++) { qdev_connect_gpio_out(DEVICE(&a->intc[0].orgates[i]), 0, @@ -1079,6 +1101,21 @@ static void aspeed_soc_ast2700_realize(DeviceState*dev, Error **errp)
hw/arm/aspeed_ast27x0.c static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) · line 1105
Quoted 5 lines
} sysbus_mmio_map(SYS_BUS_DEVICE(&s->ioexp[i]), 0, sc->memmap[ASPEED_DEV_LTPI_IO0 + i]);hw/arm/aspeed_ast27x0.c +2
-0+ + icio =ASPEED_INTC_GET_CLASS (&a->intc[2 + i]);I'm seeing this fail qtest locally:
runtime error: index 3 out of bounds for type 'AspeedINTCState[2]' (aka 'struct AspeedINTCState[2]')
Presumably, it's because even though we useASPEED_INTC_NUMto declaresoc->intc, it's only declaring 2 of them. Should we declare more controllers in intc?
Quoted 2 lines
Thanks,
Nabih
The correct code segment should be:
icio = ASPEED_INTC_GET_CLASS(&a->intcioexp[i]);
Thank you for pointing this out. I will update the fix in the next patch.
Best Regards,
Kane
Quoted 102 lines
hw/arm/aspeed_ast27x0.c static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
Quoted 6 lines
hw/arm/aspeed_ast27x0.c +4
-0+/* INTC_IOEXP internal: orgate[i] -> input[i] */ +for (int j =0 ; j < icio->num_inpins; j++) { + irq =qdev_get_gpio_in (DEVICE (&a->intcioexp[i]), j); + qdev_connect_gpio_out(DEVICE(&a->intcioexp[i].orgates[j]),0,
Quoted 17 lines
hw/arm/aspeed_ast27x0.c +9
-0+ irq); + } + +/* INTC_IOEXP output[i] -> INTC0.orgate[0].input[i] */ +for (int j =0 ; j < icio->num_outpins; j++) { + irq =qdev_get_gpio_in (DEVICE (&a->intc[0 ].orgates[0 ]), j); +sysbus_connect_irq (SYS_BUS_DEVICE (&a->intcioexp[i]), j, + irq); + } } aspeed_mmio_map_unimplemented(s->memory,
SYS_BUS_DEVICE(&s->dpmcu), diff --gita/hw/intc/aspeed_intc.cb/hw/intc/aspeed_intc.cindex5cd786dee6..a04005ee7c100644hw/intc/aspeed_intc.c static const TypeInfo aspeed_2700_intc_info = { · line 926
Quoted 3 lines
hw/intc/aspeed_intc.c +1
-0@@ -924,6 +924,64 @@ static const TypeInfo aspeed_2700_intc_info = { .class_init = aspeed_2700_intc_class_init, }; +static AspeedINTCIRQaspeed_2700_intcioexp2_irqs[ASPEED_INTC_MAX_INPINS] = {
hw/intc/aspeed_intc.c static const TypeInfo aspeed_2700_intc_info = { · line 933
Quoted 5 lines
hw/intc/aspeed_intc.c +5
-0+ {0, 8, 1, R_GICINT192_EN, R_GICINT192_STATUS}, + {1, 9, 1, R_GICINT193_EN, R_GICINT193_STATUS}, }; + +static void aspeed_2700_intcioexp2_class_init (ObjectClass *klass, +const void *data){
Quoted 12 lines
hw/intc/aspeed_intc.c +12
-0+DeviceClass *dc =DEVICE_CLASS (klass); +AspeedINTCClass *aic =ASPEED_INTC_CLASS (klass); + + dc->desc ="ASPEED 2700 IOEXP2 INTC Controller" ; + aic->num_lines =32 ; + aic->num_inpins =2 ; + aic->num_outpins =10 ; + aic->mem_size =0x400 ; + aic->nr_regs =0x58 >>2 ; + aic->reg_offset =0x100 ; + aic->reg_ops = &aspeed_intcio_ops; + aic->irq_table = aspeed_2700_intcioexp2_irqs;hw/intc/aspeed_intc.c static const TypeInfo aspeed_2700_intc_info = {
Quoted 10 lines
hw/intc/aspeed_intc.c +10
-0+ aic->irq_table_count =ARRAY_SIZE (aspeed_2700_intcioexp2_irqs); +} + +static const TypeInfo aspeed_2700_intcioexp2_info = { + .name =TYPE_ASPEED_2700_INTCIOEXP2 , + .parent =TYPE_ASPEED_INTC , + .class_init = aspeed_2700_intcioexp2_class_init, +}; + +static AspeedINTCIRQaspeed_2700_intcioexp1_irqs[ASPEED_INTC_MAX_INPINS] = {
hw/intc/aspeed_intc.c static const TypeInfo aspeed_2700_intc_info = { · line 962
Quoted 5 lines
hw/intc/aspeed_intc.c +5
-0+ {0, 6, 1, R_GICINT192_EN, R_GICINT192_STATUS}, + {1, 7, 1, R_GICINT193_EN, R_GICINT193_STATUS}, }; + +static void aspeed_2700_intcioexp1_class_init (ObjectClass *klass, +const void *data){
Quoted 12 lines
hw/intc/aspeed_intc.c +12
-0+DeviceClass *dc =DEVICE_CLASS (klass); +AspeedINTCClass *aic =ASPEED_INTC_CLASS (klass); + + dc->desc ="ASPEED 2700 IOEXP1 INTC Controller" ; + aic->num_lines =32 ; + aic->num_inpins =2 ; + aic->num_outpins =10 ; + aic->mem_size =0x400 ; + aic->nr_regs =0x58 >>2 ; + aic->reg_offset =0x100 ; + aic->reg_ops = &aspeed_intcio_ops; + aic->irq_table = aspeed_2700_intcioexp1_irqs;hw/intc/aspeed_intc.c static const TypeInfo aspeed_2700_intc_info = {
Quoted 10 lines
hw/intc/aspeed_intc.c +9
-0+ aic->irq_table_count =ARRAY_SIZE (aspeed_2700_intcioexp1_irqs); +} + +static const TypeInfo aspeed_2700_intcioexp1_info = { + .name =TYPE_ASPEED_2700_INTCIOEXP1 , + .parent =TYPE_ASPEED_INTC , + .class_init = aspeed_2700_intcioexp1_class_init, +}; + static AspeedINTCIRQaspeed_2700_intcio_irqs[ASPEED_INTC_MAX_INPINS] = {
hw/intc/aspeed_intc.c static const TypeInfo aspeed_2700_intc_info = { · line 982
Quoted 2 lines
hw/intc/aspeed_intc.c +0
-0{0, 0, 1, R_GICINT192_EN, R_GICINT192_STATUS}, {1, 1, 1, R_GICINT193_EN, R_GICINT193_STATUS}, @@ -1099,6+1157,8
Quoted 13 lines
hw/intc/aspeed_intc.c +2
-1@@ static void aspeed_intc_register_types(void) type_register_static(&aspeed_intc_info);type_register_static (&aspeed_2700_intc_info);type_register_static (&aspeed_2700_intcio_info); +type_register_static (&aspeed_2700_intcioexp1_info); +type_register_static (&aspeed_2700_intcioexp2_info);type_register_static (&aspeed_2700ssp_intc_info);type_register_static (&aspeed_2700ssp_intcio_info);type_register_static (&aspeed_2700tsp_intc_info); --2.43.0
Re: [PATCH v3 06/18] hw/arm/aspeed: Integrate interrupt controller for AST1700
Quoted 13 lines
Quoted 13 lines
hw/arm/aspeed_ast27x0.c static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) · line 1105
Quoted 5 lines
} sysbus_mmio_map(SYS_BUS_DEVICE(&s->ioexp[i]), 0, sc->memmap[ASPEED_DEV_LTPI_IO0 + i]);hw/arm/aspeed_ast27x0.c +2
-0+ + icio =ASPEED_INTC_GET_CLASS (&a->intc[2 + i]);I'm seeing this fail qtest locally:
runtime error: index 3 out of bounds for type 'AspeedINTCState[2]' (aka 'struct AspeedINTCState[2]')
Presumably, it's because even though we useASPEED_INTC_NUMto declaresoc->intc, it's only declaring 2 of them. Should we declare more controllers in intc?
Quoted 7 lines
Quoted 2 lines
Thanks,
NabihThe correct code segment should be:
icio = ASPEED_INTC_GET_CLASS(&a->intcioexp[i]);Thank you for pointing this out. I will update the fix in the next patch.
Compiling with clang also detects the problem. I merged your fix in my branch and the rest seems fine. Please wait a bit before resending.
Thanks,
C.
PATCH v3 7/18 hw/arm/aspeed: Attach LTPI controller to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the LTPI controller to the AST1700 model by mapping its MMIO region.
--- include/hw/arm/aspeed_ast1700.h | 3 +++ hw/arm/aspeed_ast1700.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+)
include/hw/arm/aspeed_ast1700.h +3 -0
@@ -9,6 +9,7 @@#define ASPEED_AST1700_H #include "hw/sysbus.h" +#include "hw/misc/aspeed_ltpi.h" #define TYPE_ASPEED_AST1700 "aspeed.ast1700"
@@ -18,6 +19,8 @@ struct AspeedAST1700SoCState {SysBusDevice parent_obj;MemoryRegion iomem; + + AspeedLTPIState ltpi; };#endif /* ASPEED_AST1700_H */
hw/arm/aspeed_ast1700.c +27 -0
@@ -14,6 +14,14 @@#define AST2700_SOC_LTPI_SIZE 0x01000000 +enum { +ASPEED_AST1700_DEV_LTPI_CTRL , +}; + +static const hwaddr aspeed_ast1700_io_memmap[] = { + [ASPEED_AST1700_DEV_LTPI_CTRL ] =0x00C34000 , +}; +static void aspeed_ast1700_realize (DeviceState *dev,Error **errp) {AspeedAST1700SoCState *s =ASPEED_AST1700 (dev);
@@ -23,6 +31,24 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp)memory_region_init (&s->iomem,OBJECT (s),TYPE_ASPEED_AST1700 ,AST2700_SOC_LTPI_SIZE );sysbus_init_mmio (sbd, &s->iomem); + +/* LTPI controller */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_LTPI_CTRL ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->ltpi),0 )); +} + +static void aspeed_ast1700_instance_init (Object *obj) +{ +AspeedAST1700SoCState *s =ASPEED_AST1700 (obj); + +/* LTPI controller */ +object_initialize_child (obj,"ltpi-ctrl" , + &s->ltpi,TYPE_ASPEED_LTPI ); +return ; }static void aspeed_ast1700_class_init (ObjectClass *klass,const void *data)
@@ -37,6 +63,7 @@ static const TypeInfo aspeed_ast1700_info = { .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(AspeedAST1700SoCState), .class_init = aspeed_ast1700_class_init, + .instance_init = aspeed_ast1700_instance_init, .abstract = false, };
Signature · 1 line
2.43.0
PATCH v3 8/18 hw/arm/aspeed: Attach UART device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the UART controller to the AST1700 model by mapping its MMIO region.
--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+)
include/hw/arm/aspeed_ast1700.h +2 -0
@@ -10,6 +10,7 @@#include "hw/sysbus.h" #include "hw/misc/aspeed_ltpi.h" +#include "hw/char/serial-mm.h" #define TYPE_ASPEED_AST1700 "aspeed.ast1700"
@@ -21,6 +22,7 @@ struct AspeedAST1700SoCState {MemoryRegion iomem;AspeedLTPIState ltpi; + SerialMM uart; };#endif /* ASPEED_AST1700_H */
hw/arm/aspeed_ast1700.c +18 -0
@@ -10,15 +10,18 @@#include "hw/boards.h" #include "hw/qdev-core.h" #include "qom/object.h" +#include "hw/qdev-properties.h" #include "hw/arm/aspeed_ast1700.h" #define AST2700_SOC_LTPI_SIZE 0x01000000enum { +ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , };static const hwaddr aspeed_ast1700_io_memmap[] = { + [ASPEED_AST1700_DEV_UART12 ] =0x00C33B00 , [ASPEED_AST1700_DEV_LTPI_CTRL ] =0x00C34000 , };
@@ -32,6 +35,17 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) AST2700_SOC_LTPI_SIZE);sysbus_init_mmio (sbd, &s->iomem); +/* UART */ +qdev_prop_set_uint8 (DEVICE (&s->uart),"regshift" ,2 ); +qdev_prop_set_uint32 (DEVICE (&s->uart),"baudbase" ,38400 ); +qdev_prop_set_uint8 (DEVICE (&s->uart),"endianness" ,DEVICE_LITTLE_ENDIAN ); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->uart), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_UART12 ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->uart),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;
@@ -45,6 +59,10 @@ static void aspeed_ast1700_instance_init(Object *obj) {AspeedAST1700SoCState *s =ASPEED_AST1700 (obj); +/* UART */ +object_initialize_child (obj,"uart[*]" , &s->uart, +TYPE_SERIAL_MM ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 08/18] hw/arm/aspeed: Attach UART device to AST1700 model
Quoted 10 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the UART controller to the AST1700 model by mapping its MMIO region.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+)
Thanks,
C.
Quoted 72 lines
include/hw/arm/aspeed_ast1700.h +2
-0@@ -10,6 +10,7 @@#include "hw/sysbus.h" #include "hw/misc/aspeed_ltpi.h" +#include "hw/char/serial-mm.h" #define TYPE_ASPEED_AST1700 "aspeed.ast1700"@@ -21,6 +22,7 @@ struct AspeedAST1700SoCState {MemoryRegion iomem;AspeedLTPIState ltpi; + SerialMM uart; };#endif /* ASPEED_AST1700_H */ hw/arm/aspeed_ast1700.c +18
-0@@ -10,15 +10,18 @@#include "hw/boards.h" #include "hw/qdev-core.h" #include "qom/object.h" +#include "hw/qdev-properties.h" #include "hw/arm/aspeed_ast1700.h" #define AST2700_SOC_LTPI_SIZE 0x01000000enum { +ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , };static const hwaddr aspeed_ast1700_io_memmap[] = { + [ASPEED_AST1700_DEV_UART12 ] =0x00C33B00 , [ASPEED_AST1700_DEV_LTPI_CTRL ] =0x00C34000 , };@@ -32,6 +35,17 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) AST2700_SOC_LTPI_SIZE);sysbus_init_mmio (sbd, &s->iomem); +/* UART */ +qdev_prop_set_uint8 (DEVICE (&s->uart),"regshift" ,2 ); +qdev_prop_set_uint32 (DEVICE (&s->uart),"baudbase" ,38400 ); +qdev_prop_set_uint8 (DEVICE (&s->uart),"endianness" ,DEVICE_LITTLE_ENDIAN ); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->uart), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_UART12 ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->uart),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;@@ -45,6 +59,10 @@ static void aspeed_ast1700_instance_init(Object *obj) {AspeedAST1700SoCState *s =ASPEED_AST1700 (obj); +/* UART */ +object_initialize_child (obj,"uart[*]" , &s->uart, +TYPE_SERIAL_MM ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
PATCH v3 9/18 hw/arm/aspeed: Attach SRAM device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Map the SRAM device to AST1700 model
--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 17 +++++++++++++++++ hw/arm/aspeed_ast27x0.c | 1 + 3 files changed, 20 insertions(+)
include/hw/arm/aspeed_ast1700.h +2 -0
@@ -20,9 +20,11 @@ struct AspeedAST1700SoCState {SysBusDevice parent_obj;MemoryRegion iomem; +uint8_t board_idx;AspeedLTPIState ltpi;SerialMM uart; + MemoryRegion sram; };#endif /* ASPEED_AST1700_H */
hw/arm/aspeed_ast1700.c +17 -0
@@ -14,13 +14,16 @@#include "hw/arm/aspeed_ast1700.h" #define AST2700_SOC_LTPI_SIZE 0x01000000 +#define AST1700_SOC_SRAM_SIZE 0x00040000enum { +ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , };static const hwaddr aspeed_ast1700_io_memmap[] = { + [ASPEED_AST1700_DEV_SRAM ] =0x00BC0000 , [ASPEED_AST1700_DEV_UART12 ] =0x00C33B00 , [ASPEED_AST1700_DEV_LTPI_CTRL ] =0x00C34000 , };
@@ -29,12 +32,21 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) {AspeedAST1700SoCState *s =ASPEED_AST1700 (dev);SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +char dev_name[32 ];/* Occupy memory space for all controllers in AST1700 */ memory_region_init (&s->iomem,OBJECT (s),TYPE_ASPEED_AST1700 ,AST2700_SOC_LTPI_SIZE );sysbus_init_mmio (sbd, &s->iomem); +/* SRAM */ +snprintf (dev_name,sizeof (dev_name),"aspeed.ioexp-sram.%d" , s->board_idx); +memory_region_init_ram (&s->sram,OBJECT (s), dev_name, +AST1700_SOC_SRAM_SIZE , errp); +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SRAM ], + &s->sram); +/* UART */ qdev_prop_set_uint8 (DEVICE (&s->uart),"regshift" ,2 );qdev_prop_set_uint32 (DEVICE (&s->uart),"baudbase" ,38400 );
@@ -69,11 +81,16 @@ static void aspeed_ast1700_instance_init(Object *obj)return ; } +static const Property aspeed_ast1700_props[] = { +DEFINE_PROP_UINT8 ("board-idx" , AspeedAST1700SoCState, board_idx,0 ), +}; +static void aspeed_ast1700_class_init (ObjectClass *klass,const void *data) {DeviceClass *dc =DEVICE_CLASS (klass); dc->realize = aspeed_ast1700_realize; +device_class_set_props (dc, aspeed_ast1700_props); }static const TypeInfo aspeed_ast1700_info = {
hw/arm/aspeed_ast27x0.c +1 -0
@@ -1096,6 +1096,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)/* IO Expander */ for (i =0 ; i < sc->ioexp_num; i++) { +qdev_prop_set_uint8 (DEVICE (&s->ioexp[i]),"board-idx" , i);if (!sysbus_realize (SYS_BUS_DEVICE (&s->ioexp[i]), errp)) {return ; }
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 09/18] hw/arm/aspeed: Attach SRAM device to AST1700 model
Quoted 10 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Map the SRAM device to AST1700 model
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 17 +++++++++++++++++ hw/arm/aspeed_ast27x0.c | 1 + 3 files changed, 20 insertions(+)
Thanks,
C.
Quoted 89 lines
include/hw/arm/aspeed_ast1700.h +2
-0@@ -20,9 +20,11 @@ struct AspeedAST1700SoCState {SysBusDevice parent_obj;MemoryRegion iomem; +uint8_t board_idx;AspeedLTPIState ltpi;SerialMM uart; + MemoryRegion sram; };#endif /* ASPEED_AST1700_H */ hw/arm/aspeed_ast1700.c +17
-0@@ -14,13 +14,16 @@#include "hw/arm/aspeed_ast1700.h" #define AST2700_SOC_LTPI_SIZE 0x01000000 +#define AST1700_SOC_SRAM_SIZE 0x00040000enum { +ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , };static const hwaddr aspeed_ast1700_io_memmap[] = { + [ASPEED_AST1700_DEV_SRAM ] =0x00BC0000 , [ASPEED_AST1700_DEV_UART12 ] =0x00C33B00 , [ASPEED_AST1700_DEV_LTPI_CTRL ] =0x00C34000 , };@@ -29,12 +32,21 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) {AspeedAST1700SoCState *s =ASPEED_AST1700 (dev);SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +char dev_name[32 ];/* Occupy memory space for all controllers in AST1700 */ memory_region_init (&s->iomem,OBJECT (s),TYPE_ASPEED_AST1700 ,AST2700_SOC_LTPI_SIZE );sysbus_init_mmio (sbd, &s->iomem); +/* SRAM */ +snprintf (dev_name,sizeof (dev_name),"aspeed.ioexp-sram.%d" , s->board_idx); +memory_region_init_ram (&s->sram,OBJECT (s), dev_name, +AST1700_SOC_SRAM_SIZE , errp); +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SRAM ], + &s->sram); +/* UART */ qdev_prop_set_uint8 (DEVICE (&s->uart),"regshift" ,2 );qdev_prop_set_uint32 (DEVICE (&s->uart),"baudbase" ,38400 );@@ -69,11 +81,16 @@ static void aspeed_ast1700_instance_init(Object *obj)return ; } +static const Property aspeed_ast1700_props[] = { +DEFINE_PROP_UINT8 ("board-idx" , AspeedAST1700SoCState, board_idx,0 ), +}; +static void aspeed_ast1700_class_init (ObjectClass *klass,const void *data) {DeviceClass *dc =DEVICE_CLASS (klass); dc->realize = aspeed_ast1700_realize; +device_class_set_props (dc, aspeed_ast1700_props); }static const TypeInfo aspeed_ast1700_info = {hw/arm/aspeed_ast27x0.c +1
-0@@ -1096,6 +1096,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)/* IO Expander */ for (i =0 ; i < sc->ioexp_num; i++) { +qdev_prop_set_uint8 (DEVICE (&s->ioexp[i]),"board-idx" , i);if (!sysbus_realize (SYS_BUS_DEVICE (&s->ioexp[i]), errp)) {return ; }
PATCH v3 10/18 hw/arm/aspeed: Attach SPI device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the SPI device to AST1700 model.
--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+)
include/hw/arm/aspeed_ast1700.h +2 -0
@@ -10,6 +10,7 @@#include "hw/sysbus.h" #include "hw/misc/aspeed_ltpi.h" +#include "hw/ssi/aspeed_smc.h" #include "hw/char/serial-mm.h" #define TYPE_ASPEED_AST1700 "aspeed.ast1700"
@@ -25,6 +26,7 @@ struct AspeedAST1700SoCState {AspeedLTPIState ltpi;SerialMM uart;MemoryRegion sram; + AspeedSMCState spi; };#endif /* ASPEED_AST1700_H */
hw/arm/aspeed_ast1700.c +22 -0
@@ -17,15 +17,19 @@#define AST1700_SOC_SRAM_SIZE 0x00040000enum { +ASPEED_AST1700_DEV_SPI0 ,ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , +ASPEED_AST1700_DEV_SPI0_MEM , };static const hwaddr aspeed_ast1700_io_memmap[] = { + [ASPEED_AST1700_DEV_SPI0 ] =0x00030000 , [ASPEED_AST1700_DEV_SRAM ] =0x00BC0000 , [ASPEED_AST1700_DEV_UART12 ] =0x00C33B00 , [ASPEED_AST1700_DEV_LTPI_CTRL ] =0x00C34000 , + [ASPEED_AST1700_DEV_SPI0_MEM ] =0x04000000 , };static void aspeed_ast1700_realize (DeviceState *dev,Error **errp)
@@ -58,6 +62,20 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_UART12 ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->uart), 0)); +/* SPI */ +object_property_set_link (OBJECT (&s->spi),"dram" , +OBJECT (&s->iomem), errp); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->spi), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SPI0 ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->spi),0 )); + +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SPI0_MEM ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->spi),1 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;
@@ -75,6 +93,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"uart[*]" , &s->uart,TYPE_SERIAL_MM ); +/* SPI */ +object_initialize_child (obj,"ioexp-spi[*]" , &s->spi, +"aspeed.spi0-ast2700" ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 10/18] hw/arm/aspeed: Attach SPI device to AST1700 model
Quoted 9 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the SPI device to AST1700 model.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+)
Thanks,
C.
Quoted 76 lines
include/hw/arm/aspeed_ast1700.h +2
-0@@ -10,6 +10,7 @@#include "hw/sysbus.h" #include "hw/misc/aspeed_ltpi.h" +#include "hw/ssi/aspeed_smc.h" #include "hw/char/serial-mm.h" #define TYPE_ASPEED_AST1700 "aspeed.ast1700"@@ -25,6 +26,7 @@ struct AspeedAST1700SoCState {AspeedLTPIState ltpi;SerialMM uart;MemoryRegion sram; + AspeedSMCState spi; };#endif /* ASPEED_AST1700_H */ hw/arm/aspeed_ast1700.c +22
-0@@ -17,15 +17,19 @@#define AST1700_SOC_SRAM_SIZE 0x00040000enum { +ASPEED_AST1700_DEV_SPI0 ,ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , +ASPEED_AST1700_DEV_SPI0_MEM , };static const hwaddr aspeed_ast1700_io_memmap[] = { + [ASPEED_AST1700_DEV_SPI0 ] =0x00030000 , [ASPEED_AST1700_DEV_SRAM ] =0x00BC0000 , [ASPEED_AST1700_DEV_UART12 ] =0x00C33B00 , [ASPEED_AST1700_DEV_LTPI_CTRL ] =0x00C34000 , + [ASPEED_AST1700_DEV_SPI0_MEM ] =0x04000000 , };static void aspeed_ast1700_realize (DeviceState *dev,Error **errp)@@ -58,6 +62,20 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_UART12 ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->uart), 0)); +/* SPI */ +object_property_set_link (OBJECT (&s->spi),"dram" , +OBJECT (&s->iomem), errp); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->spi), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SPI0 ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->spi),0 )); + +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SPI0_MEM ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->spi),1 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;@@ -75,6 +93,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"uart[*]" , &s->uart,TYPE_SERIAL_MM ); +/* SPI */ +object_initialize_child (obj,"ioexp-spi[*]" , &s->spi, +"aspeed.spi0-ast2700" ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
PATCH v3 11/18 hw/arm/aspeed: Attach ADC device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the ADC device to AST1700 model.
--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 14 ++++++++++++++ hw/arm/aspeed_ast27x0.c | 5 +++++ 3 files changed, 21 insertions(+)
include/hw/arm/aspeed_ast1700.h +2 -0
@@ -9,6 +9,7 @@#define ASPEED_AST1700_H #include "hw/sysbus.h" +#include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h" #include "hw/char/serial-mm.h"
@@ -27,6 +28,7 @@ struct AspeedAST1700SoCState {SerialMM uart;MemoryRegion sram;AspeedSMCState spi; + AspeedADCState adc; };#endif /* ASPEED_AST1700_H */
hw/arm/aspeed_ast1700.c +14 -0
@@ -19,6 +19,7 @@enum {ASPEED_AST1700_DEV_SPI0 ,ASPEED_AST1700_DEV_SRAM , +ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL ,ASPEED_AST1700_DEV_SPI0_MEM ,
@@ -27,6 +28,7 @@ enum {static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SPI0 ] =0x00030000 , [ASPEED_AST1700_DEV_SRAM ] =0x00BC0000 , + [ASPEED_AST1700_DEV_ADC ] =0x00C00000 , [ASPEED_AST1700_DEV_UART12 ] =0x00C33B00 , [ASPEED_AST1700_DEV_LTPI_CTRL ] =0x00C34000 , [ASPEED_AST1700_DEV_SPI0_MEM ] =0x04000000 ,
@@ -76,6 +78,14 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SPI0_MEM ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->spi), 1)); +/* ADC */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->adc), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_ADC ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->adc),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;
@@ -97,6 +107,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-spi[*]" , &s->spi,"aspeed.spi0-ast2700" ); +/* ADC */ +object_initialize_child (obj,"ioexp-adc[*]" , &s->adc, +"aspeed.adc-ast2700" ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
hw/arm/aspeed_ast27x0.c +5 -0
@@ -1117,6 +1117,11 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&a->intcioexp[i]), j, irq); } + +/* ADC */ +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ioexp[i].adc),0 , +aspeed_soc_ast2700_get_irq (s,ASPEED_DEV_ADC )); + } aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu),
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 11/18] hw/arm/aspeed: Attach ADC device to AST1700 model
Quoted 10 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the ADC device to AST1700 model.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 14 ++++++++++++++ hw/arm/aspeed_ast27x0.c | 5 +++++ 3 files changed, 21 insertions(+)
Thanks,
C.
Quoted 82 lines
include/hw/arm/aspeed_ast1700.h +2
-0@@ -9,6 +9,7 @@#define ASPEED_AST1700_H #include "hw/sysbus.h" +#include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h" #include "hw/char/serial-mm.h" @@ -27,6 +28,7 @@ struct AspeedAST1700SoCState {SerialMM uart;MemoryRegion sram;AspeedSMCState spi; + AspeedADCState adc; };#endif /* ASPEED_AST1700_H */ hw/arm/aspeed_ast1700.c +14
-0@@ -19,6 +19,7 @@enum {ASPEED_AST1700_DEV_SPI0 ,ASPEED_AST1700_DEV_SRAM , +ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL ,ASPEED_AST1700_DEV_SPI0_MEM ,@@ -27,6 +28,7 @@ enum {static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SPI0 ] =0x00030000 , [ASPEED_AST1700_DEV_SRAM ] =0x00BC0000 , + [ASPEED_AST1700_DEV_ADC ] =0x00C00000 , [ASPEED_AST1700_DEV_UART12 ] =0x00C33B00 , [ASPEED_AST1700_DEV_LTPI_CTRL ] =0x00C34000 , [ASPEED_AST1700_DEV_SPI0_MEM ] =0x04000000 ,@@ -76,6 +78,14 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SPI0_MEM ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->spi), 1)); +/* ADC */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->adc), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_ADC ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->adc),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;@@ -97,6 +107,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-spi[*]" , &s->spi,"aspeed.spi0-ast2700" ); +/* ADC */ +object_initialize_child (obj,"ioexp-adc[*]" , &s->adc, +"aspeed.adc-ast2700" ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );hw/arm/aspeed_ast27x0.c +5
-0@@ -1117,6 +1117,11 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&a->intcioexp[i]), j, irq); } + +/* ADC */ +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ioexp[i].adc),0 , +aspeed_soc_ast2700_get_irq (s,ASPEED_DEV_ADC )); + } aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu),
PATCH v3 12/18 hw/arm/aspeed: Attach SCU device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the SCU device to AST1700 model.
--- include/hw/arm/aspeed_ast1700.h | 3 +++ hw/arm/aspeed_ast1700.c | 17 +++++++++++++++++ hw/arm/aspeed_ast27x0.c | 2 ++ 3 files changed, 22 insertions(+)
include/hw/arm/aspeed_ast1700.h +3 -0
@@ -9,6 +9,7 @@#define ASPEED_AST1700_H #include "hw/sysbus.h" +#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h"
@@ -23,12 +24,14 @@ struct AspeedAST1700SoCState {MemoryRegion iomem;uint8_t board_idx; +uint32_t silicon_rev;AspeedLTPIState ltpi;SerialMM uart;MemoryRegion sram;AspeedSMCState spi;AspeedADCState adc; + AspeedSCUState scu; };#endif /* ASPEED_AST1700_H */
hw/arm/aspeed_ast1700.c +17 -0
@@ -20,6 +20,7 @@ enum {ASPEED_AST1700_DEV_SPI0 ,ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_ADC , +ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , ASPEED_AST1700_DEV_SPI0_MEM,
@@ -29,6 +30,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SPI0] = 0x00030000, [ASPEED_AST1700_DEV_SRAM] = 0x00BC0000, [ASPEED_AST1700_DEV_ADC] = 0x00C00000, + [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000,
@@ -86,6 +88,16 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_ADC ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->adc), 0)); +/* SCU */ +qdev_prop_set_uint32 (DEVICE (&s->scu),"silicon-rev" , + s->silicon_rev); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scu), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SCU ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->scu),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;
@@ -111,6 +123,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-adc[*]" , &s->adc,"aspeed.adc-ast2700" ); +/* SCU */ +object_initialize_child (obj,"ioexp-scu[*]" , &s->scu, +TYPE_ASPEED_2700_SCU ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
@@ -119,6 +135,7 @@ static void aspeed_ast1700_instance_init(Object *obj)static const Property aspeed_ast1700_props[] = {DEFINE_PROP_UINT8 ("board-idx" , AspeedAST1700SoCState, board_idx,0 ), +DEFINE_PROP_UINT32 ("silicon-rev" , AspeedAST1700SoCState, silicon_rev,0 ), };static void aspeed_ast1700_class_init (ObjectClass *klass,const void *data)
hw/arm/aspeed_ast27x0.c +2 -0
@@ -573,6 +573,8 @@ static void aspeed_soc_ast2700_init(Object *obj)/* AST1700 IOEXP */ object_initialize_child (obj,"ioexp[*]" , &s->ioexp[i],TYPE_ASPEED_AST1700 ); +qdev_prop_set_uint32 (DEVICE (&s->ioexp[i]),"silicon-rev" , + sc->silicon_rev); } object_initialize_child(obj, "dpmcu", &s->dpmcu,
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 12/18] hw/arm/aspeed: Attach SCU device to AST1700 model
Quoted 10 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the SCU device to AST1700 model.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 3 +++ hw/arm/aspeed_ast1700.c | 17 +++++++++++++++++ hw/arm/aspeed_ast27x0.c | 2 ++ 3 files changed, 22 insertions(+)
Thanks,
C.
Quoted 96 lines
include/hw/arm/aspeed_ast1700.h +3
-0@@ -9,6 +9,7 @@#define ASPEED_AST1700_H #include "hw/sysbus.h" +#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h" @@ -23,12 +24,14 @@ struct AspeedAST1700SoCState {MemoryRegion iomem;uint8_t board_idx; +uint32_t silicon_rev;AspeedLTPIState ltpi;SerialMM uart;MemoryRegion sram;AspeedSMCState spi;AspeedADCState adc; + AspeedSCUState scu; };#endif /* ASPEED_AST1700_H */ hw/arm/aspeed_ast1700.c +17
-0@@ -20,6 +20,7 @@ enum {ASPEED_AST1700_DEV_SPI0 ,ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_ADC , +ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , ASPEED_AST1700_DEV_SPI0_MEM,@@ -29,6 +30,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SPI0] = 0x00030000, [ASPEED_AST1700_DEV_SRAM] = 0x00BC0000, [ASPEED_AST1700_DEV_ADC] = 0x00C00000, + [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000,@@ -86,6 +88,16 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_ADC ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->adc), 0)); +/* SCU */ +qdev_prop_set_uint32 (DEVICE (&s->scu),"silicon-rev" , + s->silicon_rev); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scu), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SCU ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->scu),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;@@ -111,6 +123,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-adc[*]" , &s->adc,"aspeed.adc-ast2700" ); +/* SCU */ +object_initialize_child (obj,"ioexp-scu[*]" , &s->scu, +TYPE_ASPEED_2700_SCU ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );@@ -119,6 +135,7 @@ static void aspeed_ast1700_instance_init(Object *obj)static const Property aspeed_ast1700_props[] = {DEFINE_PROP_UINT8 ("board-idx" , AspeedAST1700SoCState, board_idx,0 ), +DEFINE_PROP_UINT32 ("silicon-rev" , AspeedAST1700SoCState, silicon_rev,0 ), };static void aspeed_ast1700_class_init (ObjectClass *klass,const void *data)hw/arm/aspeed_ast27x0.c +2
-0@@ -573,6 +573,8 @@ static void aspeed_soc_ast2700_init(Object *obj)/* AST1700 IOEXP */ object_initialize_child (obj,"ioexp[*]" , &s->ioexp[i],TYPE_ASPEED_AST1700 ); +qdev_prop_set_uint32 (DEVICE (&s->ioexp[i]),"silicon-rev" , + sc->silicon_rev); } object_initialize_child(obj, "dpmcu", &s->dpmcu,
PATCH v3 13/18 hw/arm/aspeed: Attach GPIO device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the GPIO controller to the AST1700 model by mapping its MMIO region and wiring its interrupt line.
--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 14 ++++++++++++++ hw/arm/aspeed_ast27x0.c | 4 ++++ 3 files changed, 20 insertions(+)
include/hw/arm/aspeed_ast1700.h +2 -0
@@ -11,6 +11,7 @@#include "hw/sysbus.h" #include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" +#include "hw/gpio/aspeed_gpio.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h" #include "hw/char/serial-mm.h"
@@ -32,6 +33,7 @@ struct AspeedAST1700SoCState {AspeedSMCState spi;AspeedADCState adc;AspeedSCUState scu; + AspeedGPIOState gpio; };#endif /* ASPEED_AST1700_H */
hw/arm/aspeed_ast1700.c +14 -0
@@ -21,6 +21,7 @@ enum {ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU , +ASPEED_AST1700_DEV_GPIO ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , ASPEED_AST1700_DEV_SPI0_MEM,
@@ -31,6 +32,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SRAM] = 0x00BC0000, [ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, + [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000,
@@ -98,6 +100,14 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SCU ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->scu), 0)); +/* GPIO */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->gpio), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_GPIO ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->gpio),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;
@@ -127,6 +137,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-scu[*]" , &s->scu,TYPE_ASPEED_2700_SCU ); +/* GPIO */ +object_initialize_child (obj,"ioexp-gpio[*]" , &s->gpio, +"aspeed.gpio-ast2700" ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
hw/arm/aspeed_ast27x0.c +4 -0
@@ -1124,6 +1124,10 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->ioexp[i].adc),0 ,aspeed_soc_ast2700_get_irq (s,ASPEED_DEV_ADC )); +/* GPIO */ +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ioexp[i].gpio),0 , +aspeed_soc_ast2700_get_irq (s,ASPEED_DEV_GPIO )); + } aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu),
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 13/18] hw/arm/aspeed: Attach GPIO device to AST1700 model
Quoted 11 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the GPIO controller to the AST1700 model by mapping its MMIO region and wiring its interrupt line.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 14 ++++++++++++++ hw/arm/aspeed_ast27x0.c | 4 ++++ 3 files changed, 20 insertions(+)
Thanks,
C.
Quoted 81 lines
include/hw/arm/aspeed_ast1700.h +2
-0@@ -11,6 +11,7 @@#include "hw/sysbus.h" #include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" +#include "hw/gpio/aspeed_gpio.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h" #include "hw/char/serial-mm.h" @@ -32,6 +33,7 @@ struct AspeedAST1700SoCState {AspeedSMCState spi;AspeedADCState adc;AspeedSCUState scu; + AspeedGPIOState gpio; };#endif /* ASPEED_AST1700_H */ hw/arm/aspeed_ast1700.c +14
-0@@ -21,6 +21,7 @@ enum {ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU , +ASPEED_AST1700_DEV_GPIO ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , ASPEED_AST1700_DEV_SPI0_MEM,@@ -31,6 +32,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SRAM] = 0x00BC0000, [ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, + [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000,@@ -98,6 +100,14 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SCU ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->scu), 0)); +/* GPIO */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->gpio), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_GPIO ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->gpio),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;@@ -127,6 +137,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-scu[*]" , &s->scu,TYPE_ASPEED_2700_SCU ); +/* GPIO */ +object_initialize_child (obj,"ioexp-gpio[*]" , &s->gpio, +"aspeed.gpio-ast2700" ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );hw/arm/aspeed_ast27x0.c +4
-0@@ -1124,6 +1124,10 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->ioexp[i].adc),0 ,aspeed_soc_ast2700_get_irq (s,ASPEED_DEV_ADC )); +/* GPIO */ +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ioexp[i].gpio),0 , +aspeed_soc_ast2700_get_irq (s,ASPEED_DEV_GPIO )); + } aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu),
PATCH v3 14/18 hw/arm/aspeed: attach I2C device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the I2C controller to the AST1700 model by mapping its MMIO region and wiring its interrupt line.
This patch also adds a bus_label property to distinguish I2C buses on the BMC from those on external boards. This prevents user-specified I2C devices from being attached to the wrong bus when provided via CLI.
--- include/hw/arm/aspeed_ast1700.h | 2 ++ include/hw/arm/aspeed_soc.h | 2 ++ include/hw/i2c/aspeed_i2c.h | 1 + hw/arm/aspeed_ast1700.c | 18 ++++++++++++ hw/arm/aspeed_ast27x0.c | 49 ++++++++++++++++++++++++++++++--- hw/i2c/aspeed_i2c.c | 19 +++++++++++-- 6 files changed, 85 insertions(+), 6 deletions(-)
include/hw/arm/aspeed_ast1700.h +2 -0
@@ -12,6 +12,7 @@#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/gpio/aspeed_gpio.h" +#include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h" #include "hw/char/serial-mm.h"
@@ -34,6 +35,7 @@ struct AspeedAST1700SoCState {AspeedADCState adc;AspeedSCUState scu;AspeedGPIOState gpio; + AspeedI2CState i2c; };#endif /* ASPEED_AST1700_H */
include/hw/arm/aspeed_soc.h +2 -0
@@ -290,6 +290,8 @@ enum {ASPEED_DEV_LTPI_CTRL2 ,ASPEED_DEV_LTPI_IO0 ,ASPEED_DEV_LTPI_IO1 , +ASPEED_DEV_IOEXP0_I2C , +ASPEED_DEV_IOEXP1_I2C ,ASPEED_DEV_IOEXP0_INTCIO , ASPEED_DEV_IOEXP1_INTCIO, };
include/hw/i2c/aspeed_i2c.h +1 -0
@@ -269,6 +269,7 @@ struct AspeedI2CState {uint32_t intr_status;uint32_t ctrl_global;uint32_t new_clk_divider; +char *bus_label;MemoryRegion pool_iomem;uint8_t share_pool[ASPEED_I2C_SHARE_POOL_SIZE ];
hw/arm/aspeed_ast1700.c +18 -0
@@ -22,6 +22,7 @@ enum {ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_GPIO , +ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , ASPEED_AST1700_DEV_SPI0_MEM,
@@ -33,6 +34,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, + [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000,
@@ -108,6 +110,18 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_GPIO ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0)); +/* I2C */ +snprintf (dev_name,sizeof (dev_name),"ioexp%d" , s->board_idx); +qdev_prop_set_string (DEVICE (&s->i2c),"bus-label" , dev_name); +object_property_set_link (OBJECT (&s->i2c),"dram" , +OBJECT (&s->iomem), errp); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->i2c), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_I2C ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->i2c),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;
@@ -141,6 +155,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-gpio[*]" , &s->gpio,"aspeed.gpio-ast2700" ); +/* I2C */ +object_initialize_child (obj,"ioexp-i2c[*]" , &s->i2c, +"aspeed.i2c-ast2700" ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
hw/arm/aspeed_ast27x0.c +45 -4
86 lines not on this page · raw message
hw/i2c/aspeed_i2c.c +17 -2
@@ -1261,6 +1261,7 @@ static void aspeed_i2c_realize(DeviceState *dev, Error **errp)static const Property aspeed_i2c_properties[] = {DEFINE_PROP_LINK ("dram" , AspeedI2CState, dram_mr, TYPE_MEMORY_REGION, MemoryRegion *), +DEFINE_PROP_STRING ("bus-label" , AspeedI2CState, bus_label), };static void aspeed_i2c_class_init (ObjectClass *klass,const void *data)
@@ -1421,14 +1422,28 @@ static void aspeed_i2c_bus_realize(DeviceState *dev, Error **errp) {AspeedI2CBus *s =ASPEED_I2C_BUS (dev);AspeedI2CClass *aic; - g_autofree char *name = g_strdup_printf(TYPE_ASPEED_I2C_BUS ".%d", s->id); - g_autofree char *pool_name = g_strdup_printf("%s.pool", name); + g_autofree char *name = NULL; + g_autofree char *pool_name = NULL;if (!s->controller) {error_setg (errp,TYPE_ASPEED_I2C_BUS ": 'controller' link not set" );return ; } +/* +* I2C bus naming: +* - Empty bus_label -> BMC internal controller, use default name. +* - Non-empty bus_label -> external/addon controller, prefix with label +* to avoid conflicts and show bus origin. +*/ +if (!s->controller->bus_label || (strlen (s->controller->bus_label) ==0 )) { + name =g_strdup_printf (TYPE_ASPEED_I2C_BUS ".%d" , s->id); + }else { + name =g_strdup_printf ("aspeed.%s.i2c.bus.%d" , + s->controller->bus_label, s->id); + } + pool_name =g_strdup_printf ("%s.pool" , name); + aic =ASPEED_I2C_GET_CLASS (s->controller);sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq);
Signature · 1 line
2.43.0
Re: [PATCH v3 14/18] hw/arm/aspeed: attach I2C device to AST1700 model
Quoted 162 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Connect the I2C controller to the AST1700 model by mapping its MMIO region and wiring its interrupt line.
This patch also adds a
bus_labelproperty to distinguish I2C buses on the BMC from those on external boards. This prevents user-specified I2C devices from being attached to the wrong bus when provided via CLI.Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 2 ++ include/hw/arm/aspeed_soc.h | 2 ++ include/hw/i2c/aspeed_i2c.h | 1 + hw/arm/aspeed_ast1700.c | 18 ++++++++++++ hw/arm/aspeed_ast27x0.c | 49 ++++++++++++++++++++++++++++++--- hw/i2c/aspeed_i2c.c | 19 +++++++++++-- 6 files changed, 85 insertions(+), 6 deletions(-)include/hw/arm/aspeed_ast1700.h +2
-0@@ -12,6 +12,7 @@#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/gpio/aspeed_gpio.h" +#include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h" #include "hw/char/serial-mm.h" @@ -34,6 +35,7 @@ struct AspeedAST1700SoCState {AspeedADCState adc;AspeedSCUState scu;AspeedGPIOState gpio; + AspeedI2CState i2c; };#endif /* ASPEED_AST1700_H */ include/hw/arm/aspeed_soc.h +2
-0@@ -290,6 +290,8 @@ enum {ASPEED_DEV_LTPI_CTRL2 ,ASPEED_DEV_LTPI_IO0 ,ASPEED_DEV_LTPI_IO1 , +ASPEED_DEV_IOEXP0_I2C , +ASPEED_DEV_IOEXP1_I2C ,ASPEED_DEV_IOEXP0_INTCIO , ASPEED_DEV_IOEXP1_INTCIO, };include/hw/i2c/aspeed_i2c.h +1
-0@@ -269,6 +269,7 @@ struct AspeedI2CState {uint32_t intr_status;uint32_t ctrl_global;uint32_t new_clk_divider; +char *bus_label;MemoryRegion pool_iomem;uint8_t share_pool[ASPEED_I2C_SHARE_POOL_SIZE ];hw/arm/aspeed_ast1700.c +18
-0@@ -22,6 +22,7 @@ enum {ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_GPIO , +ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , ASPEED_AST1700_DEV_SPI0_MEM,@@ -33,6 +34,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, + [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000,@@ -108,6 +110,18 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_GPIO ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0)); +/* I2C */ +snprintf (dev_name,sizeof (dev_name),"ioexp%d" , s->board_idx); +qdev_prop_set_string (DEVICE (&s->i2c),"bus-label" , dev_name); +object_property_set_link (OBJECT (&s->i2c),"dram" , +OBJECT (&s->iomem), errp); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->i2c), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_I2C ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->i2c),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;@@ -141,6 +155,10 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-gpio[*]" , &s->gpio,"aspeed.gpio-ast2700" ); +/* I2C */ +object_initialize_child (obj,"ioexp-i2c[*]" , &s->i2c, +"aspeed.i2c-ast2700" ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );hw/arm/aspeed_ast27x0.c +16
-2@@ -205,6 +205,8 @@ static const int aspeed_soc_ast2700a1_irqmap[] = { [ASPEED_DEV_ETH3] = 196, [ASPEED_DEV_PECI] = 197, [ASPEED_DEV_SDHCI] = 197, + [ASPEED_DEV_IOEXP0_I2C] = 198, + [ASPEED_DEV_IOEXP1_I2C] = 200, };/* GICINT 128 */ @@ -267,6 +269,18 @@ static const int ast2700_gic133_gic197_intcmap[] = { [ASPEED_DEV_PECI] = 4, }; +/* Primary AST1700 Interrupts */ +/* A1: GICINT 198 */ +static const int ast2700_gic198_intcmap[] = { + [ASPEED_DEV_IOEXP0_I2C ] =0 ,/* 0 - 15 */ +}; + +/* Secondary AST1700 Interrupts */ +/* A1: GINTC 200 */ +static const int ast2700_gic200_intcmap[] = { + [ASPEED_DEV_IOEXP1_I2C ] =0 ,/* 0 - 15 */ +}; +/* GICINT 128 ~ 136 */ /* GICINT 192 ~ 201 */ struct gic_intc_irq_info {@@ -283,9 +297,9 @@ static const struct gic_intc_irq_info ast2700_gic_intcmap[] = { {195, 1, 3, ast2700_gic131_gic195_intcmap}, {196, 1, 4, ast2700_gic132_gic196_intcmap}, {197, 1, 5, ast2700_gic133_gic197_intcmap}, - {198, 1, 6, NULL}, + {198, 2, 0, ast2700_gic198_intcmap}, {199, 1, 7, NULL}, - {200, 1, 8, NULL}, + {200, 3, 0, ast2700_gic200_intcmap}, {201, 1, 9, NULL}, {128, 0, 1, ast2700_gic128_gic192_intcmap}, {129, 0, 2, NULL},@@ -333,8 +347,13 @@ static qemu_irq aspeed_soc_ast2700_get_irq_index(AspeedSoCState *s, int dev,assert (ast2700_gic_intcmap[i].ptr); or_idx = ast2700_gic_intcmap[i].orgate_idx;
hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq_index(AspeedSoCState *s, int dev, · line 356
Quoted 10 lines
hw/arm/aspeed_ast27x0.c +7
-2idx = ast2700_gic_intcmap[i].intc_idx; -return qdev_get_gpio_in (DEVICE (&a->intc[idx].orgates[or_idx]), - ast2700_gic_intcmap[i].ptr[dev] + index); +if (idx <ASPEED_INTC_NUM ) { +return qdev_get_gpio_in (DEVICE (&a->intc[idx].orgates[or_idx]), + ast2700_gic_intcmap[i].ptr[dev] + index); + }else { +return qdev_get_gpio_in (DEVICE (&a->intcioexp[idx -ASPEED_INTC_NUM ].orgates[or_idx]), + ast2700_gic_intcmap[i].ptr[dev] + index); + }
checkpatch.pl complains about some of these lines being 80+ characters, and errors on the last return being over 90 characters.
Quoted 86 lines
hw/arm/aspeed_ast27x0.c +22
-0} }@@ -1098,6 +1117,8 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)/* IO Expander */ for (i =0 ; i < sc->ioexp_num; i++) { +AspeedI2CClass *i2c_ctl; +qdev_prop_set_uint8 (DEVICE (&s->ioexp[i]),"board-idx" , i);if (!sysbus_realize (SYS_BUS_DEVICE (&s->ioexp[i]), errp)) {return ;@@ -1128,6 +1149,26 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->ioexp[i].gpio),0 ,aspeed_soc_ast2700_get_irq (s,ASPEED_DEV_GPIO )); +/* I2C */ + i2c_ctl =ASPEED_I2C_GET_CLASS (&s->ioexp[i].i2c); +for (int j =0 ; j < i2c_ctl->num_busses; j++) { +/* +* For I2C on AST1700: +* I2C bus interrupts are connected to the OR gate from bit 0 to bit +* 15, and the OR gate output pin is connected to the input pin of +* GICINT192 of IO expander Interrupt controller (INTC2/3). Then, +* the output pin is connected to the INTC (CPU Die) input pin, and +* its output pin is connected to the GIC. +* +* I2C bus 0 is connected to the OR gate at bit 0. +* I2C bus 15 is connected to the OR gate at bit 15. +*/ + irq =aspeed_soc_ast2700_get_irq_index (s, +ASPEED_DEV_IOEXP0_I2C + i, + j); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ioexp[i].i2c.busses[j]), +0 , irq); + } } aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->dpmcu),hw/i2c/aspeed_i2c.c +17
-3@@ -1261,6 +1261,7 @@ static void aspeed_i2c_realize(DeviceState *dev, Error **errp)static const Property aspeed_i2c_properties[] = {DEFINE_PROP_LINK ("dram" , AspeedI2CState, dram_mr, TYPE_MEMORY_REGION, MemoryRegion *), +DEFINE_PROP_STRING ("bus-label" , AspeedI2CState, bus_label), };static void aspeed_i2c_class_init (ObjectClass *klass,const void *data)@@ -1421,14 +1422,28 @@ static void aspeed_i2c_bus_realize(DeviceState *dev, Error **errp) {AspeedI2CBus *s =ASPEED_I2C_BUS (dev);AspeedI2CClass *aic; - g_autofree char *name = g_strdup_printf(TYPE_ASPEED_I2C_BUS ".%d", s->id); - g_autofree char *pool_name = g_strdup_printf("%s.pool", name); + g_autofree char *name = NULL; + g_autofree char *pool_name = NULL;if (!s->controller) {error_setg (errp,TYPE_ASPEED_I2C_BUS ": 'controller' link not set" );return ; } +/* +* I2C bus naming: +* - Empty bus_label -> BMC internal controller, use default name. +* - Non-empty bus_label -> external/addon controller, prefix with label +* to avoid conflicts and show bus origin. +*/ +if (!s->controller->bus_label || (strlen (s->controller->bus_label) ==0 )) { + name =g_strdup_printf (TYPE_ASPEED_I2C_BUS ".%d" , s->id); + }else { + name =g_strdup_printf ("aspeed.%s.i2c.bus.%d" , + s->controller->bus_label, s->id); + } + pool_name =g_strdup_printf ("%s.pool" , name); + aic =ASPEED_I2C_GET_CLASS (s->controller);sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq); --2.43.0
PATCH v3 15/18 hw/arm/aspeed: Attach WDT device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the WDT device to AST1700 model.
--- include/hw/arm/aspeed_ast1700.h | 4 ++++ hw/arm/aspeed_ast1700.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+)
include/hw/arm/aspeed_ast1700.h +4 -0
@@ -15,8 +15,11 @@#include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h" +#include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#define AST1700_WDT_NUM 9 +#define TYPE_ASPEED_AST1700 "aspeed.ast1700"OBJECT_DECLARE_SIMPLE_TYPE (AspeedAST1700SoCState,ASPEED_AST1700 )
@@ -36,6 +39,7 @@ struct AspeedAST1700SoCState {AspeedSCUState scu;AspeedGPIOState gpio;AspeedI2CState i2c; + AspeedWDTState wdt[AST1700_WDT_NUM]; };#endif /* ASPEED_AST1700_H */
hw/arm/aspeed_ast1700.c +24 -0
@@ -25,6 +25,7 @@ enum {ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , +ASPEED_AST1700_DEV_WDT , ASPEED_AST1700_DEV_SPI0_MEM, };
@@ -37,6 +38,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, + [ASPEED_AST1700_DEV_WDT] = 0x00C37000, [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000, };
@@ -129,6 +131,22 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp)memory_region_add_subregion (&s->iomem, aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_LTPI_CTRL ],sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->ltpi),0 )); + +/* WDT */ +for (int i =0 ; i <AST1700_WDT_NUM ; i++) { +AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]); +hwaddr wdt_offset = aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_WDT ] + + i * awc->iosize; + +object_property_set_link (OBJECT (&s->wdt[i]),"scu" ,OBJECT (&s->scu), + errp); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->wdt[i]), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + wdt_offset, +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->wdt[i]),0 )); + } }static void aspeed_ast1700_instance_init (Object *obj)
@@ -162,6 +180,12 @@ static void aspeed_ast1700_instance_init(Object *obj)/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI ); + +/* WDT */ +for (int i =0 ; i <AST1700_WDT_NUM ; i++) { +object_initialize_child (obj,"ioexp-wdt[*]" , + &s->wdt[i],"aspeed.wdt-ast2700" ); + }return ; }
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 15/18] hw/arm/aspeed: Attach WDT device to AST1700 model
Quoted 9 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the WDT device to AST1700 model.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 4 ++++ hw/arm/aspeed_ast1700.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+)
Thanks,
C.
Quoted 81 lines
include/hw/arm/aspeed_ast1700.h +4
-0@@ -15,8 +15,11 @@#include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/ssi/aspeed_smc.h" +#include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#define AST1700_WDT_NUM 9 +#define TYPE_ASPEED_AST1700 "aspeed.ast1700"OBJECT_DECLARE_SIMPLE_TYPE (AspeedAST1700SoCState,ASPEED_AST1700 )@@ -36,6 +39,7 @@ struct AspeedAST1700SoCState {AspeedSCUState scu;AspeedGPIOState gpio;AspeedI2CState i2c; + AspeedWDTState wdt[AST1700_WDT_NUM]; };#endif /* ASPEED_AST1700_H */ hw/arm/aspeed_ast1700.c +24
-0@@ -25,6 +25,7 @@ enum {ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , +ASPEED_AST1700_DEV_WDT , ASPEED_AST1700_DEV_SPI0_MEM, };@@ -37,6 +38,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, + [ASPEED_AST1700_DEV_WDT] = 0x00C37000, [ASPEED_AST1700_DEV_SPI0_MEM] = 0x04000000, };@@ -129,6 +131,22 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp)memory_region_add_subregion (&s->iomem, aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_LTPI_CTRL ],sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->ltpi),0 )); + +/* WDT */ +for (int i =0 ; i <AST1700_WDT_NUM ; i++) { +AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]); +hwaddr wdt_offset = aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_WDT ] + + i * awc->iosize; + +object_property_set_link (OBJECT (&s->wdt[i]),"scu" ,OBJECT (&s->scu), + errp); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->wdt[i]), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + wdt_offset, +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->wdt[i]),0 )); + } }static void aspeed_ast1700_instance_init (Object *obj)@@ -162,6 +180,12 @@ static void aspeed_ast1700_instance_init(Object *obj)/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI ); + +/* WDT */ +for (int i =0 ; i <AST1700_WDT_NUM ; i++) { +object_initialize_child (obj,"ioexp-wdt[*]" , + &s->wdt[i],"aspeed.wdt-ast2700" ); + }return ; }
PATCH v3 16/18 hw/arm/aspeed: Attach PWM device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the PWM device to AST1700 model.
--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 13 +++++++++++++ 2 files changed, 15 insertions(+)
include/hw/arm/aspeed_ast1700.h +2 -0
@@ -14,6 +14,7 @@#include "hw/gpio/aspeed_gpio.h" #include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" +#include "hw/misc/aspeed_pwm.h" #include "hw/ssi/aspeed_smc.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h"
@@ -39,6 +40,7 @@ struct AspeedAST1700SoCState {AspeedSCUState scu;AspeedGPIOState gpio;AspeedI2CState i2c; +AspeedPWMState pwm;AspeedWDTState wdt[AST1700_WDT_NUM ]; };
hw/arm/aspeed_ast1700.c +13 -0
@@ -18,6 +18,7 @@enum {ASPEED_AST1700_DEV_SPI0 , +ASPEED_AST1700_DEV_PWM ,ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU ,
@@ -31,6 +32,7 @@ enum {static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SPI0 ] =0x00030000 , + [ASPEED_AST1700_DEV_PWM ] =0x000C0000 , [ASPEED_AST1700_DEV_SRAM ] =0x00BC0000 , [ASPEED_AST1700_DEV_ADC ] =0x00C00000 , [ASPEED_AST1700_DEV_SCU ] =0x00C02000 ,
@@ -124,6 +126,14 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_I2C ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->i2c), 0)); +/* PWM */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->pwm), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_PWM ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->pwm),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;
@@ -177,6 +187,9 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-i2c[*]" , &s->i2c,"aspeed.i2c-ast2700" ); +/* PWM */ +object_initialize_child (obj,"pwm" , &s->pwm,TYPE_ASPEED_PWM ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
Signature · 1 line
2.43.0
Re: [SPAM] [PATCH v3 16/18] hw/arm/aspeed: Attach PWM device to AST1700 model
Quoted 9 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the PWM device to AST1700 model.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 2 ++ hw/arm/aspeed_ast1700.c | 13 +++++++++++++ 2 files changed, 15 insertions(+)
Thanks,
C.
Quoted 66 lines
include/hw/arm/aspeed_ast1700.h +2
-0@@ -14,6 +14,7 @@#include "hw/gpio/aspeed_gpio.h" #include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" +#include "hw/misc/aspeed_pwm.h" #include "hw/ssi/aspeed_smc.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" @@ -39,6 +40,7 @@ struct AspeedAST1700SoCState {AspeedSCUState scu;AspeedGPIOState gpio;AspeedI2CState i2c; +AspeedPWMState pwm;AspeedWDTState wdt[AST1700_WDT_NUM ]; };hw/arm/aspeed_ast1700.c +13
-0@@ -18,6 +18,7 @@enum {ASPEED_AST1700_DEV_SPI0 , +ASPEED_AST1700_DEV_PWM ,ASPEED_AST1700_DEV_SRAM ,ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU ,@@ -31,6 +32,7 @@ enum {static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SPI0 ] =0x00030000 , + [ASPEED_AST1700_DEV_PWM ] =0x000C0000 , [ASPEED_AST1700_DEV_SRAM ] =0x00BC0000 , [ASPEED_AST1700_DEV_ADC ] =0x00C00000 , [ASPEED_AST1700_DEV_SCU ] =0x00C02000 ,@@ -124,6 +126,14 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_I2C ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->i2c), 0)); +/* PWM */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->pwm), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_PWM ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->pwm),0 )); +/* LTPI controller */ if (!sysbus_realize (SYS_BUS_DEVICE (&s->ltpi), errp)) {return ;@@ -177,6 +187,9 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-i2c[*]" , &s->i2c,"aspeed.i2c-ast2700" ); +/* PWM */ +object_initialize_child (obj,"pwm" , &s->pwm,TYPE_ASPEED_PWM ); +/* LTPI controller */ object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI );
PATCH v3 17/18 hw/arm/aspeed: Attach SGPIOM device to AST1700 model
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
Connect the SGPIOM device to AST1700 model.
--- include/hw/arm/aspeed_ast1700.h | 3 +++ hw/arm/aspeed_ast1700.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)
include/hw/arm/aspeed_ast1700.h +3 -0
@@ -12,6 +12,7 @@#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/gpio/aspeed_gpio.h" +#include "hw/gpio/aspeed_sgpio.h" #include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/misc/aspeed_pwm.h"
@@ -19,6 +20,7 @@#include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#define AST1700_SGPIO_NUM 2#define AST1700_WDT_NUM 9#define TYPE_ASPEED_AST1700 "aspeed.ast1700"
@@ -39,6 +41,7 @@ struct AspeedAST1700SoCState {AspeedADCState adc;AspeedSCUState scu;AspeedGPIOState gpio; +AspeedSGPIOState sgpiom[AST1700_SGPIO_NUM ];AspeedI2CState i2c;AspeedPWMState pwm;AspeedWDTState wdt[AST1700_WDT_NUM ];
hw/arm/aspeed_ast1700.c +20 -0
@@ -23,6 +23,8 @@ enum {ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_GPIO , +ASPEED_AST1700_DEV_SGPIOM0 , +ASPEED_AST1700_DEV_SGPIOM1 ,ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 , ASPEED_AST1700_DEV_LTPI_CTRL,
@@ -37,6 +39,8 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, + [ASPEED_AST1700_DEV_SGPIOM0] = 0x00C0C000, + [ASPEED_AST1700_DEV_SGPIOM1] = 0x00C0D000, [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000,
@@ -142,6 +146,16 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_LTPI_CTRL ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ltpi), 0)); +/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sgpiom[i]), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SGPIOM0 + i], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->sgpiom[i]),0 )); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) {AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]);
@@ -194,6 +208,12 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI ); +/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +object_initialize_child (obj,"ioexp-sgpiom[*]" , &s->sgpiom[i], +"aspeed.sgpio-ast2700" ); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) { object_initialize_child(obj, "ioexp-wdt[*]",
Signature · 1 line
2.43.0
Re: [PATCH v3 17/18] hw/arm/aspeed: Attach SGPIOM device to AST1700 model
Quoted 16 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Connect the SGPIOM device to AST1700 model.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 3 +++ hw/arm/aspeed_ast1700.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)include/hw/arm/aspeed_ast1700.h +0
-0
include/hw/arm/aspeed_ast1700.h line 15
Quoted 4 lines
include/hw/arm/aspeed_ast1700.h +1
-0@@ -12,6 +12,7 @@#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/gpio/aspeed_gpio.h" +#include "hw/gpio/aspeed_sgpio.h"
As far as I can tell this depends on Yubin Zou's SGPIO series (link below)? Does that mean the series looks good? Can you reply to the series itself if it is?
Quoted 75 lines
include/hw/arm/aspeed_ast1700.h +2
-0#include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/misc/aspeed_pwm.h" @@ -19,6 +20,7 @@#include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#define AST1700_SGPIO_NUM 2#define AST1700_WDT_NUM 9#define TYPE_ASPEED_AST1700 "aspeed.ast1700"@@ -39,6 +41,7 @@ struct AspeedAST1700SoCState {AspeedADCState adc;AspeedSCUState scu;AspeedGPIOState gpio; +AspeedSGPIOState sgpiom[AST1700_SGPIO_NUM ];AspeedI2CState i2c;AspeedPWMState pwm;AspeedWDTState wdt[AST1700_WDT_NUM ];hw/arm/aspeed_ast1700.c +20
-1@@ -23,6 +23,8 @@ enum {ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_GPIO , +ASPEED_AST1700_DEV_SGPIOM0 , +ASPEED_AST1700_DEV_SGPIOM1 ,ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 , ASPEED_AST1700_DEV_LTPI_CTRL,@@ -37,6 +39,8 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, + [ASPEED_AST1700_DEV_SGPIOM0] = 0x00C0C000, + [ASPEED_AST1700_DEV_SGPIOM1] = 0x00C0D000, [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000,@@ -142,6 +146,16 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_LTPI_CTRL ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ltpi), 0)); +/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sgpiom[i]), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SGPIOM0 + i], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->sgpiom[i]),0 )); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) {AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]);@@ -194,6 +208,12 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI ); +/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +object_initialize_child (obj,"ioexp-sgpiom[*]" , &s->sgpiom[i], +"aspeed.sgpio-ast2700" ); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) { object_initialize_child(obj, "ioexp-wdt[*]", --2.43.0
Re: [PATCH v3 17/18] hw/arm/aspeed: Attach SGPIOM device to AST1700 model
Quoted 26 lines · Nabih Estefan
Quoted 16 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Connect the SGPIOM device to AST1700 model.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 3 +++ hw/arm/aspeed_ast1700.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)include/hw/arm/aspeed_ast1700.h +0
-0include/hw/arm/aspeed_ast1700.h line 15
Quoted 4 lines
include/hw/arm/aspeed_ast1700.h +1
-0@@ -12,6 +12,7 @@#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/gpio/aspeed_gpio.h" +#include "hw/gpio/aspeed_sgpio.h" As far as I can tell this depends on Yubin Zou's SGPIO series (link below)? Does that mean the series looks good? Can you reply to the series itself if it is?
Quoted 1 line
Nabih, Kane, Jamin,
Could you please help review Yubin's series ?
Thanks,
C.
Quoted 75 lines
Quoted 75 lines
include/hw/arm/aspeed_ast1700.h +2
-0#include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/misc/aspeed_pwm.h" @@ -19,6 +20,7 @@#include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#define AST1700_SGPIO_NUM 2#define AST1700_WDT_NUM 9#define TYPE_ASPEED_AST1700 "aspeed.ast1700"@@ -39,6 +41,7 @@ struct AspeedAST1700SoCState {AspeedADCState adc;AspeedSCUState scu;AspeedGPIOState gpio; +AspeedSGPIOState sgpiom[AST1700_SGPIO_NUM ];AspeedI2CState i2c;AspeedPWMState pwm;AspeedWDTState wdt[AST1700_WDT_NUM ];hw/arm/aspeed_ast1700.c +20
-1@@ -23,6 +23,8 @@ enum {ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_GPIO , +ASPEED_AST1700_DEV_SGPIOM0 , +ASPEED_AST1700_DEV_SGPIOM1 ,ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 , ASPEED_AST1700_DEV_LTPI_CTRL,@@ -37,6 +39,8 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, + [ASPEED_AST1700_DEV_SGPIOM0] = 0x00C0C000, + [ASPEED_AST1700_DEV_SGPIOM1] = 0x00C0D000, [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000,@@ -142,6 +146,16 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_LTPI_CTRL ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ltpi), 0)); +/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sgpiom[i]), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SGPIOM0 + i], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->sgpiom[i]),0 )); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) {AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]);@@ -194,6 +208,12 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI ); +/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +object_initialize_child (obj,"ioexp-sgpiom[*]" , &s->sgpiom[i], +"aspeed.sgpio-ast2700" ); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) { object_initialize_child(obj, "ioexp-wdt[*]", --2.43.0
RE: [PATCH v3 17/18] hw/arm/aspeed: Attach SGPIOM device to AST1700 model
Quoted 48 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Tuesday, December 9, 2025 4:49 PM
To: Nabih Estefan <[email protected]>; Kane Chen <[email protected]>
Cc: Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>; Troy Lee <[email protected]>
Subject: Re: [PATCH v3 17/18] hw/arm/aspeed: Attach SGPIOM device to AST1700 modelQuoted 1 line · Nabih Estefan
On Sun, Dec 7, 2025 at 11:48 PM Kane Chen via <[email protected]>
Quoted 5 lines · wrote:
Quoted 5 lines
From: Kane-Chen-AS <[email protected]>
Connect the SGPIOM device to AST1700 model.
Quoted 8 lines
Quoted 8 lines
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 3 +++ hw/arm/aspeed_ast1700.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)(quoted diff) +0
-0
b/include/hw/arm/aspeed_ast1700.hindex7292719dc2..490f2a3b05100644
Quoted 13 lines
include/hw/arm/aspeed_ast1700.h line 15
Quoted 7 lines
include/hw/arm/aspeed_ast1700.h +1
-0@@ -12,6 +12,7 @@#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/gpio/aspeed_gpio.h" +#include "hw/gpio/aspeed_sgpio.h" As far as I can tell this depends on Yubin Zou's SGPIO series (link below)? Does that mean the series looks good? Can you reply to the series itself if it is?
Quoted 7 lines
Nabih, Kane, Jamin,
Could you please help review Yubin's series ?
Thanks,
C.
I will test Yubin’s series, and I will let you know if I encounter anything unexpected.
Best Regards,
Kane
Quoted 84 lines
Quoted 27 lines
Quoted 27 lines
include/hw/arm/aspeed_ast1700.h +2
-0#include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/misc/aspeed_pwm.h" @@ -19,6 +20,7 @@#include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#define AST1700_SGPIO_NUM 2#define AST1700_WDT_NUM 9#define TYPE_ASPEED_AST1700 "aspeed.ast1700"@@ -39,6 +41,7 @@ struct AspeedAST1700SoCState {AspeedADCState adc;AspeedSCUState scu;AspeedGPIOState gpio; +AspeedSGPIOState sgpiom[AST1700_SGPIO_NUM ];AspeedI2CState i2c;AspeedPWMState pwm; AspeedWDTState wdt[AST1700_WDT_NUM]; diff --git
a/hw/arm/aspeed_ast1700.cb/hw/arm/aspeed_ast1700.cindexc9d7a97a80..e027ae02ad100644hw/arm/aspeed_ast1700.c +0
-0@@ -23,6 +23,8 @@ enum { ASPEED_AST1700_DEV_ADC,Quoted 8 lines
hw/arm/aspeed_ast1700.c static const hwaddr aspeed_ast1700_io_memmap[]
Quoted 8 lines
hw/arm/aspeed_ast1700.c +2
-0ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_GPIO , +ASPEED_AST1700_DEV_SGPIOM0 , +ASPEED_AST1700_DEV_SGPIOM1 ,ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 , ASPEED_AST1700_DEV_LTPI_CTRL,@@ -37,6 +39,8 @@ static const hwaddr aspeed_ast1700_io_memmap[]= {
Quoted 8 lines
hw/arm/aspeed_ast1700.c static const hwaddr aspeed_ast1700_io_memmap[] = {
Quoted 8 lines
hw/arm/aspeed_ast1700.c +2
-0[ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, + [ASPEED_AST1700_DEV_SGPIOM0] = 0x00C0C000, + [ASPEED_AST1700_DEV_SGPIOM1] = 0x00C0D000, [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, @@ -142,6+146,16
Quoted 2 lines
Quoted 2 lines
@@ static void
aspeed_ast1700_realize(DeviceState *dev, Error **errp)aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_LTPI_CTRL],
Quoted 10 lines
hw/arm/aspeed_ast1700.c static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) · line 158
Quoted 10 lines
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ltpi), 0));hw/arm/aspeed_ast1700.c +7
-0+/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sgpiom[i]), errp)) { +return ; + } + memory_region_add_subregion(&s->iomem, +aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SGPIOM0 + i],
Quoted 1 line
Quoted 1 line
+
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->sgpiom[i]), 0));Quoted 5 lines
hw/arm/aspeed_ast1700.c static void aspeed_ast1700_realize(DeviceState *dev, Error **errp)
Quoted 5 lines
hw/arm/aspeed_ast1700.c +2
-0+ } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) { AspeedWDTClass *awc =
ASPEED_WDT_GET_CLASS(&s->wdt[i]); @@Quoted 17 lines
Quoted 17 lines
-194,6 +208,12 @@ static void
aspeed_ast1700_instance_init(Object *obj)object_initialize_child(obj, "ltpi-ctrl", &s->ltpi, TYPE_ASPEED_LTPI);hw/arm/aspeed_ast1700.c +6
-1+/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +object_initialize_child (obj,"ioexp-sgpiom[*]" , &s->sgpiom[i], +"aspeed.sgpio-ast2700" ); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) { object_initialize_child(obj, "ioexp-wdt[*]", --2.43.0
RE: [PATCH v3 17/18] hw/arm/aspeed: Attach SGPIOM device to AST1700 model
In reply to Cédric Le GoaterHi Cédric
Quoted 33 lines
Subject: Re: [PATCH v3 17/18] hw/arm/aspeed: Attach SGPIOM device to AST1700 model
Quoted 1 line · Nabih Estefan
On Sun, Dec 7, 2025 at 11:48 PM Kane Chen via <[email protected]>
Quoted 5 lines · wrote:
Quoted 5 lines
From: Kane-Chen-AS <[email protected]>
Connect the SGPIOM device to AST1700 model.
Quoted 8 lines
Quoted 8 lines
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 3 +++ hw/arm/aspeed_ast1700.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)(quoted diff) +0
-0
b/include/hw/arm/aspeed_ast1700.hindex7292719dc2..490f2a3b05100644
Quoted 13 lines
include/hw/arm/aspeed_ast1700.h line 15
Quoted 7 lines
include/hw/arm/aspeed_ast1700.h +1
-0@@ -12,6 +12,7 @@#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/gpio/aspeed_gpio.h" +#include "hw/gpio/aspeed_sgpio.h" As far as I can tell this depends on Yubin Zou's SGPIO series (link below)? Does that mean the series looks good? Can you reply to the series itself if it is?
Quoted 8 lines
Quoted 2 lines
https://lore.kernel.org//qemu-devel/20251106-aspeed-sgpio-v1-0-b026093
[email protected]Nabih, Kane, Jamin,
Could you please help review Yubin's series ?
Cédric, Nabih
Sorry, I’m currently stuck with AST2700 A2 SDK development. I’ve asked Kane to help test the Yubin's SGPIO model. Once I have time, I will try to test Joe’s I3C model.
Jamin
Quoted 87 lines
Thanks,
C.
Quoted 25 lines
Quoted 25 lines
include/hw/arm/aspeed_ast1700.h +2
-0#include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/misc/aspeed_pwm.h" @@ -19,6 +20,7 @@#include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#define AST1700_SGPIO_NUM 2#define AST1700_WDT_NUM 9#define TYPE_ASPEED_AST1700 "aspeed.ast1700"@@ -39,6 +41,7 @@ struct AspeedAST1700SoCState {AspeedADCState adc;AspeedSCUState scu;AspeedGPIOState gpio; +AspeedSGPIOState sgpiom[AST1700_SGPIO_NUM ];AspeedI2CState i2c;AspeedPWMState pwm; AspeedWDTState wdt[AST1700_WDT_NUM]; diff --git
a/hw/arm/aspeed_ast1700.cb/hw/arm/aspeed_ast1700.cindexc9d7a97a80..e027ae02ad100644hw/arm/aspeed_ast1700.c +0
-0@@ -23,6 +23,8 @@ enum { ASPEED_AST1700_DEV_ADC,Quoted 8 lines
hw/arm/aspeed_ast1700.c static const hwaddr aspeed_ast1700_io_memmap[] =
Quoted 8 lines
hw/arm/aspeed_ast1700.c +2
-0ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_GPIO , +ASPEED_AST1700_DEV_SGPIOM0 , +ASPEED_AST1700_DEV_SGPIOM1 ,ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 , ASPEED_AST1700_DEV_LTPI_CTRL,@@ -37,6 +39,8 @@ static const hwaddr aspeed_ast1700_io_memmap[] ={
Quoted 8 lines
hw/arm/aspeed_ast1700.c static const hwaddr aspeed_ast1700_io_memmap[] = {
Quoted 8 lines
hw/arm/aspeed_ast1700.c +2
-0[ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, + [ASPEED_AST1700_DEV_SGPIOM0] = 0x00C0C000, + [ASPEED_AST1700_DEV_SGPIOM1] = 0x00C0D000, [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, @@ -142,6+146,16
Quoted 2 lines
Quoted 2 lines
@@ static void
aspeed_ast1700_realize(DeviceState *dev, Error **errp)aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_LTPI_CTRL],
Quoted 10 lines
hw/arm/aspeed_ast1700.c static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) · line 158
Quoted 10 lines
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ltpi), 0));hw/arm/aspeed_ast1700.c +7
-0+/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sgpiom[i]), errp)) { +return ; + } + memory_region_add_subregion(&s->iomem, +aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SGPIOM0 + i],
Quoted 1 line
Quoted 1 line
+
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->sgpiom[i]), 0));Quoted 5 lines
hw/arm/aspeed_ast1700.c static void aspeed_ast1700_realize(DeviceState *dev, Error **errp)
Quoted 5 lines
hw/arm/aspeed_ast1700.c +2
-0+ } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) { AspeedWDTClass *awc =
ASPEED_WDT_GET_CLASS(&s->wdt[i]); @@Quoted 17 lines
Quoted 17 lines
-194,6 +208,12 @@ static void
aspeed_ast1700_instance_init(Object *obj)object_initialize_child(obj, "ltpi-ctrl", &s->ltpi, TYPE_ASPEED_LTPI);hw/arm/aspeed_ast1700.c +6
-1+/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +object_initialize_child (obj,"ioexp-sgpiom[*]" , &s->sgpiom[i], +"aspeed.sgpio-ast2700" ); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) { object_initialize_child(obj, "ioexp-wdt[*]", --2.43.0
Re: [SPAM] [PATCH v3 17/18] hw/arm/aspeed: Attach SGPIOM device to AST1700 model
In reply to Kane Chen viaQuoted 9 lines · Kane Chen
From: Kane-Chen-AS <[email protected]>
Connect the SGPIOM device to AST1700 model.
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 3 +++ hw/arm/aspeed_ast1700.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)
Did you rebase on Yubin Zou's SGPIO series ?
You can the aspeed-next branch for it.
Thanks,
C.
Quoted 81 lines
include/hw/arm/aspeed_ast1700.h +3
-0@@ -12,6 +12,7 @@#include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/gpio/aspeed_gpio.h" +#include "hw/gpio/aspeed_sgpio.h" #include "hw/i2c/aspeed_i2c.h" #include "hw/misc/aspeed_ltpi.h" #include "hw/misc/aspeed_pwm.h" @@ -19,6 +20,7 @@#include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#define AST1700_SGPIO_NUM 2#define AST1700_WDT_NUM 9#define TYPE_ASPEED_AST1700 "aspeed.ast1700"@@ -39,6 +41,7 @@ struct AspeedAST1700SoCState {AspeedADCState adc;AspeedSCUState scu;AspeedGPIOState gpio; +AspeedSGPIOState sgpiom[AST1700_SGPIO_NUM ];AspeedI2CState i2c;AspeedPWMState pwm;AspeedWDTState wdt[AST1700_WDT_NUM ];hw/arm/aspeed_ast1700.c +20
-0@@ -23,6 +23,8 @@ enum {ASPEED_AST1700_DEV_ADC ,ASPEED_AST1700_DEV_SCU ,ASPEED_AST1700_DEV_GPIO , +ASPEED_AST1700_DEV_SGPIOM0 , +ASPEED_AST1700_DEV_SGPIOM1 ,ASPEED_AST1700_DEV_I2C ,ASPEED_AST1700_DEV_UART12 , ASPEED_AST1700_DEV_LTPI_CTRL,@@ -37,6 +39,8 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_ADC] = 0x00C00000, [ASPEED_AST1700_DEV_SCU] = 0x00C02000, [ASPEED_AST1700_DEV_GPIO] = 0x00C0B000, + [ASPEED_AST1700_DEV_SGPIOM0] = 0x00C0C000, + [ASPEED_AST1700_DEV_SGPIOM1] = 0x00C0D000, [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000,@@ -142,6 +146,16 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_LTPI_CTRL ], sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ltpi), 0)); +/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sgpiom[i]), errp)) { +return ; + } +memory_region_add_subregion (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_SGPIOM0 + i], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->sgpiom[i]),0 )); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) {AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]);@@ -194,6 +208,12 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ltpi-ctrl" , &s->ltpi,TYPE_ASPEED_LTPI ); +/* SGPIOM */ +for (int i =0 ; i <AST1700_SGPIO_NUM ; i++) { +object_initialize_child (obj,"ioexp-sgpiom[*]" , &s->sgpiom[i], +"aspeed.sgpio-ast2700" ); + } +/* WDT */ for (int i =0 ; i <AST1700_WDT_NUM ; i++) { object_initialize_child(obj, "ioexp-wdt[*]",
PATCH v3 18/18 hw/arm/aspeed: Model AST1700 I3C block as unimplemented device
In reply to Kane Chen viaFrom: Kane-Chen-AS <[email protected]>
AST1700 exposes more I3C buses than the current dummy I3C model provides. When Linux probes the I3C devices on AST1700 this mismatch can trigger a kernel panic. Model the I3C block as an unimplemented device to make the missing functionality explicit and avoid unexpected side effects.
This wires up the I3C interrupt lines for the IO expanders and adds the corresponding device entries for the AST1700 model.
No functional I3C emulation is provided yet; this only prevents crashes and documents the missing piece.
--- include/hw/arm/aspeed_ast1700.h | 3 +++ include/hw/arm/aspeed_soc.h | 2 ++ hw/arm/aspeed_ast1700.c | 17 +++++++++++++++++ hw/arm/aspeed_ast27x0.c | 18 ++++++++++++++++-- 4 files changed, 38 insertions(+), 2 deletions(-)
include/hw/arm/aspeed_ast1700.h +3 -0
@@ -19,6 +19,7 @@#include "hw/ssi/aspeed_smc.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#include "hw/misc/unimp.h" #define AST1700_SGPIO_NUM 2#define AST1700_WDT_NUM 9
@@ -45,6 +46,8 @@ struct AspeedAST1700SoCState {AspeedI2CState i2c;AspeedPWMState pwm;AspeedWDTState wdt[AST1700_WDT_NUM ]; + + UnimplementedDeviceState i3c; };#endif /* ASPEED_AST1700_H */
include/hw/arm/aspeed_soc.h +2 -0
@@ -294,6 +294,8 @@ enum {ASPEED_DEV_IOEXP1_I2C ,ASPEED_DEV_IOEXP0_INTCIO ,ASPEED_DEV_IOEXP1_INTCIO , +ASPEED_DEV_IOEXP0_I3C , + ASPEED_DEV_IOEXP1_I3C, };const char *aspeed_soc_cpu_type (const char *const *valid_cpu_types);
hw/arm/aspeed_ast1700.c +17 -0
@@ -15,6 +15,7 @@#define AST2700_SOC_LTPI_SIZE 0x01000000#define AST1700_SOC_SRAM_SIZE 0x00040000 +#define AST1700_SOC_I3C_SIZE 0x00010000enum {ASPEED_AST1700_DEV_SPI0 ,
@@ -26,6 +27,7 @@ enum {ASPEED_AST1700_DEV_SGPIOM0 ,ASPEED_AST1700_DEV_SGPIOM1 ,ASPEED_AST1700_DEV_I2C , +ASPEED_AST1700_DEV_I3C ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , ASPEED_AST1700_DEV_WDT,
@@ -42,6 +44,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SGPIOM0] = 0x00C0C000, [ASPEED_AST1700_DEV_SGPIOM1] = 0x00C0D000, [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, + [ASPEED_AST1700_DEV_I3C] = 0x00C20000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, [ASPEED_AST1700_DEV_WDT] = 0x00C37000,
@@ -171,6 +174,15 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) wdt_offset, sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->wdt[i]), 0)); } + +/* I3C */ +qdev_prop_set_string (DEVICE (&s->i3c),"name" ,"ioexp-i3c" ); +qdev_prop_set_uint64 (DEVICE (&s->i3c),"size" ,AST1700_SOC_I3C_SIZE ); +sysbus_realize (SYS_BUS_DEVICE (&s->i3c), errp); +memory_region_add_subregion_overlap (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_I3C ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->i3c),0 ), +-1000 ); }static void aspeed_ast1700_instance_init (Object *obj)
@@ -219,6 +231,11 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-wdt[*]" , &s->wdt[i],"aspeed.wdt-ast2700" ); } + +/* I3C */ +object_initialize_child (obj,"ioexp-i3c[*]" , &s->i3c, +TYPE_UNIMPLEMENTED_DEVICE ); +return ; }
hw/arm/aspeed_ast27x0.c +16 -2
@@ -206,7 +206,9 @@ static const int aspeed_soc_ast2700a1_irqmap[] = { [ASPEED_DEV_PECI] = 197, [ASPEED_DEV_SDHCI] = 197, [ASPEED_DEV_IOEXP0_I2C] = 198, + [ASPEED_DEV_IOEXP0_I3C] = 199, [ASPEED_DEV_IOEXP1_I2C] = 200, + [ASPEED_DEV_IOEXP1_I3C] = 201, };/* GICINT 128 */
@@ -275,12 +277,24 @@ static const int ast2700_gic198_intcmap[] = { [ASPEED_DEV_IOEXP0_I2C] = 0, /* 0 - 15 */ }; +/* Primary AST1700 Interrupts */ +/* A1: GINTC 199 */ +static const int ast2700_gic199_intcmap[] = { + [ASPEED_DEV_IOEXP0_I3C ] =0 ,/* 0 - 15 */ +}; +/* Secondary AST1700 Interrupts */ /* A1: GINTC 200 */ static const int ast2700_gic200_intcmap[] = { [ASPEED_DEV_IOEXP1_I2C ] =0 ,/* 0 - 15 */ }; +/* Secondary AST1700 Interrupts */ +/* A1: GINTC 201 */ +static const int ast2700_gic201_intcmap[] = { + [ASPEED_DEV_IOEXP1_I3C ] =0 ,/* 0 - 15 */ +}; +/* GICINT 128 ~ 136 */ /* GICINT 192 ~ 201 */ struct gic_intc_irq_info {
@@ -298,9 +312,9 @@ static const struct gic_intc_irq_info ast2700_gic_intcmap[] = { {196, 1, 4, ast2700_gic132_gic196_intcmap}, {197, 1, 5, ast2700_gic133_gic197_intcmap}, {198, 2, 0, ast2700_gic198_intcmap}, - {199, 1, 7, NULL}, + {199, 2, 1, ast2700_gic199_intcmap}, {200, 3, 0, ast2700_gic200_intcmap}, - {201, 1, 9, NULL}, + {201, 3, 1, ast2700_gic201_intcmap}, {128, 0, 1, ast2700_gic128_gic192_intcmap}, {129, 0, 2, NULL}, {130, 0, 3, ast2700_gic130_gic194_intcmap},
Signature · 1 line
2.43.0
Re: [PATCH v3 18/18] hw/arm/aspeed: Model AST1700 I3C block as unimplemented device
Quoted 9 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
AST1700 exposes more I3C buses than the current dummy I3C model provides. When Linux probes the I3C devices on AST1700 this mismatch can trigger a kernel panic. Model the I3C block as an unimplemented device to make the missing functionality explicit and avoid unexpected side effects.
Quoted 5 lines
This wires up the I3C interrupt lines for the IO expanders and adds the corresponding device entries for the AST1700 model.
No functional I3C emulation is provided yet; this only prevents crashes and documents the missing piece.
Would you be able to help review Joe Komlodi's I3C support patchset (link below)?
I think it probably fills in this gap.
(We don't need to block this submission on that landing though)
https://lists.gnu.org/archive/html/qemu-arm/2025-06/msg00403.html
Quoted 154 lines
Signed-off-by Kane-Chen-AS <[email protected]>--- include/hw/arm/aspeed_ast1700.h | 3 +++ include/hw/arm/aspeed_soc.h | 2 ++ hw/arm/aspeed_ast1700.c | 17 +++++++++++++++++ hw/arm/aspeed_ast27x0.c | 18 ++++++++++++++++-- 4 files changed, 38 insertions(+), 2 deletions(-)include/hw/arm/aspeed_ast1700.h +3
-0@@ -19,6 +19,7 @@#include "hw/ssi/aspeed_smc.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/char/serial-mm.h" +#include "hw/misc/unimp.h" #define AST1700_SGPIO_NUM 2#define AST1700_WDT_NUM 9@@ -45,6 +46,8 @@ struct AspeedAST1700SoCState {AspeedI2CState i2c;AspeedPWMState pwm;AspeedWDTState wdt[AST1700_WDT_NUM ]; + + UnimplementedDeviceState i3c; };#endif /* ASPEED_AST1700_H */ include/hw/arm/aspeed_soc.h +2
-0@@ -294,6 +294,8 @@ enum {ASPEED_DEV_IOEXP1_I2C ,ASPEED_DEV_IOEXP0_INTCIO ,ASPEED_DEV_IOEXP1_INTCIO , +ASPEED_DEV_IOEXP0_I3C , + ASPEED_DEV_IOEXP1_I3C, };const char *aspeed_soc_cpu_type (const char *const *valid_cpu_types);hw/arm/aspeed_ast1700.c +17
-0@@ -15,6 +15,7 @@#define AST2700_SOC_LTPI_SIZE 0x01000000#define AST1700_SOC_SRAM_SIZE 0x00040000 +#define AST1700_SOC_I3C_SIZE 0x00010000enum {ASPEED_AST1700_DEV_SPI0 ,@@ -26,6 +27,7 @@ enum {ASPEED_AST1700_DEV_SGPIOM0 ,ASPEED_AST1700_DEV_SGPIOM1 ,ASPEED_AST1700_DEV_I2C , +ASPEED_AST1700_DEV_I3C ,ASPEED_AST1700_DEV_UART12 ,ASPEED_AST1700_DEV_LTPI_CTRL , ASPEED_AST1700_DEV_WDT,@@ -42,6 +44,7 @@ static const hwaddr aspeed_ast1700_io_memmap[] = { [ASPEED_AST1700_DEV_SGPIOM0] = 0x00C0C000, [ASPEED_AST1700_DEV_SGPIOM1] = 0x00C0D000, [ASPEED_AST1700_DEV_I2C] = 0x00C0F000, + [ASPEED_AST1700_DEV_I3C] = 0x00C20000, [ASPEED_AST1700_DEV_UART12] = 0x00C33B00, [ASPEED_AST1700_DEV_LTPI_CTRL] = 0x00C34000, [ASPEED_AST1700_DEV_WDT] = 0x00C37000,@@ -171,6 +174,15 @@ static void aspeed_ast1700_realize(DeviceState *dev, Error **errp) wdt_offset, sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->wdt[i]), 0)); } + +/* I3C */ +qdev_prop_set_string (DEVICE (&s->i3c),"name" ,"ioexp-i3c" ); +qdev_prop_set_uint64 (DEVICE (&s->i3c),"size" ,AST1700_SOC_I3C_SIZE ); +sysbus_realize (SYS_BUS_DEVICE (&s->i3c), errp); +memory_region_add_subregion_overlap (&s->iomem, + aspeed_ast1700_io_memmap[ASPEED_AST1700_DEV_I3C ], +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->i3c),0 ), +-1000 ); }static void aspeed_ast1700_instance_init (Object *obj)@@ -219,6 +231,11 @@ static void aspeed_ast1700_instance_init(Object *obj)object_initialize_child (obj,"ioexp-wdt[*]" , &s->wdt[i],"aspeed.wdt-ast2700" ); } + +/* I3C */ +object_initialize_child (obj,"ioexp-i3c[*]" , &s->i3c, +TYPE_UNIMPLEMENTED_DEVICE ); +return ; }hw/arm/aspeed_ast27x0.c +16
-3@@ -206,7 +206,9 @@ static const int aspeed_soc_ast2700a1_irqmap[] = { [ASPEED_DEV_PECI] = 197, [ASPEED_DEV_SDHCI] = 197, [ASPEED_DEV_IOEXP0_I2C] = 198, + [ASPEED_DEV_IOEXP0_I3C] = 199, [ASPEED_DEV_IOEXP1_I2C] = 200, + [ASPEED_DEV_IOEXP1_I3C] = 201, };/* GICINT 128 */ @@ -275,12 +277,24 @@ static const int ast2700_gic198_intcmap[] = { [ASPEED_DEV_IOEXP0_I2C] = 0, /* 0 - 15 */ }; +/* Primary AST1700 Interrupts */ +/* A1: GINTC 199 */ +static const int ast2700_gic199_intcmap[] = { + [ASPEED_DEV_IOEXP0_I3C ] =0 ,/* 0 - 15 */ +}; +/* Secondary AST1700 Interrupts */ /* A1: GINTC 200 */ static const int ast2700_gic200_intcmap[] = { [ASPEED_DEV_IOEXP1_I2C ] =0 ,/* 0 - 15 */ }; +/* Secondary AST1700 Interrupts */ +/* A1: GINTC 201 */ +static const int ast2700_gic201_intcmap[] = { + [ASPEED_DEV_IOEXP1_I3C ] =0 ,/* 0 - 15 */ +}; +/* GICINT 128 ~ 136 */ /* GICINT 192 ~ 201 */ struct gic_intc_irq_info {@@ -298,9 +312,9 @@ static const struct gic_intc_irq_info ast2700_gic_intcmap[] = { {196, 1, 4, ast2700_gic132_gic196_intcmap}, {197, 1, 5, ast2700_gic133_gic197_intcmap}, {198, 2, 0, ast2700_gic198_intcmap}, - {199, 1, 7, NULL}, + {199, 2, 1, ast2700_gic199_intcmap}, {200, 3, 0, ast2700_gic200_intcmap}, - {201, 1, 9, NULL}, + {201, 3, 1, ast2700_gic201_intcmap}, {128, 0, 1, ast2700_gic128_gic192_intcmap}, {129, 0, 2, NULL}, {130, 0, 3, ast2700_gic130_gic194_intcmap}, --2.43.0
Re: [PATCH v3 18/18] hw/arm/aspeed: Model AST1700 I3C block as unimplemented device
Quoted 13 lines · Nabih Estefan
Quoted 12 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
AST1700 exposes more I3C buses than the current dummy I3C model provides. When Linux probes the I3C devices on AST1700 this mismatch can trigger a kernel panic. Model the I3C block as an unimplemented device to make the missing functionality explicit and avoid unexpected side effects.
This wires up the I3C interrupt lines for the IO expanders and adds the corresponding device entries for the AST1700 model.
Quoted 6 lines
Quoted 2 lines
No functional I3C emulation is provided yet; this only prevents crashes and documents the missing piece.
Would you be able to help review Joe Komlodi's I3C support patchset (link below)?
I think it probably fills in this gap.
yes. I have been keeping Joe's series in my tree for a while now. It looks saneand it would be great if someone could dedicate some time to the review.
Can we make this a target for QEMU 11.0 ?
Thanks,
C.
Quoted 48 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Hi all,
LTPI (LVDS Tunneling Protocol & Interface) is defined in the OCP DC-SCM 2.0 specification (see Figure 2):
https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-pdfLTPI provides a protocol and physical interface for tunneling various low-speed signals between the Host Processor Module (HPM) and the Satellite Controller Module (SCM). In Figure 2 of the specification, the AST27x0 SoC (left) integrates two LTPI controllers, allowing it to connect to up to two AST1700 boards. On the other side, the AST1700 consolidates HPM FPGA functions and multiple peripheral interfaces (GPIO, UART, I2C, I3C, etc.) onto a single board.
Because the AST1700 exposes additional I/O interfaces (GPIO, I2C, I3C, and others), it acts as an I/O expander. Once connected over LTPI, the AST27x0 can control additional downstream devices through this link.
This patch series is based on the SGPIO changes:
https://lore.kernel.org/qemu-devel/[email protected]/It introduces a basic LTPI controller model and wires it into the AST27x0 SoC. The series also adds the AST1700-specific LTPI expander device and incrementally connects common peripherals on the AST1700 model. For the I3C block, which may cause kernel crashes, its MMIO region is modeled as an unimplemented device to reserve address space and make the missing functionality explicit, ensuring stable guest probing.
In the official release images, the AST1700 functions are not included by default. To test the AST1700-related functionality, please include the following DTS files for probing:
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/arm64/boot/dts/aspeed/aspeed-ltpi0.dtsi
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/arm64/boot/dts/aspeed/aspeed-ltpi1.dtsiAfter including these DTS files in the BMC image, you can verify LTPI functionality using the following scenarios:
1. In U-Boot:
Run the ltpi command to trigger the LTPI connection and display the current connection status.
2. In BMC Linux:
Run i2cdetect -y <16-38> to scan and test the I2C buses exposed by the AST1700.
Quoted 4 lines
Any feedback or suggestions are appreciated!
Kane
I left some nit-picky notes on some of the patches, but after fixing patch 03 everything else seems good. FWIW I brought the whole patchset into our branch and not only does everything compile properly, but I can also see and interact with the i2c buses from the AST1700 in our internal platforms. Will wait for v4 to add the reviewed and tested tags, but LGTM!
Quoted 65 lines
---
ChangeLog
---------
v3:
- Add PWM model
- Integrate the SGPIO model
- Fix I2C test case failure
- Refine code structurev2:
- Separate the AST1700 model into a standalone implementation
- Refine the mechanism for assigning the AST1700 board numberv1:
- Initial version
---Kane-Chen-AS (18):
hw/misc: Add LTPI controller
hw/arm/aspeed: Attach LTPI controller to AST27X0 platform hw/misc: Add basic Aspeed PWM model
hw/arm/aspeed: Add AST1700 LTPI expander device model hw/arm/aspeed: Integrate AST1700 device into AST27X0 hw/arm/aspeed: Integrate interrupt controller for AST1700 hw/arm/aspeed: Attach LTPI controller to AST1700 model hw/arm/aspeed: Attach UART device to AST1700 model hw/arm/aspeed: Attach SRAM device to AST1700 model hw/arm/aspeed: Attach SPI device to AST1700 model hw/arm/aspeed: Attach ADC device to AST1700 model hw/arm/aspeed: Attach SCU device to AST1700 model hw/arm/aspeed: Attach GPIO device to AST1700 model hw/arm/aspeed: attach I2C device to AST1700 model hw/arm/aspeed: Attach WDT device to AST1700 model hw/arm/aspeed: Attach PWM device to AST1700 model hw/arm/aspeed: Attach SGPIOM device to AST1700 model hw/arm/aspeed: Model AST1700 I3C block as unimplemented deviceinclude/hw/arm/aspeed_ast1700.h | 53 +++++++ include/hw/arm/aspeed_soc.h | 25 ++- include/hw/i2c/aspeed_i2c.h | 1 + include/hw/intc/aspeed_intc.h | 2 + include/hw/misc/aspeed_ltpi.h | 32 ++++ include/hw/misc/aspeed_pwm.h | 31 ++++ hw/arm/aspeed_ast1700.c | 269 ++++++++++++++++++++++++++++++++ hw/arm/aspeed_ast27x0.c | 163 +++++++++++++++++-- hw/i2c/aspeed_i2c.c | 19 ++- hw/intc/aspeed_intc.c | 60 +++++++ hw/misc/aspeed_ltpi.c | 194 +++++++++++++++++++++++ hw/misc/aspeed_pwm.c | 121 ++++++++++++++ hw/arm/meson.build | 1 + hw/misc/meson.build | 2 + hw/misc/trace-events | 4 + 15 files changed, 957 insertions(+), 20 deletions(-) create mode 100644 include/hw/arm/aspeed_ast1700.h create mode 100644 include/hw/misc/aspeed_ltpi.h create mode 100644 include/hw/misc/aspeed_pwm.h create mode 100644 hw/arm/aspeed_ast1700.c create mode 100644 hw/misc/aspeed_ltpi.c create mode 100644 hw/misc/aspeed_pwm.c--
2.43.0
Hi Nabih,
Thank you for your review and comments. I will wait a few more days to see if there is additional feedback from others. If you encounter anything unexpected in your local environment, please let me know. I will try to address it in the v4 patch if possible.
Best regards,
Kane
Quoted 145 lines
-----Original Message-----
From: Nabih Estefan <[email protected]>
Sent: Thursday, December 11, 2025 7:02 AM
To: Kane Chen <[email protected]>
Cc: Cédric Le Goater <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>; Troy Lee <[email protected]>
Subject: Re: [PATCH v3 00/18] hw/arm/aspeed: AST1700 LTPI support and device hookupsQuoted 34 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Hi all,
LTPI (LVDS Tunneling Protocol & Interface) is defined in the OCP DC-SCM
2.0 specification (see Figure 2):
https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-pdfLTPI provides a protocol and physical interface for tunneling various low-speed signals between the Host Processor Module (HPM) and the Satellite Controller Module (SCM). In Figure 2 of the specification, the AST27x0 SoC (left) integrates two LTPI controllers, allowing it to connect to up to two AST1700 boards. On the other side, the AST1700 consolidates HPM FPGA functions and multiple peripheral interfaces (GPIO, UART, I2C, I3C, etc.) onto a single board.
Because the AST1700 exposes additional I/O interfaces (GPIO, I2C, I3C, and others), it acts as an I/O expander. Once connected over LTPI, the AST27x0 can control additional downstream devices through this link.
This patch series is based on the SGPIO changes:
https://lore.kernel.org/qemu-devel/20251106-aspeed-sgpio-v1-0-b0260937
[email protected]/It introduces a basic LTPI controller model and wires it into the AST27x0 SoC. The series also adds the AST1700-specific LTPI expander device and incrementally connects common peripherals on the AST1700 model. For the I3C block, which may cause kernel crashes, its MMIO region is modeled as an unimplemented device to reserve address space and make the missing functionality explicit, ensuring stable guest probing.
Quoted 4 lines
In the official release images, the AST1700 functions are not included by default. To test the AST1700-related functionality, please include the following DTS files for probing:
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/a
Quoted 2 lines
rm64/boot/dts/aspeed/aspeed-ltpi0.dtsihttps://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/a
Quoted 12 lines
rm64/boot/dts/aspeed/aspeed-ltpi1.dtsiAfter including these DTS files in the BMC image, you can verify LTPI functionality using the following scenarios:
1. In U-Boot:
Run the ltpi command to trigger the LTPI connection and display the current connection status.
2. In BMC Linux:
Run i2cdetect -y <16-38> to scan and test the I2C buses exposed by the AST1700.Quoted 4 lines
Any feedback or suggestions are appreciated!
Kane
I left some nit-picky notes on some of the patches, but after fixing patch 03 everything else seems good. FWIW I brought the whole patchset into our branch and not only does everything compile properly, but I can also see and interact with the i2c buses from the AST1700 in our internal platforms. Will wait for v4 to add the reviewed and tested tags, but LGTM!
Quoted 38 lines
---
ChangeLog
---------
v3:
- Add PWM model
- Integrate the SGPIO model
- Fix I2C test case failure
- Refine code structurev2:
- Separate the AST1700 model into a standalone implementation
- Refine the mechanism for assigning the AST1700 board numberv1:
- Initial version
---Kane-Chen-AS (18):
hw/misc: Add LTPI controller
hw/arm/aspeed: Attach LTPI controller to AST27X0 platform hw/misc: Add basic Aspeed PWM model
hw/arm/aspeed: Add AST1700 LTPI expander device model hw/arm/aspeed: Integrate AST1700 device into AST27X0 hw/arm/aspeed: Integrate interrupt controller for AST1700 hw/arm/aspeed: Attach LTPI controller to AST1700 model hw/arm/aspeed: Attach UART device to AST1700 model hw/arm/aspeed: Attach SRAM device to AST1700 model hw/arm/aspeed: Attach SPI device to AST1700 model hw/arm/aspeed: Attach ADC device to AST1700 model hw/arm/aspeed: Attach SCU device to AST1700 model hw/arm/aspeed: Attach GPIO device to AST1700 model hw/arm/aspeed: attach I2C device to AST1700 model hw/arm/aspeed: Attach WDT device to AST1700 model hw/arm/aspeed: Attach PWM device to AST1700 model hw/arm/aspeed: Attach SGPIOM device to AST1700 model hw/arm/aspeed: Model AST1700 I3C block as unimplemented deviceQuoted 7 lines
include/hw/arm/aspeed_ast1700.h | 53 +++++++ include/hw/arm/aspeed_soc.h | 25 ++- include/hw/i2c/aspeed_i2c.h | 1 + include/hw/intc/aspeed_intc.h | 2 + include/hw/misc/aspeed_ltpi.h | 32 ++++ include/hw/misc/aspeed_pwm.h | 31 ++++ hw/arm/aspeed_ast1700.c | 269++++++++++++++++++++++++++++++++
Quoted 19 lines
hw/arm/aspeed_ast27x0.c | 163 +++++++++++++++++-- hw/i2c/aspeed_i2c.c | 19 ++- hw/intc/aspeed_intc.c | 60 +++++++ hw/misc/aspeed_ltpi.c | 194 +++++++++++++++++++++++ hw/misc/aspeed_pwm.c | 121 ++++++++++++++ hw/arm/meson.build | 1 + hw/misc/meson.build | 2 + hw/misc/trace-events | 4 + 15 files changed, 957 insertions(+), 20 deletions(-) create mode100644
include/hw/arm/aspeed_ast1700.hcreate mode 100644include/hw/misc/aspeed_ltpi.hcreate mode 100644include/hw/misc/aspeed_pwm.hcreate mode 100644hw/arm/aspeed_ast1700.ccreate mode 100644hw/misc/aspeed_ltpi.ccreate mode 100644hw/misc/aspeed_pwm.c--
2.43.0
Quoted 10 lines · Kane Chen
Hi Nabih,
Thank you for your review and comments. I will wait a few more days to see if there is additional feedback from others. If you encounter anything unexpected in your local environment, please let me know. I will try to address it in the v4 patch if possible.
Best regards,
Kane
Hi Kane,
I just discovered that our machines seem to fail to boot halfway through the stack, but work as expected at the top of the stack. My guess is that the driver for the AST1700 doesn't quite know how to deal with half the model existing and half of it missing. Is it possible to reorganize the patches so the hw/arm/aspeed: Integrate AST1700 device into AST27X0 patch comes last? That way the driver will only know of the existence of the AST1700 when the model fully exists in QEMU. Mostly to make sure the machine works in any commit and not just at HEAD.
Thanks!
Nabih
Quoted 145 lines
Quoted 145 lines
-----Original Message-----
From: Nabih Estefan <[email protected]>
Sent: Thursday, December 11, 2025 7:02 AM
To: Kane Chen <[email protected]>
Cc: Cédric Le Goater <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>; Troy Lee <[email protected]>
Subject: Re: [PATCH v3 00/18] hw/arm/aspeed: AST1700 LTPI support and device hookupsQuoted 34 lines · Kane Chen via
From: Kane-Chen-AS <[email protected]>
Hi all,
LTPI (LVDS Tunneling Protocol & Interface) is defined in the OCP DC-SCM
2.0 specification (see Figure 2):
https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-pdfLTPI provides a protocol and physical interface for tunneling various low-speed signals between the Host Processor Module (HPM) and the Satellite Controller Module (SCM). In Figure 2 of the specification, the AST27x0 SoC (left) integrates two LTPI controllers, allowing it to connect to up to two AST1700 boards. On the other side, the AST1700 consolidates HPM FPGA functions and multiple peripheral interfaces (GPIO, UART, I2C, I3C, etc.) onto a single board.
Because the AST1700 exposes additional I/O interfaces (GPIO, I2C, I3C, and others), it acts as an I/O expander. Once connected over LTPI, the AST27x0 can control additional downstream devices through this link.
This patch series is based on the SGPIO changes:
https://lore.kernel.org/qemu-devel/20251106-aspeed-sgpio-v1-0-b0260937
[email protected]/It introduces a basic LTPI controller model and wires it into the AST27x0 SoC. The series also adds the AST1700-specific LTPI expander device and incrementally connects common peripherals on the AST1700 model. For the I3C block, which may cause kernel crashes, its MMIO region is modeled as an unimplemented device to reserve address space and make the missing functionality explicit, ensuring stable guest probing.
Quoted 4 lines
In the official release images, the AST1700 functions are not included by default. To test the AST1700-related functionality, please include the following DTS files for probing:
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/a
Quoted 2 lines
rm64/boot/dts/aspeed/aspeed-ltpi0.dtsihttps://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/a
Quoted 12 lines
rm64/boot/dts/aspeed/aspeed-ltpi1.dtsiAfter including these DTS files in the BMC image, you can verify LTPI functionality using the following scenarios:
1. In U-Boot:
Run the ltpi command to trigger the LTPI connection and display the current connection status.
2. In BMC Linux:
Run i2cdetect -y <16-38> to scan and test the I2C buses exposed by the AST1700.Quoted 4 lines
Any feedback or suggestions are appreciated!
Kane
I left some nit-picky notes on some of the patches, but after fixing patch 03 everything else seems good. FWIW I brought the whole patchset into our branch and not only does everything compile properly, but I can also see and interact with the i2c buses from the AST1700 in our internal platforms. Will wait for v4 to add the reviewed and tested tags, but LGTM!
Quoted 38 lines
---
ChangeLog
---------
v3:
- Add PWM model
- Integrate the SGPIO model
- Fix I2C test case failure
- Refine code structurev2:
- Separate the AST1700 model into a standalone implementation
- Refine the mechanism for assigning the AST1700 board numberv1:
- Initial version
---Kane-Chen-AS (18):
hw/misc: Add LTPI controller
hw/arm/aspeed: Attach LTPI controller to AST27X0 platform hw/misc: Add basic Aspeed PWM model
hw/arm/aspeed: Add AST1700 LTPI expander device model hw/arm/aspeed: Integrate AST1700 device into AST27X0 hw/arm/aspeed: Integrate interrupt controller for AST1700 hw/arm/aspeed: Attach LTPI controller to AST1700 model hw/arm/aspeed: Attach UART device to AST1700 model hw/arm/aspeed: Attach SRAM device to AST1700 model hw/arm/aspeed: Attach SPI device to AST1700 model hw/arm/aspeed: Attach ADC device to AST1700 model hw/arm/aspeed: Attach SCU device to AST1700 model hw/arm/aspeed: Attach GPIO device to AST1700 model hw/arm/aspeed: attach I2C device to AST1700 model hw/arm/aspeed: Attach WDT device to AST1700 model hw/arm/aspeed: Attach PWM device to AST1700 model hw/arm/aspeed: Attach SGPIOM device to AST1700 model hw/arm/aspeed: Model AST1700 I3C block as unimplemented deviceQuoted 7 lines
include/hw/arm/aspeed_ast1700.h | 53 +++++++ include/hw/arm/aspeed_soc.h | 25 ++- include/hw/i2c/aspeed_i2c.h | 1 + include/hw/intc/aspeed_intc.h | 2 + include/hw/misc/aspeed_ltpi.h | 32 ++++ include/hw/misc/aspeed_pwm.h | 31 ++++ hw/arm/aspeed_ast1700.c | 269++++++++++++++++++++++++++++++++
Quoted 19 lines
hw/arm/aspeed_ast27x0.c | 163 +++++++++++++++++-- hw/i2c/aspeed_i2c.c | 19 ++- hw/intc/aspeed_intc.c | 60 +++++++ hw/misc/aspeed_ltpi.c | 194 +++++++++++++++++++++++ hw/misc/aspeed_pwm.c | 121 ++++++++++++++ hw/arm/meson.build | 1 + hw/misc/meson.build | 2 + hw/misc/trace-events | 4 + 15 files changed, 957 insertions(+), 20 deletions(-) create mode100644
include/hw/arm/aspeed_ast1700.hcreate mode 100644include/hw/misc/aspeed_ltpi.hcreate mode 100644include/hw/misc/aspeed_pwm.hcreate mode 100644hw/arm/aspeed_ast1700.ccreate mode 100644hw/misc/aspeed_ltpi.ccreate mode 100644hw/misc/aspeed_pwm.c--
2.43.0
Hi Nabih,
Sure. I will adjust the patch sequence in the next revision.
Best regards,
Kane
Quoted 199 lines
-----Original Message-----
From: Nabih Estefan <[email protected]>
Sent: Tuesday, December 16, 2025 3:55 AM
To: Kane Chen <[email protected]>
Cc: Cédric Le Goater <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>; Troy Lee <[email protected]>
Subject: Re: [PATCH v3 00/18] hw/arm/aspeed: AST1700 LTPI support and device hookupsQuoted 10 lines · Kane Chen
Hi Nabih,
Thank you for your review and comments. I will wait a few more days to see if there is additional feedback from others. If you encounter anything unexpected in your local environment, please let me know. I will try to address it in the v4 patch if possible.
Best regards,
KaneHi Kane,
I just discovered that our machines seem to fail to boot halfway through the stack, but work as expected at the top of the stack. My guess is that the driver for the AST1700 doesn't quite know how to deal with half the model existing and half of it missing. Is it possible to reorganize the patches so the `hw/arm/aspeed: Integrate
AST1700 device into AST27X0` patch comes last? That way the driver will only know of the existence of the AST1700 when the model fully exists in QEMU. Mostly to make sure the machine works in any commit and not just at HEAD.Thanks!
NabihQuoted 9 lines
Quoted 9 lines
-----Original Message-----
From: Nabih Estefan <[email protected]>
Sent: Thursday, December 11, 2025 7:02 AM
To: Kane Chen <[email protected]>
Cc: Cédric Le Goater <[email protected]>; Peter Maydell <[email protected]>; Steven Lee <[email protected]>; Troy Lee <[email protected]>; Jamin Lin <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; open list:ASPEED BMCs <[email protected]>;open
Quoted 9 lines
Quoted 9 lines
list:All patches CC here <[email protected]>; Troy Lee <[email protected]>
Subject: Re: [PATCH v3 00/18] hw/arm/aspeed: AST1700 LTPI support and device hookupsQuoted 1 line · Kane Chen via
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
From: Kane-Chen-AS <[email protected]>
Hi all,
LTPI (LVDS Tunneling Protocol & Interface) is defined in the OCP DC-SCM
2.0 specification (see Figure 2):https://www.opencompute.org/documents/ocp-dc-scm-2-0-ltpi-ver-1-0-
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
LTPI provides a protocol and physical interface for tunneling various low-speed signals between the Host Processor Module (HPM) and the Satellite Controller Module (SCM). In Figure 2 of the specification, the AST27x0 SoC (left) integrates two LTPI controllers, allowing it to connect to up to two AST1700 boards. On the other side, the AST1700 consolidates HPM FPGA functions and multiple peripheral interfaces (GPIO, UART, I2C, I3C, etc.) onto a single
board.
Quoted 43 lines
Quoted 43 lines
Quoted 19 lines
Because the AST1700 exposes additional I/O interfaces (GPIO, I2C, I3C, and others), it acts as an I/O expander. Once connected over LTPI, the
AST27x0 can control additional downstream devices through this link.This patch series is based on the SGPIO changes:
https://lore.kernel.org/qemu-devel/20251106-aspeed-sgpio-v1-0-b026
0937
[email protected]/It introduces a basic LTPI controller model and wires it into the AST27x0 SoC. The series also adds the AST1700-specific LTPI expander device and incrementally connects common peripherals on the AST1700 model. For the I3C block, which may cause kernel crashes, its MMIO region is modeled as an unimplemented device to reserve address space and make the missing functionality explicit, ensuring stable guest probing.
Quoted 4 lines
In the official release images, the AST1700 functions are not included by default. To test the AST1700-related functionality, please include the following DTS files for probing:
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch
/aQuoted 2 lines
rm64/boot/dts/aspeed/aspeed-ltpi0.dtsihttps://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch
/aQuoted 14 lines
rm64/boot/dts/aspeed/aspeed-ltpi1.dtsiAfter including these DTS files in the BMC image, you can verify LTPI functionality using the following scenarios:
1. In U-Boot:
Run the ltpi command to trigger the LTPI connection and display the current connection status.
2. In BMC Linux:
Run i2cdetect -y <16-38> to scan and test the I2C buses exposed by the AST1700.Any feedback or suggestions are appreciated!
Quoted 8 lines
Quoted 8 lines
Quoted 2 lines
Kane
I left some nit-picky notes on some of the patches, but after fixing patch 03 everything else seems good. FWIW I brought the whole patchset into our branch and not only does everything compile properly, but I can also see and interact with the i2c buses from the AST1700 in our internal platforms. Will wait for v4 to add the reviewed
and tested tags, but LGTM!
Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
---
ChangeLog
---------
v3:
- Add PWM model
- Integrate the SGPIO model
- Fix I2C test case failure
- Refine code structurev2:
- Separate the AST1700 model into a standalone implementation
- Refine the mechanism for assigning the AST1700 board numberv1:
- Initial version
---Kane-Chen-AS (18):
hw/misc: Add LTPI controller
hw/arm/aspeed: Attach LTPI controller to AST27X0 platform hw/misc: Add basic Aspeed PWM model
hw/arm/aspeed: Add AST1700 LTPI expander device model hw/arm/aspeed: Integrate AST1700 device into AST27X0 hw/arm/aspeed: Integrate interrupt controller for AST1700 hw/arm/aspeed: Attach LTPI controller to AST1700 model hw/arm/aspeed: Attach UART device to AST1700 model hw/arm/aspeed: Attach SRAM device to AST1700 model hw/arm/aspeed: Attach SPI device to AST1700 model hw/arm/aspeed: Attach ADC device to AST1700 model hw/arm/aspeed: Attach SCU device to AST1700 model hw/arm/aspeed: Attach GPIO device to AST1700 model hw/arm/aspeed: attach I2C device to AST1700 model hw/arm/aspeed: Attach WDT device to AST1700 model hw/arm/aspeed: Attach PWM device to AST1700 model hw/arm/aspeed: Attach SGPIOM device to AST1700 model hw/arm/aspeed: Model AST1700 I3C block as unimplemented deviceinclude/hw/arm/aspeed_ast1700.h | 53 +++++++ include/hw/arm/aspeed_soc.h | 25 ++- include/hw/i2c/aspeed_i2c.h | 1 + include/hw/intc/aspeed_intc.h | 2 + include/hw/misc/aspeed_ltpi.h | 32 ++++ include/hw/misc/aspeed_pwm.h | 31 ++++ hw/arm/aspeed_ast1700.c | 269Quoted 5 lines
Quoted 5 lines
++++++++++++++++++++++++++++++++
Quoted 4 lines
hw/arm/aspeed_ast27x0.c | 163 +++++++++++++++++-- hw/i2c/aspeed_i2c.c | 19 ++- hw/intc/aspeed_intc.c | 60 +++++++ hw/misc/aspeed_ltpi.c | 194+++++++++++++++++++++++
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
hw/misc/aspeed_pwm.c | 121 ++++++++++++++ hw/arm/meson.build | 1 + hw/misc/meson.build | 2 + hw/misc/trace-events | 4 + 15 files changed, 957 insertions(+), 20 deletions(-) create mode100644
include/hw/arm/aspeed_ast1700.hcreate mode 100644include/hw/misc/aspeed_ltpi.hcreate mode 100644include/hw/misc/aspeed_pwm.hcreate mode 100644hw/arm/aspeed_ast1700.ccreate mode 100644
hw/misc/aspeed_ltpi.cQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
create mode 100644
hw/misc/aspeed_pwm.c--
2.43.0