| Message ID | 20200806132106.747414-6-clg@kaod.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | aspeed: mostly cleanups and some extensions | expand |
On Thu, 6 Aug 2020 at 13:21, Cédric Le Goater <clg@kaod.org> wrote: > > From: erik-smit <erik.lucas.smit@gmail.com> > > The BMC Firmware can be downloaded from : > > https://www.supermicro.com/en/products/motherboard/X11SSL-F > > Signed-off-by: erik-smit <erik.lucas.smit@gmail.com> > Reviewed-by: Cédric Le Goater <clg@kaod.org> > [ clg: Modified commit log ] > Message-Id: <20200715173418.186-1-erik.lucas.smit@gmail.com> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > hw/arm/aspeed.c | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index fcb1a7cd8729..d17a4885a03c 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -57,6 +57,20 @@ struct AspeedMachineState { > SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \ > SCU_AST2400_HW_STRAP_BOOT_MODE(AST2400_SPI_BOOT)) > > +/* TODO: Find the actual hardware value */ I've asked some bmc people if they could provide this. > +#define SUPERMICROX11_BMC_HW_STRAP1 ( \ > + SCU_AST2400_HW_STRAP_DRAM_SIZE(DRAM_SIZE_128MB) | \ > + SCU_AST2400_HW_STRAP_DRAM_CONFIG(2) | \ > + SCU_AST2400_HW_STRAP_ACPI_DIS | \ > + SCU_AST2400_HW_STRAP_SET_CLK_SOURCE(AST2400_CLK_48M_IN) | \ > + SCU_HW_STRAP_VGA_CLASS_CODE | \ > + SCU_HW_STRAP_LPC_RESET_PIN | \ > + SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_M_S_EN) | \ > + SCU_AST2400_HW_STRAP_SET_CPU_AHB_RATIO(AST2400_CPU_AHB_RATIO_2_1) | \ > + SCU_HW_STRAP_SPI_WIDTH | \ > + SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \ > + SCU_AST2400_HW_STRAP_BOOT_MODE(AST2400_SPI_BOOT)) > + > /* AST2500 evb hardware value: 0xF100C2E6 */ > #define AST2500_EVB_HW_STRAP1 (( \ > AST2500_HW_STRAP1_DEFAULTS | \ > @@ -603,6 +617,23 @@ static void aspeed_machine_palmetto_class_init(ObjectClass *oc, void *data) > aspeed_soc_num_cpus(amc->soc_name); > }; > > +static void aspeed_machine_supermicrox11_bmc_class_init(ObjectClass *oc, > + void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(oc); > + AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); > + > + mc->desc = "Supermicro X11 BMC (ARM926EJ-S)"; > + amc->soc_name = "ast2400-a1"; > + amc->hw_strap1 = SUPERMICROX11_BMC_HW_STRAP1; > + amc->fmc_model = "mx25l25635e"; > + amc->spi_model = "mx25l25635e"; > + amc->num_cs = 1; > + amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON; > + amc->i2c_init = palmetto_bmc_i2c_init; > + mc->default_ram_size = 256 * MiB; > +} > + > static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -731,6 +762,10 @@ static const TypeInfo aspeed_machine_types[] = { > .name = MACHINE_TYPE_NAME("palmetto-bmc"), > .parent = TYPE_ASPEED_MACHINE, > .class_init = aspeed_machine_palmetto_class_init, > + }, { > + .name = MACHINE_TYPE_NAME("supermicrox11-bmc"), > + .parent = TYPE_ASPEED_MACHINE, > + .class_init = aspeed_machine_supermicrox11_bmc_class_init, > }, { > .name = MACHINE_TYPE_NAME("ast2500-evb"), > .parent = TYPE_ASPEED_MACHINE, > -- > 2.25.4 >
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index fcb1a7cd8729..d17a4885a03c 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -57,6 +57,20 @@ struct AspeedMachineState { SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \ SCU_AST2400_HW_STRAP_BOOT_MODE(AST2400_SPI_BOOT)) +/* TODO: Find the actual hardware value */ +#define SUPERMICROX11_BMC_HW_STRAP1 ( \ + SCU_AST2400_HW_STRAP_DRAM_SIZE(DRAM_SIZE_128MB) | \ + SCU_AST2400_HW_STRAP_DRAM_CONFIG(2) | \ + SCU_AST2400_HW_STRAP_ACPI_DIS | \ + SCU_AST2400_HW_STRAP_SET_CLK_SOURCE(AST2400_CLK_48M_IN) | \ + SCU_HW_STRAP_VGA_CLASS_CODE | \ + SCU_HW_STRAP_LPC_RESET_PIN | \ + SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_M_S_EN) | \ + SCU_AST2400_HW_STRAP_SET_CPU_AHB_RATIO(AST2400_CPU_AHB_RATIO_2_1) | \ + SCU_HW_STRAP_SPI_WIDTH | \ + SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \ + SCU_AST2400_HW_STRAP_BOOT_MODE(AST2400_SPI_BOOT)) + /* AST2500 evb hardware value: 0xF100C2E6 */ #define AST2500_EVB_HW_STRAP1 (( \ AST2500_HW_STRAP1_DEFAULTS | \ @@ -603,6 +617,23 @@ static void aspeed_machine_palmetto_class_init(ObjectClass *oc, void *data) aspeed_soc_num_cpus(amc->soc_name); }; +static void aspeed_machine_supermicrox11_bmc_class_init(ObjectClass *oc, + void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); + + mc->desc = "Supermicro X11 BMC (ARM926EJ-S)"; + amc->soc_name = "ast2400-a1"; + amc->hw_strap1 = SUPERMICROX11_BMC_HW_STRAP1; + amc->fmc_model = "mx25l25635e"; + amc->spi_model = "mx25l25635e"; + amc->num_cs = 1; + amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON; + amc->i2c_init = palmetto_bmc_i2c_init; + mc->default_ram_size = 256 * MiB; +} + static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -731,6 +762,10 @@ static const TypeInfo aspeed_machine_types[] = { .name = MACHINE_TYPE_NAME("palmetto-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_palmetto_class_init, + }, { + .name = MACHINE_TYPE_NAME("supermicrox11-bmc"), + .parent = TYPE_ASPEED_MACHINE, + .class_init = aspeed_machine_supermicrox11_bmc_class_init, }, { .name = MACHINE_TYPE_NAME("ast2500-evb"), .parent = TYPE_ASPEED_MACHINE,