| Message ID | 20240123224842.18485-3-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm/aspeed: Check for CPU types in machine_run_board_init() | expand |
On 1/23/24 23:48, Philippe Mathieu-Daudé wrote: > 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> Thanks, C. > --- > hw/arm/aspeed.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 4bc292ff84..5b01a4dd28 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -1212,6 +1212,8 @@ static void aspeed_machine_supermicrox11_bmc_class_init(ObjectClass *oc, > amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON; > amc->i2c_init = palmetto_bmc_i2c_init; > 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, > @@ -1586,11 +1588,12 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc, > mc->init = aspeed_minibmc_machine_init; > amc->i2c_init = ast1030_evb_i2c_init; > mc->default_ram_size = 0; > - mc->default_cpus = mc->min_cpus = mc->max_cpus = 1; > amc->fmc_model = "sst25vf032b"; > amc->spi_model = "sst25vf032b"; > amc->num_cs = 2; > 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,
On 1/24/24 08:48, Philippe Mathieu-Daudé wrote: > 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> > --- > hw/arm/aspeed.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > Reviewed-by: Gavin Shan <gshan@redhat.com>
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 4bc292ff84..5b01a4dd28 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1212,6 +1212,8 @@ static void aspeed_machine_supermicrox11_bmc_class_init(ObjectClass *oc, amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init = palmetto_bmc_i2c_init; 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, @@ -1586,11 +1588,12 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc, mc->init = aspeed_minibmc_machine_init; amc->i2c_init = ast1030_evb_i2c_init; mc->default_ram_size = 0; - mc->default_cpus = mc->min_cpus = mc->max_cpus = 1; amc->fmc_model = "sst25vf032b"; amc->spi_model = "sst25vf032b"; amc->num_cs = 2; 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,
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> --- hw/arm/aspeed.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)