mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
hw/arm/aspeed_ast27x0-tsp: Change to use Aspeed27x0CoprocessorState
Refactor the AST27x0 TSP implementation to use the unified Aspeed27x0CoprocessorState, matching the prior SSP change and removing the duplicated Aspeed27x0TSPSoCState. Key updates: - Delete Aspeed27x0TSPSoCState and reuse Aspeed27x0CoprocessorState. Update Ast2700FCState to declare tsp as Aspeed27x0CoprocessorState. This aligns TSP with SSP on a single coprocessor state type, reducing code duplication and simplifying maintenance. No functional change. Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Link: https://lore.kernel.org/qemu-devel/20251013054334.955331-14-jamin_lin@aspeedtech.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
committed by
Cédric Le Goater
parent
9a255419e9
commit
012d952c20
@@ -43,7 +43,7 @@ struct Ast2700FCState {
|
||||
|
||||
Aspeed27x0SoCState ca35;
|
||||
Aspeed27x0CoprocessorState ssp;
|
||||
Aspeed27x0TSPSoCState tsp;
|
||||
Aspeed27x0CoprocessorState tsp;
|
||||
|
||||
bool mmio_exec;
|
||||
};
|
||||
|
||||
@@ -108,7 +108,7 @@ static struct nvic_intc_irq_info ast2700_tsp_intcmap[] = {
|
||||
static qemu_irq aspeed_soc_ast27x0tsp_get_irq(AspeedCoprocessorState *s,
|
||||
int dev)
|
||||
{
|
||||
Aspeed27x0TSPSoCState *a = ASPEED27X0TSP_SOC(s);
|
||||
Aspeed27x0CoprocessorState *a = ASPEED27X0TSP_SOC(s);
|
||||
AspeedCoprocessorClass *sc = ASPEED_COPROCESSOR_GET_CLASS(s);
|
||||
|
||||
int or_idx;
|
||||
@@ -130,7 +130,7 @@ static qemu_irq aspeed_soc_ast27x0tsp_get_irq(AspeedCoprocessorState *s,
|
||||
|
||||
static void aspeed_soc_ast27x0tsp_init(Object *obj)
|
||||
{
|
||||
Aspeed27x0TSPSoCState *a = ASPEED27X0TSP_SOC(obj);
|
||||
Aspeed27x0CoprocessorState *a = ASPEED27X0TSP_SOC(obj);
|
||||
AspeedCoprocessorState *s = ASPEED_COPROCESSOR(obj);
|
||||
AspeedCoprocessorClass *sc = ASPEED_COPROCESSOR_GET_CLASS(s);
|
||||
int i;
|
||||
@@ -161,7 +161,7 @@ static void aspeed_soc_ast27x0tsp_init(Object *obj)
|
||||
|
||||
static void aspeed_soc_ast27x0tsp_realize(DeviceState *dev_soc, Error **errp)
|
||||
{
|
||||
Aspeed27x0TSPSoCState *a = ASPEED27X0TSP_SOC(dev_soc);
|
||||
Aspeed27x0CoprocessorState *a = ASPEED27X0TSP_SOC(dev_soc);
|
||||
AspeedCoprocessorState *s = ASPEED_COPROCESSOR(dev_soc);
|
||||
AspeedCoprocessorClass *sc = ASPEED_COPROCESSOR_GET_CLASS(s);
|
||||
DeviceState *armv7m;
|
||||
@@ -288,7 +288,7 @@ static const TypeInfo aspeed_soc_ast27x0tsp_types[] = {
|
||||
{
|
||||
.name = TYPE_ASPEED27X0TSP_SOC,
|
||||
.parent = TYPE_ASPEED_COPROCESSOR,
|
||||
.instance_size = sizeof(Aspeed27x0TSPSoCState),
|
||||
.instance_size = sizeof(Aspeed27x0CoprocessorState),
|
||||
.instance_init = aspeed_soc_ast27x0tsp_init,
|
||||
.class_init = aspeed_soc_ast27x0tsp_class_init,
|
||||
},
|
||||
|
||||
@@ -53,16 +53,8 @@ struct Aspeed27x0CoprocessorState {
|
||||
#define TYPE_ASPEED27X0SSP_SOC "aspeed27x0ssp-soc"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0CoprocessorState, ASPEED27X0SSP_SOC)
|
||||
|
||||
struct Aspeed27x0TSPSoCState {
|
||||
AspeedCoprocessorState parent;
|
||||
AspeedINTCState intc[2];
|
||||
UnimplementedDeviceState ipc[2];
|
||||
UnimplementedDeviceState scuio;
|
||||
|
||||
ARMv7MState armv7m;
|
||||
};
|
||||
|
||||
#define TYPE_ASPEED27X0TSP_SOC "aspeed27x0tsp-soc"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0TSPSoCState, ASPEED27X0TSP_SOC)
|
||||
DECLARE_OBJ_CHECKERS(Aspeed27x0CoprocessorState, AspeedCoprocessorClass,
|
||||
ASPEED27X0TSP_SOC, TYPE_ASPEED27X0TSP_SOC)
|
||||
|
||||
#endif /* ASPEED_COPROCESSOR_H */
|
||||
|
||||
Reference in New Issue
Block a user