答复: [PATCH] aspeed: Add support for the fp5280g2-bmc board

["George Liu (刘锡伟)" <liuxiwei@inspur.com>]

[-- Attachment #1: Type: text/plain, Size: 5392 bytes --]



George Liu  |  刘锡伟
 
 
P.R&D  |  产品研发部
 
 
T: 15098841013
 
 
E: liuxiwei@inspur.com
 
 
 


浪潮商用机器有限公司


Inspur Power Commercial Systems Co., Ltd


北京市海淀区上地信息路2号C座5层


5F,Tower C,No.2 Xinxi Road.Shangdi,Haidian District,Beijing,P.R.China
浪潮商用机器
浪潮服务器



-----邮件原件-----
发件人: 王志强 [mailto:wangzq.jn@gmail.com] 
发送时间: 2021年10月13日 15:30
收件人: Tao Lin (林涛)-浪潮商用机器 <lintao.lc@inspur.com>; George Liu (刘锡伟) <liuxiwei@inspur.com>; Chicago Duan (段志佳)-云数据中心集团 <duanzhijia01@inspur.com>
抄送: Cédric Le Goater <clg@kaod.org>; Peter Maydell <peter.maydell@linaro.org>; Andrew Jeffery <andrew@aj.id.au>; Joel Stanley <joel@jms.id.au>; open list:ASPEED BMCs <qemu-arm@nongnu.org>; open list:All patches CC here <qemu-devel@nongnu.org>
主题: Re: [PATCH] aspeed: Add support for the fp5280g2-bmc board

This patch is based on https://github.com/openbmc/qemu (commit id:
2856503299534aab7602de2aaa88dd9ee7e9d61a)，not  qemu/qemu.

John Wang <wangzq.jn@gmail.com> 于2021年10月13日周三 下午3:26写道：
>
> The fp5280g2-bmc is supported by OpenBMC, It's based on the following 
> device tree
>
> https://github.com/openbmc/linux/blob/dev-5.10/arch/arm/boot/dts/aspee
> d-bmc-inspur-fp5280g2.dts

Nit: I think the latest branch is `dev-5.14`.

>
> Signed-off-by: John Wang <wangzhiqiang02@inspur.com>
> ---
>  hw/arm/aspeed.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 48 insertions(+)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 
> 01c1747972..3587788f63 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -141,6 +141,21 @@ struct AspeedMachineState {
>          SCU_AST2500_HW_STRAP_ACPI_ENABLE |                              \
>          SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))
>
> +/* FP5280G2 hardware value: 0XF100D286 */
> +#define FP5280G2_BMC_HW_STRAP1 (                                      \
> +        SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE |                     \
> +        SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE |                        \
> +        SCU_AST2500_HW_STRAP_UART_DEBUG |                               \
> +        SCU_AST2500_HW_STRAP_RESERVED28 |                               \
> +        SCU_AST2500_HW_STRAP_DDR4_ENABLE |                              \
> +        SCU_HW_STRAP_VGA_CLASS_CODE |                                   \
> +        SCU_HW_STRAP_LPC_RESET_PIN |                                    \
> +        SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER) |                \
> +        SCU_AST2500_HW_STRAP_SET_AXI_AHB_RATIO(AXI_AHB_RATIO_2_1) |     \
> +        SCU_HW_STRAP_MAC1_RGMII |                                       \
> +        SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) |                       \
> +        SCU_AST2500_HW_STRAP_RESERVED1)
> +
>  /* Witherspoon hardware value: 0xF10AD216 (but use romulus 
> definition) */  #define WITHERSPOON_BMC_HW_STRAP1 
> ROMULUS_BMC_HW_STRAP1
>
> @@ -717,6 +732,17 @@ static void g220a_bmc_i2c_init(AspeedMachineState *bmc)
>                            eeprom_buf);  }
>
> +static void fp5280g2_bmc_i2c_init(AspeedMachineState *bmc) {
> +    AspeedSoCState *soc = &bmc->soc;
> +
> +    /* The fp5280g2 expects a TMP112 but a TMP105 is compatible */
> +    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), TYPE_TMP105,
> +                     0x48);
> +    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), TYPE_TMP105,
> +                     0x49);
> +}
> +
>  static void rainier_bmc_i2c_init(AspeedMachineState *bmc)  {
>      AspeedSoCState *soc = &bmc->soc;
> @@ -1082,6 +1108,24 @@ static void aspeed_machine_g220a_class_init(ObjectClass *oc, void *data)
>          aspeed_soc_num_cpus(amc->soc_name);
>  };
>
> +static void aspeed_machine_fp5280g2_class_init(ObjectClass *oc, void 
> +*data) {
> +    MachineClass *mc = MACHINE_CLASS(oc);
> +    AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
> +
> +    mc->desc       = "Inspur FP5280G2 BMC (ARM1176)";
> +    amc->soc_name  = "ast2500-a1";
> +    amc->hw_strap1 = FP5280G2_BMC_HW_STRAP1;
> +    amc->fmc_model = "n25q512a";
> +    amc->spi_model = "mx25l25635e";
> +    amc->num_cs    = 2;
> +    amc->macs_mask  = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
> +    amc->i2c_init  = fp5280g2_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_rainier_class_init(ObjectClass *oc, void 
> *data)  {
>      MachineClass *mc = MACHINE_CLASS(oc); @@ -1146,6 +1190,10 @@ 
> static const TypeInfo aspeed_machine_types[] = {
>          .name          = MACHINE_TYPE_NAME("g220a-bmc"),
>          .parent        = TYPE_ASPEED_MACHINE,
>          .class_init    = aspeed_machine_g220a_class_init,
> +    }, {
> +        .name          = MACHINE_TYPE_NAME("fp5280g2-bmc"),
> +        .parent        = TYPE_ASPEED_MACHINE,
> +        .class_init    = aspeed_machine_fp5280g2_class_init,
>      }, {
>          .name          = MACHINE_TYPE_NAME("quanta-q71l-bmc"),
>          .parent        = TYPE_ASPEED_MACHINE,
> --
> 2.30.2
>

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 3600 bytes --]