On Thu, 19 Jan 2023 at 12:36, Cédric Le Goater <c...@kaod.org> wrote: > > From: Guenter Roeck <li...@roeck-us.net> > > supermicrox11-bmc is configured with ast2400-a1 SoC. This does not match > the Supermicro documentation for X11 BMCs, and it does not match the > devicetree file in the Linux kernel.
I found this sentence confusing; AFAICT X11 doesn't name a specific motherboard. It appears to be a marketing term for a bunch of different things. > As it turns out, some Supermicro X11 motherboards use AST2400 SoCs, > while others use AST2500. > > Introduce new machine type supermicrox11-spi-bmc with AST2500 SoC How about supermicro-x11spi-bmc? It would match the product name: https://www.supermicro.com/en/products/motherboard/X11SPi-TF as well as the device tree filename. > to match the devicetree description in the Linux kernel. Hardware > configuration details for this machine type are guesswork and taken > from defaults as well as from the Linux kernel devicetree file. > > The new machine type was tested with aspeed-bmc-supermicro-x11spi.dts > from the Linux kernel and with Linux versions 6.0.3 and 6.1-rc2. > Linux booted successfully from initrd and from both SPI interfaces. > Ethernet interfaces were confirmed to be operational. > > Signed-off-by: Guenter Roeck <li...@roeck-us.net> > Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> > Link: https://lore.kernel.org/r/20221025165109.1226001-1-li...@roeck-us.net > Message-Id: <20221025165109.1226001-1-li...@roeck-us.net> > Signed-off-by: Cédric Le Goater <c...@kaod.org> > --- > hw/arm/aspeed.c | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 55f114ef72..4919a1fe9e 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -71,6 +71,16 @@ 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_SPI_BMC_HW_STRAP1 ( \ > + AST2500_HW_STRAP1_DEFAULTS | \ > + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \ > + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \ > + SCU_AST2500_HW_STRAP_UART_DEBUG | \ > + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \ > + SCU_HW_STRAP_SPI_WIDTH | \ > + SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_M_S_EN)) > + > /* AST2500 evb hardware value: 0xF100C2E6 */ > #define AST2500_EVB_HW_STRAP1 (( \ > AST2500_HW_STRAP1_DEFAULTS | \ > @@ -1141,6 +1151,25 @@ static void > aspeed_machine_supermicrox11_bmc_class_init(ObjectClass *oc, > mc->default_ram_size = 256 * MiB; > } > > +static void aspeed_machine_supermicrox11_spi_bmc_class_init(ObjectClass *oc, > + void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(oc); > + AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); > + > + mc->desc = "Supermicro X11 SPI BMC (ARM1176)"; > + amc->soc_name = "ast2500-a1"; > + amc->hw_strap1 = SUPERMICROX11_SPI_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 = 512 * MiB; > + mc->default_cpus = mc->min_cpus = mc->max_cpus = > + aspeed_soc_num_cpus(amc->soc_name); > +} > + > static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void > *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -1522,6 +1551,10 @@ static const TypeInfo aspeed_machine_types[] = { > .name = MACHINE_TYPE_NAME("supermicrox11-bmc"), > .parent = TYPE_ASPEED_MACHINE, > .class_init = aspeed_machine_supermicrox11_bmc_class_init, > + }, { > + .name = MACHINE_TYPE_NAME("supermicrox11-spi-bmc"), > + .parent = TYPE_ASPEED_MACHINE, > + .class_init = aspeed_machine_supermicrox11_spi_bmc_class_init, > }, { > .name = MACHINE_TYPE_NAME("ast2500-evb"), > .parent = TYPE_ASPEED_MACHINE, > -- > 2.39.0 > >
