From nobody Sat May 10 05:49:30 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1698224541468268.36820038122005;
Wed, 25 Oct 2023 02:02:21 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1qvZjr-000840-4C; Wed, 25 Oct 2023 04:59:43 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <SRS0=4l40=GH=kaod.org=clg@ozlabs.org>)
id 1qvZjp-00082x-JH; Wed, 25 Oct 2023 04:59:41 -0400
Received: from gandalf.ozlabs.org ([150.107.74.76])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <SRS0=4l40=GH=kaod.org=clg@ozlabs.org>)
id 1qvZjn-0004OR-3D; Wed, 25 Oct 2023 04:59:41 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by gandalf.ozlabs.org (Postfix) with ESMTP id 4SFjY61H8bz4wx8;
Wed, 25 Oct 2023 19:59:38 +1100 (AEDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest
SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4SFjY44bYnz4wnw;
Wed, 25 Oct 2023 19:59:36 +1100 (AEDT)
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>
Subject: [PULL 05/12] hw/arm/aspeed: Dynamically allocate
AspeedMachineState::soc field
Date: Wed, 25 Oct 2023 10:59:14 +0200
Message-ID: <20231025085921.733686-6-clg@kaod.org>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20231025085921.733686-1-clg@kaod.org>
References: <20231025085921.733686-1-clg@kaod.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=150.107.74.76;
envelope-from=SRS0=4l40=GH=kaod.org=clg@ozlabs.org; helo=gandalf.ozlabs.org
X-Spam_score_int: -16
X-Spam_score: -1.7
X-Spam_bar: -
X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9,
HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001,
SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZM-MESSAGEID: 1698224543257100003
From: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
We want to derivate the big AspeedSoCState object in some more
SoC-specific ones. Since the object size will vary, allocate it
dynamically.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: C=C3=A9dric Le Goater <clg@kaod.org>
Signed-off-by: C=C3=A9dric Le Goater <clg@kaod.org>
---
hw/arm/aspeed.c | 101 +++++++++++++++++++++++++-----------------------
1 file changed, 52 insertions(+), 49 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index f8ba67531a00..cc59176563a8 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -40,7 +40,7 @@ struct AspeedMachineState {
MachineState parent_obj;
/* Public */
=20
- AspeedSoCState soc;
+ AspeedSoCState *soc;
MemoryRegion boot_rom;
bool mmio_exec;
uint32_t uart_chosen;
@@ -288,7 +288,7 @@ static void write_boot_rom(BlockBackend *blk, hwaddr ad=
dr, size_t rom_size,
static void aspeed_install_boot_rom(AspeedMachineState *bmc, BlockBackend =
*blk,
uint64_t rom_size)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
=20
memory_region_init_rom(&bmc->boot_rom, NULL, "aspeed.boot_rom", rom_si=
ze,
&error_abort);
@@ -337,7 +337,7 @@ static void sdhci_attach_drive(SDHCIState *sdhci, Drive=
Info *dinfo)
static void connect_serial_hds_to_uarts(AspeedMachineState *bmc)
{
AspeedMachineClass *amc =3D ASPEED_MACHINE_GET_CLASS(bmc);
- AspeedSoCState *s =3D &bmc->soc;
+ AspeedSoCState *s =3D bmc->soc;
AspeedSoCClass *sc =3D ASPEED_SOC_GET_CLASS(s);
int uart_chosen =3D bmc->uart_chosen ? bmc->uart_chosen : amc->uart_de=
fault;
=20
@@ -358,32 +358,33 @@ static void aspeed_machine_init(MachineState *machine)
int i;
NICInfo *nd =3D &nd_table[0];
=20
- object_initialize_child(OBJECT(machine), "soc", &bmc->soc, amc->soc_na=
me);
-
- sc =3D ASPEED_SOC_GET_CLASS(&bmc->soc);
+ bmc->soc =3D ASPEED_SOC(object_new(amc->soc_name));
+ object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc));
+ object_unref(OBJECT(bmc->soc));
+ sc =3D ASPEED_SOC_GET_CLASS(bmc->soc);
=20
/*
* This will error out if the RAM size is not supported by the
* memory controller of the SoC.
*/
- object_property_set_uint(OBJECT(&bmc->soc), "ram-size", machine->ram_s=
ize,
+ object_property_set_uint(OBJECT(bmc->soc), "ram-size", machine->ram_si=
ze,
&error_fatal);
=20
for (i =3D 0; i < sc->macs_num; i++) {
if ((amc->macs_mask & (1 << i)) && nd->used) {
qemu_check_nic_model(nd, TYPE_FTGMAC100);
- qdev_set_nic_properties(DEVICE(&bmc->soc.ftgmac100[i]), nd);
+ qdev_set_nic_properties(DEVICE(&bmc->soc->ftgmac100[i]), nd);
nd++;
}
}
=20
- object_property_set_int(OBJECT(&bmc->soc), "hw-strap1", amc->hw_strap1,
+ object_property_set_int(OBJECT(bmc->soc), "hw-strap1", amc->hw_strap1,
&error_abort);
- object_property_set_int(OBJECT(&bmc->soc), "hw-strap2", amc->hw_strap2,
+ object_property_set_int(OBJECT(bmc->soc), "hw-strap2", amc->hw_strap2,
&error_abort);
- object_property_set_link(OBJECT(&bmc->soc), "memory",
+ object_property_set_link(OBJECT(bmc->soc), "memory",
OBJECT(get_system_memory()), &error_abort);
- object_property_set_link(OBJECT(&bmc->soc), "dram",
+ object_property_set_link(OBJECT(bmc->soc), "dram",
OBJECT(machine->ram), &error_abort);
if (machine->kernel_filename) {
/*
@@ -391,17 +392,17 @@ static void aspeed_machine_init(MachineState *machine)
* that runs to unlock the SCU. In this case set the default to
* be unlocked as the kernel expects
*/
- object_property_set_int(OBJECT(&bmc->soc), "hw-prot-key",
+ object_property_set_int(OBJECT(bmc->soc), "hw-prot-key",
ASPEED_SCU_PROT_KEY, &error_abort);
}
connect_serial_hds_to_uarts(bmc);
- qdev_realize(DEVICE(&bmc->soc), NULL, &error_abort);
+ qdev_realize(DEVICE(bmc->soc), NULL, &error_abort);
=20
if (defaults_enabled()) {
- aspeed_board_init_flashes(&bmc->soc.fmc,
+ aspeed_board_init_flashes(&bmc->soc->fmc,
bmc->fmc_model ? bmc->fmc_model : amc->fmc_m=
odel,
amc->num_cs, 0);
- aspeed_board_init_flashes(&bmc->soc.spi[0],
+ aspeed_board_init_flashes(&bmc->soc->spi[0],
bmc->spi_model ? bmc->spi_model : amc->spi_m=
odel,
1, amc->num_cs);
}
@@ -426,22 +427,22 @@ static void aspeed_machine_init(MachineState *machine)
amc->i2c_init(bmc);
}
=20
- for (i =3D 0; i < bmc->soc.sdhci.num_slots; i++) {
- sdhci_attach_drive(&bmc->soc.sdhci.slots[i],
+ for (i =3D 0; i < bmc->soc->sdhci.num_slots; i++) {
+ sdhci_attach_drive(&bmc->soc->sdhci.slots[i],
drive_get(IF_SD, 0, i));
}
=20
- if (bmc->soc.emmc.num_slots) {
- sdhci_attach_drive(&bmc->soc.emmc.slots[0],
- drive_get(IF_SD, 0, bmc->soc.sdhci.num_slots));
+ if (bmc->soc->emmc.num_slots) {
+ sdhci_attach_drive(&bmc->soc->emmc.slots[0],
+ drive_get(IF_SD, 0, bmc->soc->sdhci.num_slots));
}
=20
if (!bmc->mmio_exec) {
- DeviceState *dev =3D ssi_get_cs(bmc->soc.fmc.spi, 0);
+ DeviceState *dev =3D ssi_get_cs(bmc->soc->fmc.spi, 0);
BlockBackend *fmc0 =3D dev ? m25p80_get_blk(dev) : NULL;
=20
if (fmc0) {
- uint64_t rom_size =3D memory_region_size(&bmc->soc.spi_boot);
+ uint64_t rom_size =3D memory_region_size(&bmc->soc->spi_boot);
aspeed_install_boot_rom(bmc, fmc0, rom_size);
}
}
@@ -451,7 +452,7 @@ static void aspeed_machine_init(MachineState *machine)
=20
static void palmetto_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
DeviceState *dev;
uint8_t *eeprom_buf =3D g_malloc0(32 * 1024);
=20
@@ -473,7 +474,7 @@ static void palmetto_bmc_i2c_init(AspeedMachineState *b=
mc)
=20
static void quanta_q71l_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
=20
/*
* The quanta-q71l platform expects tmp75s which are compatible with
@@ -505,7 +506,7 @@ static void quanta_q71l_bmc_i2c_init(AspeedMachineState=
*bmc)
=20
static void ast2500_evb_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
uint8_t *eeprom_buf =3D g_malloc0(8 * 1024);
=20
smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 3), 0x50,
@@ -518,7 +519,7 @@ static void ast2500_evb_i2c_init(AspeedMachineState *bm=
c)
=20
static void ast2600_evb_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
uint8_t *eeprom_buf =3D g_malloc0(8 * 1024);
=20
smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 7), 0x50,
@@ -531,7 +532,7 @@ static void ast2600_evb_i2c_init(AspeedMachineState *bm=
c)
=20
static void yosemitev2_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
=20
at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 4), 0x51, 128 * KiB);
at24c_eeprom_init_rom(aspeed_i2c_get_bus(&soc->i2c, 8), 0x51, 128 * Ki=
B,
@@ -545,7 +546,7 @@ static void yosemitev2_bmc_i2c_init(AspeedMachineState =
*bmc)
=20
static void romulus_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
=20
/* The romulus board expects Epson RX8900 I2C RTC but a ds1338 is
* good enough */
@@ -554,7 +555,7 @@ static void romulus_bmc_i2c_init(AspeedMachineState *bm=
c)
=20
static void tiogapass_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
=20
at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 4), 0x54, 128 * KiB);
at24c_eeprom_init_rom(aspeed_i2c_get_bus(&soc->i2c, 6), 0x54, 128 * Ki=
B,
@@ -573,7 +574,7 @@ static void create_pca9552(AspeedSoCState *soc, int bus=
_id, int addr)
=20
static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
=20
/* bus 2 : */
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x=
48);
@@ -627,7 +628,7 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState=
*bmc)
{14, LED_COLOR_GREEN, "front-power-3", GPIO_POLARITY_ACTIVE_LOW},
{15, LED_COLOR_GREEN, "front-id-5", GPIO_POLARITY_ACTIVE_LOW},
};
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
uint8_t *eeprom_buf =3D g_malloc0(8 * 1024);
DeviceState *dev;
LEDState *led;
@@ -672,7 +673,7 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState=
*bmc)
=20
static void g220a_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
DeviceState *dev;
=20
dev =3D DEVICE(i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3=
),
@@ -708,7 +709,7 @@ static void g220a_bmc_i2c_init(AspeedMachineState *bmc)
=20
static void fp5280g2_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
I2CSlave *i2c_mux;
=20
/* The at24c256 */
@@ -735,7 +736,7 @@ static void fp5280g2_bmc_i2c_init(AspeedMachineState *b=
mc)
=20
static void rainier_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
I2CSlave *i2c_mux;
=20
at24c_eeprom_init(aspeed_i2c_get_bus(&soc->i2c, 0), 0x51, 32 * KiB);
@@ -852,7 +853,7 @@ static void get_pca9548_channels(I2CBus *bus, uint8_t m=
ux_addr,
=20
static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
I2CBus *i2c[144] =3D {};
=20
for (int i =3D 0; i < 16; i++) {
@@ -930,7 +931,7 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
=20
static void bletchley_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
I2CBus *i2c[13] =3D {};
for (int i =3D 0; i < 13; i++) {
if ((i =3D=3D 8) || (i =3D=3D 11)) {
@@ -976,7 +977,7 @@ static void bletchley_bmc_i2c_init(AspeedMachineState *=
bmc)
=20
static void fby35_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
I2CBus *i2c[16];
=20
for (int i =3D 0; i < 16; i++) {
@@ -1008,14 +1009,14 @@ static void fby35_i2c_init(AspeedMachineState *bmc)
=20
static void qcom_dc_scm_bmc_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
=20
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 15), "tmp105", 0=
x4d);
}
=20
static void qcom_dc_scm_firework_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
I2CSlave *therm_mux, *cpuvr_mux;
=20
/* Create the generic DC-SCM hardware */
@@ -1477,7 +1478,7 @@ static void aspeed_machine_bletchley_class_init(Objec=
tClass *oc, void *data)
static void fby35_reset(MachineState *state, ShutdownCause reason)
{
AspeedMachineState *bmc =3D ASPEED_MACHINE(state);
- AspeedGPIOState *gpio =3D &bmc->soc.gpio;
+ AspeedGPIOState *gpio =3D &bmc->soc->gpio;
=20
qemu_devices_reset(reason);
=20
@@ -1528,24 +1529,26 @@ static void aspeed_minibmc_machine_init(MachineStat=
e *machine)
sysclk =3D clock_new(OBJECT(machine), "SYSCLK");
clock_set_hz(sysclk, SYSCLK_FRQ);
=20
- object_initialize_child(OBJECT(machine), "soc", &bmc->soc, amc->soc_na=
me);
- qdev_connect_clock_in(DEVICE(&bmc->soc), "sysclk", sysclk);
+ bmc->soc =3D ASPEED_SOC(object_new(amc->soc_name));
+ object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc));
+ object_unref(OBJECT(bmc->soc));
+ qdev_connect_clock_in(DEVICE(bmc->soc), "sysclk", sysclk);
=20
- object_property_set_link(OBJECT(&bmc->soc), "memory",
+ object_property_set_link(OBJECT(bmc->soc), "memory",
OBJECT(get_system_memory()), &error_abort);
connect_serial_hds_to_uarts(bmc);
- qdev_realize(DEVICE(&bmc->soc), NULL, &error_abort);
+ qdev_realize(DEVICE(bmc->soc), NULL, &error_abort);
=20
- aspeed_board_init_flashes(&bmc->soc.fmc,
+ aspeed_board_init_flashes(&bmc->soc->fmc,
bmc->fmc_model ? bmc->fmc_model : amc->fmc_m=
odel,
amc->num_cs,
0);
=20
- aspeed_board_init_flashes(&bmc->soc.spi[0],
+ aspeed_board_init_flashes(&bmc->soc->spi[0],
bmc->spi_model ? bmc->spi_model : amc->spi_m=
odel,
amc->num_cs, amc->num_cs);
=20
- aspeed_board_init_flashes(&bmc->soc.spi[1],
+ aspeed_board_init_flashes(&bmc->soc->spi[1],
bmc->spi_model ? bmc->spi_model : amc->spi_m=
odel,
amc->num_cs, (amc->num_cs * 2));
=20
@@ -1561,7 +1564,7 @@ static void aspeed_minibmc_machine_init(MachineState =
*machine)
=20
static void ast1030_evb_i2c_init(AspeedMachineState *bmc)
{
- AspeedSoCState *soc =3D &bmc->soc;
+ AspeedSoCState *soc =3D bmc->soc;
=20
/* U10 24C08 connects to SDA/SCL Group 1 by default */
uint8_t *eeprom_buf =3D g_malloc0(32 * 1024);
--=20
2.41.0