SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/arm/aspeed: Set default CPU count using aspeed_soc_num_cpus()

Browse Source 
Since commit b7f1a0cb76 ("arm/aspeed: Compute the number
of CPUs from the SoC definition") Aspeed machines use the
aspeed_soc_num_cpus() helper to set the number of CPUs.

Use it for the ast1030-evb (commit 356b230ed1 "aspeed/soc:
Add AST1030 support") and supermicrox11-bmc (commit 40a38df55e
"hw/arm/aspeed: Add board model for Supermicro X11 BMC") machines.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-01-25 06:55:41 +01:00 committed by Cédric Le Goater
parent 2e3b9c937c
commit 0e42592823
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/arm/aspeed.c
View File

@ -1212,6 +1212,8 @@ static void aspeed_machine_supermicrox11_bmc_class_init(ObjectClass *oc,
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
amc->i2c_init = palmetto_bmc_i2c_init; amc->i2c_init = palmetto_bmc_i2c_init;
mc->default_ram_size = 256 * MiB; mc->default_ram_size = 256 * MiB;
mc->default_cpus = mc->min_cpus = mc->max_cpus =
aspeed_soc_num_cpus(amc->soc_name);
} }
static void aspeed_machine_supermicro_x11spi_bmc_class_init(ObjectClass *oc, static void aspeed_machine_supermicro_x11spi_bmc_class_init(ObjectClass *oc,
@ -1586,11 +1588,12 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc,
mc->init = aspeed_minibmc_machine_init; mc->init = aspeed_minibmc_machine_init;
amc->i2c_init = ast1030_evb_i2c_init; amc->i2c_init = ast1030_evb_i2c_init;
mc->default_ram_size = 0; mc->default_ram_size = 0;
mc->default_cpus = mc->min_cpus = mc->max_cpus = 1;
amc->fmc_model = "sst25vf032b"; amc->fmc_model = "sst25vf032b";
amc->spi_model = "sst25vf032b"; amc->spi_model = "sst25vf032b";
amc->num_cs = 2; amc->num_cs = 2;
amc->macs_mask = 0; amc->macs_mask = 0;
mc->default_cpus = mc->min_cpus = mc->max_cpus =
aspeed_soc_num_cpus(amc->soc_name);
} }
static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc, static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc,