From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C7891EB64D9 for ; Tue, 4 Jul 2023 11:17:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGe1f-0005Cp-H9; Tue, 04 Jul 2023 07:16:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGe1d-00059g-7r; Tue, 04 Jul 2023 07:16:54 -0400 Received: from gandalf.ozlabs.org ([150.107.74.76]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGe1Z-0008EB-QA; Tue, 04 Jul 2023 07:16:52 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4QwKxT3Jf1z4wxS; Tue, 4 Jul 2023 21:16:45 +1000 (AEST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QwKxP4rz5z4wb8; Tue, 4 Jul 2023 21:16:41 +1000 (AEST) Message-ID: Date: Tue, 4 Jul 2023 13:16:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH qemu v4] aspeed add montblanc bmc reference from fuji Content-Language: en-US To: Sittisak Sinprem Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, ssumet@celestica.com, srikanth@celestica.com, kgengan@celestica.com, andrew@aj.id.au, joel@jms.id.au, thangavelu.v@celestica.com, anandaramanv@celestica.com References: <168846792266.24055.9837240417124338096-0@git.sr.ht> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=150.107.74.76; envelope-from=SRS0=18er=CW=kaod.org=clg@ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-0.09, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 7/4/23 12:57, Sittisak Sinprem wrote: > Hi Cédric, > > Please stop this patch, > after the test, the eeprom content is incorrect, > > root@bmc:~# weutil -l > bmc_eeprom    /sys/bus/i2c/devices/i2c-8/8-0051/eeprom > chassis_eeprom    /sys/bus/i2c/devices/i2c-6/6-0053/eeprom > dummy_eeprom    /etc/weutil/meta_eeprom_v4_sample.bin > scm_eeprom    /sys/bus/i2c/devices/i2c-3/3-0056/eeprom > root@bmc:~# hexdump -C /sys/bus/i2c/devices/i2c-6/6-0053/eeprom > 00000000  fb 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................| > 00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................| > * > 00002000 > root@bmc:~# hexdump -C /sys/bus/i2c/devices/i2c-8/8-0051/eeprom > 00000000  fb 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................| > 00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................| > * > 00002000 > root@bmc:~# > > I will send the next version after fixed np. Could you please include a description of the EEPROM contents in a C comment before the array definition too ? Thanks, C. > > On Tue, Jul 4, 2023 at 5:52 PM ~ssinprem > wrote: > > From: Sittisak Sinprem > > > - I2C list follow I2C Tree v1.6 20230320 > - fru eeprom data use FB FRU format version 4 > > Signed-off-by: Sittisak Sinprem > > --- >  docs/system/arm/aspeed.rst |  1 + >  hw/arm/aspeed.c            | 63 ++++++++++++++++++++++++++++++++++++++ >  hw/arm/aspeed_eeprom.c     | 50 ++++++++++++++++++++++++++++++ >  hw/arm/aspeed_eeprom.h     |  7 +++++ >  4 files changed, 121 insertions(+) > > diff --git a/docs/system/arm/aspeed.rst b/docs/system/arm/aspeed.rst > index 80538422a1..5e0824f48b 100644 > --- a/docs/system/arm/aspeed.rst > +++ b/docs/system/arm/aspeed.rst > @@ -33,6 +33,7 @@ AST2600 SoC based machines : >  - ``tacoma-bmc``           OpenPOWER Witherspoon POWER9 AST2600 BMC >  - ``rainier-bmc``          IBM Rainier POWER10 BMC >  - ``fuji-bmc``             Facebook Fuji BMC > +- ``montblanc-bmc``        Facebook Montblanc BMC >  - ``bletchley-bmc``        Facebook Bletchley BMC >  - ``fby35-bmc``            Facebook fby35 BMC >  - ``qcom-dc-scm-v1-bmc``   Qualcomm DC-SCM V1 BMC > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 9fca644d92..91bd4e5637 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -189,6 +189,10 @@ struct AspeedMachineState { >  #define FUJI_BMC_HW_STRAP1    0x00000000 >  #define FUJI_BMC_HW_STRAP2    0x00000000 > > +/* Montblanc hardware value */ > +#define MONTBLANC_BMC_HW_STRAP1    0x00000000 > +#define MONTBLANC_BMC_HW_STRAP2    0x00000000 > + >  /* Bletchley hardware value */ >  /* TODO: Leave same as EVB for now. */ >  #define BLETCHLEY_BMC_HW_STRAP1 AST2600_EVB_HW_STRAP1 > @@ -925,6 +929,39 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc) >      } >  } > > +static void montblanc_bmc_i2c_init(AspeedMachineState *bmc) > +{ > +    AspeedSoCState *soc = &bmc->soc; > +    I2CBus *i2c[16] = {}; > + > +    for (int i = 0; i < 16; i++) { > +        i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i); > +    } > + > +    /* Ref from Minipack3_I2C_Tree_V1.6 20230320 */ > +    at24c_eeprom_init_rom(i2c[3], 0x56, 8192, montblanc_scm_fruid, true); > +    at24c_eeprom_init_rom(i2c[6], 0x53, 8192, montblanc_fcm_fruid, true); > + > +    /* CPLD and FPGA */ > +    at24c_eeprom_init(i2c[1], 0x35, 256);  /* SCM CPLD */ > +    at24c_eeprom_init(i2c[5], 0x35, 256);  /* COMe CPLD TODO: need to update */ > +    at24c_eeprom_init(i2c[12], 0x60, 256); /* MCB PWR CPLD */ > +    at24c_eeprom_init(i2c[13], 0x35, 256); /* IOB FPGA */ > + > +    /* on BMC board */ > +    at24c_eeprom_init_rom(i2c[8], 0x51, 8192, montblanc_bmc_fruid, true); > +                                                      /* BMC EEPROM */ > +    i2c_slave_create_simple(i2c[8], TYPE_LM75, 0x48); /* Thermal Sensor */ > + > +    /* COMe Sensor/EEPROM */ > +    at24c_eeprom_init(i2c[0], 0x56, 16384);          /* FRU EEPROM */ > +    i2c_slave_create_simple(i2c[0], TYPE_LM75, 0x48); /* INLET Sensor */ > +    i2c_slave_create_simple(i2c[0], TYPE_LM75, 0x4A); /* OUTLET Sensor */ > + > +    /* It expects a pca9555 but a pca9552 is compatible */ > +    create_pca9552(soc, 4, 0x27); > +} > + >  #define TYPE_TMP421 "tmp421" > >  static void bletchley_bmc_i2c_init(AspeedMachineState *bmc) > @@ -1452,6 +1489,28 @@ static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data) >          aspeed_soc_num_cpus(amc->soc_name); >  }; > > +#define MONTBLANC_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) > + > +static void aspeed_machine_montblanc_class_init(ObjectClass *oc, void *data) > +{ > +    MachineClass *mc = MACHINE_CLASS(oc); > +    AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); > + > +    mc->desc = "Facebook Montblanc BMC (Cortex-A7)"; > +    amc->soc_name = "ast2600-a3"; > +    amc->hw_strap1 = MONTBLANC_BMC_HW_STRAP1; > +    amc->hw_strap2 = MONTBLANC_BMC_HW_STRAP2; > +    amc->fmc_model = "mx66l1g45g"; > +    amc->spi_model = "mx66l1g45g"; > +    amc->num_cs = 2; > +    amc->macs_mask = ASPEED_MAC3_ON; > +    amc->i2c_init = montblanc_bmc_i2c_init; > +    amc->uart_default = ASPEED_DEV_UART1; > +    mc->default_ram_size = MONTBLANC_BMC_RAM_SIZE; > +    mc->default_cpus = mc->min_cpus = mc->max_cpus = > +        aspeed_soc_num_cpus(amc->soc_name); > +}; > + >  #define BLETCHLEY_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) > >  static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void *data) > @@ -1703,6 +1762,10 @@ static const TypeInfo aspeed_machine_types[] = { >          .name          = MACHINE_TYPE_NAME("fuji-bmc"), >          .parent        = TYPE_ASPEED_MACHINE, >          .class_init    = aspeed_machine_fuji_class_init, > +    }, { > +        .name          = MACHINE_TYPE_NAME("montblanc-bmc"), > +        .parent        = TYPE_ASPEED_MACHINE, > +        .class_init    = aspeed_machine_montblanc_class_init, >      }, { >          .name          = MACHINE_TYPE_NAME("bletchley-bmc"), >          .parent        = TYPE_ASPEED_MACHINE, > diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c > index ace5266cec..8cc73f83dc 100644 > --- a/hw/arm/aspeed_eeprom.c > +++ b/hw/arm/aspeed_eeprom.c > @@ -161,6 +161,53 @@ const uint8_t rainier_bmc_fruid[] = { >      0x31, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, >  }; > > +/* Montblanc BMC FRU */ > +const uint8_t montblanc_scm_fruid[] = { > +    0xfb, 0xfb, 0x04, 0xff, 0x01, 0x0d, 0x4d, 0x49, 0x4e, 0x49, 0x50, 0x41, > +    0x43, 0x4b, 0x33, 0x5f, 0x53, 0x43, 0x4d, 0x02, 0x08, 0x32, 0x30, 0x30, > +    0x30, 0x32, 0x39, 0x34, 0x35, 0x04, 0x0c, 0x31, 0x33, 0x32, 0x30, 0x30, > +    0x30, 0x31, 0x36, 0x34, 0x30, 0x31, 0x20, 0x05, 0x0c, 0x31, 0x33, 0x31, > +    0x30, 0x30, 0x30, 0x31, 0x32, 0x37, 0x30, 0x31, 0x20, 0x06, 0x0c, 0x52, > +    0x33, 0x32, 0x31, 0x34, 0x47, 0x30, 0x30, 0x30, 0x33, 0x30, 0x31, 0x07, > +    0x0d, 0x41, 0x30, 0x33, 0x31, 0x33, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, > +    0x58, 0x58, 0x08, 0x01, 0x01, 0x09, 0x01, 0x00, 0x0a, 0x01, 0x00, 0x0b, > +    0x0d, 0x4d, 0x32, 0x32, 0x31, 0x33, 0x32, 0x33, 0x31, 0x37, 0x30, 0x30, > +    0x30, 0x32, 0x0c, 0x03, 0x43, 0x4c, 0x53, 0x0d, 0x08, 0x32, 0x30, 0x32, > +    0x33, 0x30, 0x35, 0x30, 0x31, 0x0e, 0x03, 0x57, 0x55, 0x53, 0x0f, 0x03, > +    0x43, 0x54, 0x48, 0x10, 0x06, 0x01, 0x00, 0x00, 0x91, 0xdb, 0xb4, 0x13, > +    0x03, 0x53, 0x43, 0x4d, 0xfa, 0x02, 0x02, 0x61, > +}; > + > +const uint8_t montblanc_fcm_fruid[] = { > +    0xfb, 0xfb, 0x04, 0xff, 0x01, 0x0d, 0x4d, 0x49, 0x4e, 0x49, 0x50, 0x41, > +    0x43, 0x4b, 0x33, 0x5f, 0x46, 0x43, 0x42, 0x02, 0x08, 0x33, 0x30, 0x30, > +    0x30, 0x30, 0x31, 0x36, 0x31, 0x04, 0x0c, 0x31, 0x33, 0x32, 0x30, 0x30, > +    0x30, 0x31, 0x36, 0x33, 0x30, 0x31, 0x20, 0x05, 0x0c, 0x31, 0x33, 0x31, > +    0x30, 0x30, 0x30, 0x31, 0x33, 0x30, 0x30, 0x31, 0x20, 0x06, 0x0c, 0x52, > +    0x33, 0x32, 0x31, 0x34, 0x47, 0x30, 0x30, 0x31, 0x32, 0x30, 0x31, 0x07, > +    0x0d, 0x41, 0x31, 0x32, 0x31, 0x32, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, > +    0x58, 0x58, 0x08, 0x01, 0x01, 0x09, 0x01, 0x00, 0x0a, 0x01, 0x00, 0x0b, > +    0x0d, 0x46, 0x35, 0x30, 0x31, 0x33, 0x32, 0x33, 0x31, 0x37, 0x30, 0x30, > +    0x30, 0x35, 0x0c, 0x03, 0x43, 0x4c, 0x53, 0x0d, 0x08, 0x32, 0x30, 0x32, > +    0x33, 0x30, 0x35, 0x30, 0x31, 0x0e, 0x03, 0x57, 0x55, 0x53, 0x0f, 0x03, > +    0x43, 0x54, 0x48, 0x10, 0x06, 0x02, 0x00, 0x00, 0x91, 0xdb, 0xb4, 0x11, > +    0x06, 0x03, 0x00, 0x00, 0x91, 0xdb, 0xb4, 0x12, 0x02, 0x8a, 0x00, 0x13, > +    0x03, 0x46, 0x43, 0x42, 0xfa, 0x02, 0x50, 0x47, > +}; > + > +const uint8_t montblanc_bmc_fruid[] = { > +    0xfb, 0xfb, 0x04, 0xff, 0x01, 0x0d, 0x4d, 0x49, 0x4e, 0x49, 0x50, 0x41, > +    0x43, 0x4b, 0x33, 0x5f, 0x42, 0x4d, 0x43, 0x04, 0x0c, 0x31, 0x33, 0x32, > +    0x30, 0x30, 0x30, 0x31, 0x33, 0x36, 0x30, 0x31, 0x20, 0x05, 0x0c, 0x31, > +    0x33, 0x31, 0x30, 0x30, 0x30, 0x30, 0x38, 0x36, 0x30, 0x35, 0x20, 0x06, > +    0x0c, 0x52, 0x33, 0x30, 0x39, 0x37, 0x47, 0x30, 0x30, 0x30, 0x32, 0x30, > +    0x37, 0x07, 0x0d, 0x42, 0x30, 0x32, 0x37, 0x34, 0x58, 0x58, 0x58, 0x58, > +    0x58, 0x58, 0x58, 0x58, 0x08, 0x01, 0x04, 0x09, 0x01, 0x00, 0x0a, 0x01, > +    0x00, 0x0c, 0x03, 0x43, 0x4c, 0x53, 0x0d, 0x08, 0x32, 0x30, 0x32, 0x33, > +    0x30, 0x35, 0x30, 0x31, 0x0e, 0x03, 0x57, 0x55, 0x53, 0x0f, 0x03, 0x43, > +    0x54, 0x48, 0x13, 0x03, 0x42, 0x4d, 0x43, 0xfa, 0x02, 0xef, 0xba, > +}; > + >  const size_t tiogapass_bmc_fruid_len = sizeof(tiogapass_bmc_fruid); >  const size_t fby35_nic_fruid_len = sizeof(fby35_nic_fruid); >  const size_t fby35_bb_fruid_len = sizeof(fby35_bb_fruid); > @@ -168,3 +215,6 @@ const size_t fby35_bmc_fruid_len = sizeof(fby35_bmc_fruid); >  const size_t yosemitev2_bmc_fruid_len = sizeof(yosemitev2_bmc_fruid); >  const size_t rainier_bb_fruid_len = sizeof(rainier_bb_fruid); >  const size_t rainier_bmc_fruid_len = sizeof(rainier_bmc_fruid); > +const size_t montblanc_scm_fruid_len = sizeof(montblanc_scm_fruid); > +const size_t montblanc_fcm_fruid_len = sizeof(montblanc_fcm_fruid); > +const size_t montblanc_bmc_fruid_len = sizeof(montblanc_bmc_fruid); > diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h > index bbf9e54365..b8fbdd0734 100644 > --- a/hw/arm/aspeed_eeprom.h > +++ b/hw/arm/aspeed_eeprom.h > @@ -27,4 +27,11 @@ extern const size_t rainier_bb_fruid_len; >  extern const uint8_t rainier_bmc_fruid[]; >  extern const size_t rainier_bmc_fruid_len; > > +extern const uint8_t montblanc_scm_fruid[]; > +extern const uint8_t montblanc_fcm_fruid[]; > +extern const uint8_t montblanc_bmc_fruid[]; > +extern const size_t montblanc_scm_fruid_len; > +extern const size_t montblanc_fcm_fruid_len; > +extern const size_t montblanc_bmc_fruid_len; > + >  #endif > -- > 2.38.5 >