aspeed add montblanc bmc reference from fuji
PATCH 1/1 aspeed add montblanc bmc reference from fuji
From: Sittisak Sinprem <[email protected]>
- I2C list follow I2C Tree v1.6 20230320
- fru eeprom data use FB FRU format version 4
--- hw/arm/aspeed.c | 67 ++++++++++++++++++++++++++++++++++++++++++ hw/arm/aspeed_eeprom.c | 50 +++++++++++++++++++++++++++++++ hw/arm/aspeed_eeprom.h | 7 +++++ 3 files changed, 124 insertions(+)
hw/arm/aspeed.c +67 -0
@@ -182,6 +182,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
@@ -918,6 +922,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 (i2c[3 ],0x56 , montblanc_scm_fruid,8192 , true); +at24c_eeprom_init (i2c[6 ],0x53 , montblanc_fcm_fruid,8192 , true); + +/* CPLD and FPGA */ +aspeed_eeprom_init (i2c[1 ],0x35 ,256 );/* SCM CPLD */ +aspeed_eeprom_init (i2c[5 ],0x35 ,256 );/* COMe CPLD TODO: need to update */ +aspeed_eeprom_init (i2c[12 ],0x60 ,256 );/* MCB PWR CPLD */ +aspeed_eeprom_init (i2c[13 ],0x35 ,256 );/* IOB FPGA */ + +/* on BMC board */ +at24c_eeprom_init (i2c[8 ],0x51 , montblanc_bmc_fruid,8192 , true); +/* BMC EEPROM */ +i2c_slave_create_simple (i2c[8 ],TYPE_LM75 ,0x48 );/* Thermal Sensor */ + +/* COMe Sensor/EEPROM */ +aspeed_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)
@@ -1450,6 +1487,32 @@ static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data)aspeed_soc_num_cpus (amc->soc_name); }; +/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ +#if HOST_LONG_BITS ==32 +#define MONTBLANC_BMC_RAM_SIZE (1 * GiB) +#else +#define MONTBLANC_BMC_RAM_SIZE (2 * GiB) +#endif +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); +}; +/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ #if HOST_LONG_BITS ==32 #define BLETCHLEY_BMC_RAM_SIZE (1 * GiB)
@@ -1706,6 +1769,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,
hw/arm/aspeed_eeprom.c +50 -0
59 lines not on this page · raw message
hw/arm/aspeed_eeprom.h +7 -0
@@ -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
Signature · 1 line
2.38.5
Hello Sittisak,
Quoted 6 lines · ~ssinprem
From: Sittisak Sinprem <[email protected]>
- I2C list follow I2C Tree v1.6 20230320
- fru eeprom data use FB FRU format version 4Signed-off-by Sittisak Sinprem <[email protected]>
You don't need to cc: [email protected] for new machines.
Quoted 26 lines
--- hw/arm/aspeed.c | 67 ++++++++++++++++++++++++++++++++++++++++++ hw/arm/aspeed_eeprom.c | 50 +++++++++++++++++++++++++++++++ hw/arm/aspeed_eeprom.h | 7 +++++ 3 files changed, 124 insertions(+)hw/arm/aspeed.c +5
-0@@ -182,6 +182,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@@ -918,6 +922,39 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc) } } +static void montblanc_bmc_i2c_init (AspeedMachineState *bmc)
hw/arm/aspeed.c static void fuji_bmc_i2c_init(AspeedMachineState *bmc) · line 935
Quoted 10 lines
hw/arm/aspeed.c +10
-0+{ +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 (i2c[3 ],0x56 , montblanc_scm_fruid,8192 , true);
I think you meant to use at24c_eeprom_init_rom ?
Thanks,
C.
Quoted 150 lines
hw/arm/aspeed.c +52
-0+at24c_eeprom_init (i2c[6 ],0x53 , montblanc_fcm_fruid,8192 , true); + +/* CPLD and FPGA */ +aspeed_eeprom_init (i2c[1 ],0x35 ,256 );/* SCM CPLD */ +aspeed_eeprom_init (i2c[5 ],0x35 ,256 );/* COMe CPLD TODO: need to update */ +aspeed_eeprom_init (i2c[12 ],0x60 ,256 );/* MCB PWR CPLD */ +aspeed_eeprom_init (i2c[13 ],0x35 ,256 );/* IOB FPGA */ + +/* on BMC board */ +at24c_eeprom_init (i2c[8 ],0x51 , montblanc_bmc_fruid,8192 , true); +/* BMC EEPROM */ +i2c_slave_create_simple (i2c[8 ],TYPE_LM75 ,0x48 );/* Thermal Sensor */ + +/* COMe Sensor/EEPROM */ +aspeed_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)@@ -1450,6 +1487,32 @@ static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data)aspeed_soc_num_cpus (amc->soc_name); }; +/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ +#if HOST_LONG_BITS ==32 +#define MONTBLANC_BMC_RAM_SIZE (1 * GiB) +#else +#define MONTBLANC_BMC_RAM_SIZE (2 * GiB) +#endif +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); +}; +/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ #if HOST_LONG_BITS ==32 #define BLETCHLEY_BMC_RAM_SIZE (1 * GiB)@@ -1706,6 +1769,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,hw/arm/aspeed_eeprom.c +50
-0@@ -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[8192 ] = { +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 ,0xb4 ,0xbd ,0x00 ,0x00 ,0x00 ,0x01 ,0x13 , +0x03 ,0x53 ,0x43 ,0x4d ,0xfa ,0x02 ,0x11 ,0x07 , +}; + +const uint8_t montblanc_fcm_fruid[8192 ] = { +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 ,0xb4 ,0xbd ,0x00 ,0x00 ,0x00 ,0x02 ,0x11 , +0x06 ,0xb4 ,0xbd ,0x00 ,0x00 ,0x00 ,0x03 ,0x12 ,0x02 ,0x8a ,0x00 ,0x13 , +0x03 ,0x46 ,0x43 ,0x42 ,0xfa ,0x02 ,0x0e ,0x61 , +}; + +const uint8_t montblanc_bmc_fruid[8192 ] = { +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);hw/arm/aspeed_eeprom.h +7
-0@@ -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
Got it Cedric, I just know for it,
I am fixing, and will re-send the patch as V2.
Quoted 249 lines · Cédric Le Goater
Hello Sittisak,
Quoted 6 lines · ~ssinprem
From: Sittisak Sinprem <[email protected]>
- I2C list follow I2C Tree v1.6 20230320
- fru eeprom data use FB FRU format version 4Signed-off-by Sittisak Sinprem <[email protected]>You don't need to cc: [email protected] for new machines.
hw/arm/aspeed.c static void fuji_bmc_i2c_init(AspeedMachineState
Quoted 22 lines
--- hw/arm/aspeed.c | 67 ++++++++++++++++++++++++++++++++++++++++++ hw/arm/aspeed_eeprom.c | 50 +++++++++++++++++++++++++++++++ hw/arm/aspeed_eeprom.h | 7 +++++ 3 files changed, 124 insertions(+)hw/arm/aspeed.c +4
-0@@ -182,6 +182,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@@ -918,6 +922,39 @@ static void fuji_bmc_i2c_init(AspeedMachineState*bmc)
Quoted 4 lines
hw/arm/aspeed.c +1
-0} } +static void montblanc_bmc_i2c_init (AspeedMachineState *bmc)hw/arm/aspeed.c static void fuji_bmc_i2c_init(AspeedMachineState *bmc) · line 935
Quoted 10 lines
hw/arm/aspeed.c +10
-0+{ +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 (i2c[3 ],0x56 , montblanc_scm_fruid,8192 , true);I think you meant to use
at24c_eeprom_init_rom?Thanks,
C.
hw/arm/aspeed.c static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
Quoted 5 lines
hw/arm/aspeed.c +5
-0+at24c_eeprom_init (i2c[6 ],0x53 , montblanc_fcm_fruid,8192 , true); + +/* CPLD and FPGA */ +aspeed_eeprom_init (i2c[1 ],0x35 ,256 );/* SCM CPLD */ +aspeed_eeprom_init (i2c[5 ],0x35 ,256 );/* COMe CPLD TODO: need to update */
hw/arm/aspeed.c static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
Quoted 7 lines
hw/arm/aspeed.c +7
-0+aspeed_eeprom_init (i2c[12 ],0x60 ,256 );/* MCB PWR CPLD */ +aspeed_eeprom_init (i2c[13 ],0x35 ,256 );/* IOB FPGA */ + +/* on BMC board */ +at24c_eeprom_init (i2c[8 ],0x51 , montblanc_bmc_fruid,8192 , true); +/* BMC EEPROM */ +i2c_slave_create_simple (i2c[8 ],TYPE_LM75 ,0x48 );/* Thermal Sensor */
hw/arm/aspeed.c static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
Quoted 5 lines
hw/arm/aspeed.c +5
-0+ +/* COMe Sensor/EEPROM */ +aspeed_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 */
hw/arm/aspeed.c static void
Quoted 9 lines
hw/arm/aspeed.c +5
-0+ +/* 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)@@ -1450,6 +1487,32 @@ static void
aspeed_machine_fuji_class_init(ObjectClass *oc, void *data)hw/arm/aspeed.c static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data)
Quoted 10 lines
hw/arm/aspeed.c +7
-0aspeed_soc_num_cpus (amc->soc_name); }; +/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ +#if HOST_LONG_BITS ==32 +#define MONTBLANC_BMC_RAM_SIZE (1 * GiB) +#else +#define MONTBLANC_BMC_RAM_SIZE (2 * GiB) +#endif +static void aspeed_machine_montblanc_class_init(ObjectClass *oc, void*data)
Quoted 38 lines
hw/arm/aspeed.c +23
-0+{ +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); +}; +/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ #if HOST_LONG_BITS ==32 #define BLETCHLEY_BMC_RAM_SIZE (1 * GiB)@@ -1706,6 +1769,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,hw/arm/aspeed_eeprom.c +0
-0hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 166
Quoted 6 lines
hw/arm/aspeed_eeprom.c +3
-0@@ -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[8192 ] = { +0xfb ,0xfb ,0x04 ,0xff ,0x01 ,0x0d ,0x4d ,0x49 ,0x4e ,0x49 ,0x50 ,
0x41,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 167
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x43, 0x4b, 0x33, 0x5f, 0x53, 0x43, 0x4d, 0x02, 0x08, 0x32, 0x30,
0x30,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 168
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x32, 0x39, 0x34, 0x35, 0x04, 0x0c, 0x31, 0x33, 0x32, 0x30,
0x30,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 169
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x31, 0x36, 0x34, 0x30, 0x31, 0x20, 0x05, 0x0c, 0x31, 0x33,
0x31,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 170
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x30, 0x30, 0x31, 0x32, 0x37, 0x30, 0x31, 0x20, 0x06, 0x0c,
0x52,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 171
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x33, 0x32, 0x31, 0x34, 0x47, 0x30, 0x30, 0x30, 0x33, 0x30, 0x31,
0x07,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 172
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x0d, 0x41, 0x30, 0x33, 0x31, 0x33, 0x58, 0x58, 0x58, 0x58, 0x58,
0x58,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 173
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x58, 0x58, 0x08, 0x01, 0x01, 0x09, 0x01, 0x00, 0x0a, 0x01, 0x00,
0x0b,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 174
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x0d, 0x4d, 0x32, 0x32, 0x31, 0x33, 0x32, 0x33, 0x31, 0x37, 0x30,
0x30,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 175
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x32, 0x0c, 0x03, 0x43, 0x4c, 0x53, 0x0d, 0x08, 0x32, 0x30,
0x32,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 176
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x33, 0x30, 0x35, 0x30, 0x31, 0x0e, 0x03, 0x57, 0x55, 0x53, 0x0f,
0x03,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 177
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x43, 0x54, 0x48, 0x10, 0x06, 0xb4, 0xbd, 0x00, 0x00, 0x00, 0x01,
0x13,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = {
Quoted 5 lines
hw/arm/aspeed_eeprom.c +5
-0+ 0x03, 0x53, 0x43, 0x4d, 0xfa, 0x02, 0x11, 0x07, +}; + +const uint8_t montblanc_fcm_fruid[8192 ] = { +0xfb ,0xfb ,0x04 ,0xff ,0x01 ,0x0d ,0x4d ,0x49 ,0x4e ,0x49 ,0x50 ,
0x41,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 183
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x43, 0x4b, 0x33, 0x5f, 0x46, 0x43, 0x42, 0x02, 0x08, 0x33, 0x30,
0x30,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 184
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x30, 0x31, 0x36, 0x31, 0x04, 0x0c, 0x31, 0x33, 0x32, 0x30,
0x30,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 185
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x31, 0x36, 0x33, 0x30, 0x31, 0x20, 0x05, 0x0c, 0x31, 0x33,
0x31,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 186
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x30, 0x30, 0x31, 0x33, 0x30, 0x30, 0x31, 0x20, 0x06, 0x0c,
0x52,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 187
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x33, 0x32, 0x31, 0x34, 0x47, 0x30, 0x30, 0x31, 0x32, 0x30, 0x31,
0x07,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 188
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x0d, 0x41, 0x31, 0x32, 0x31, 0x32, 0x58, 0x58, 0x58, 0x58, 0x58,
0x58,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 189
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x58, 0x58, 0x08, 0x01, 0x01, 0x09, 0x01, 0x00, 0x0a, 0x01, 0x00,
0x0b,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 190
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x0d, 0x46, 0x35, 0x30, 0x31, 0x33, 0x32, 0x33, 0x31, 0x37, 0x30,
0x30,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 191
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x35, 0x0c, 0x03, 0x43, 0x4c, 0x53, 0x0d, 0x08, 0x32, 0x30,
0x32,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 192
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x33, 0x30, 0x35, 0x30, 0x31, 0x0e, 0x03, 0x57, 0x55, 0x53, 0x0f,
0x03,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 193
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x43, 0x54, 0x48, 0x10, 0x06, 0xb4, 0xbd, 0x00, 0x00, 0x00, 0x02,
0x11,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 194
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x06, 0xb4, 0xbd, 0x00, 0x00, 0x00, 0x03, 0x12, 0x02, 0x8a, 0x00,
0x13,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = {
Quoted 5 lines
hw/arm/aspeed_eeprom.c +5
-0+ 0x03, 0x46, 0x43, 0x42, 0xfa, 0x02, 0x0e, 0x61, +}; + +const uint8_t montblanc_bmc_fruid[8192 ] = { +0xfb ,0xfb ,0x04 ,0xff ,0x01 ,0x0d ,0x4d ,0x49 ,0x4e ,0x49 ,0x50 ,
0x41,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 200
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x43, 0x4b, 0x33, 0x5f, 0x42, 0x4d, 0x43, 0x04, 0x0c, 0x31, 0x33,
0x32,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 201
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x30, 0x30, 0x31, 0x33, 0x36, 0x30, 0x31, 0x20, 0x05, 0x0c,
0x31,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 202
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x33, 0x31, 0x30, 0x30, 0x30, 0x30, 0x38, 0x36, 0x30, 0x35, 0x20,
0x06,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 203
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x0c, 0x52, 0x33, 0x30, 0x39, 0x37, 0x47, 0x30, 0x30, 0x30, 0x32,
0x30,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 204
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x37, 0x07, 0x0d, 0x42, 0x30, 0x32, 0x37, 0x34, 0x58, 0x58, 0x58,
0x58,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 205
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x58, 0x58, 0x58, 0x58, 0x08, 0x01, 0x04, 0x09, 0x01, 0x00, 0x0a,
0x01,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 206
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x00, 0x0c, 0x03, 0x43, 0x4c, 0x53, 0x0d, 0x08, 0x32, 0x30, 0x32,
0x33,hw/arm/aspeed_eeprom.c const uint8_t rainier_bmc_fruid[] = { · line 207
Quoted 1 line
hw/arm/aspeed_eeprom.c +1
-0+ 0x30, 0x35, 0x30, 0x31, 0x0e, 0x03, 0x57, 0x55, 0x53, 0x0f, 0x03,
0x43,hw/arm/aspeed_eeprom.c const size_t fby35_bmc_fruid_len =
Quoted 7 lines
hw/arm/aspeed_eeprom.c +3
-0+ 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);Quoted 22 lines
hw/arm/aspeed_eeprom.c +3
-0const 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);hw/arm/aspeed_eeprom.h +7
-0@@ -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
Quoted 3 lines · Sittisak Sinprem
Got it Cedric, I just know for it,
I am fixing, and will re-send the patch as V2.
Could you please use the patch below and send in your series ?
Thanks,
C.
From cfbc865ffe8a4dffe4ac764eb10416aa906a7170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <[email protected]>
Date: Wed, 28 Jun 2023 18:32:20 +0200
Subject: [PATCH] aspeed: Introduce ASPEED_RAM_SIZE helper for 32-bit hosts
limitation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
On 32-bit hosts, RAM has a 2047 MB limit. Use a macro to define the default ram size of machines (AST2600 SoC) that can have 2 GB.
--- hw/arm/aspeed.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
hw/arm/aspeed.c +9 -12
@@ -49,6 +49,13 @@ struct AspeedMachineState {uint32_t hw_strap1; }; +/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ +#if HOST_LONG_BITS ==32 +#define ASPEED_RAM_SIZE (sz) MIN((sz), 1 * GiB) +#else +#define ASPEED_RAM_SIZE (sz) (sz) +#endif +/* Palmetto hardware value: 0x120CE416 */ #define PALMETTO_BMC_HW_STRAP1 ( \ SCU_AST2400_HW_STRAP_DRAM_SIZE(DRAM_SIZE_256MB) | \
@@ -1504,12 +1511,7 @@ static void aspeed_machine_rainier_class_init(ObjectClass *oc, void *data)aspeed_machine_ast2600_class_init (oc, data); }; -/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ -#if HOST_LONG_BITS ==32 -#define FUJI_BMC_RAM_SIZE (1 * GiB) -#else -#define FUJI_BMC_RAM_SIZE (2 * GiB) -#endif +#define FUJI_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB)static void aspeed_machine_fuji_class_init (ObjectClass *oc,void *data) {
@@ -1533,12 +1535,7 @@ static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data)aspeed_machine_ast2600_class_init (oc, data); }; -/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ -#if HOST_LONG_BITS ==32 -#define BLETCHLEY_BMC_RAM_SIZE (1 * GiB) -#else -#define BLETCHLEY_BMC_RAM_SIZE (2 * GiB) -#endif +#define BLETCHLEY_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB)static void aspeed_machine_bletchley_class_init (ObjectClass *oc,void *data) {
Signature · 1 line
2.41.0
Hi Cédric,
I had fixed the function name to support in current branch, but facing about below error while starting
./build/qemu-system-arm -machine montblanc-bmc -drive
Quoted 4 lines
file=~/flash-montblanc,format=raw,if=mtd -nographic -netdev tap,id=netdev0,script=no,downscript=no,ifname=tap0 -net nic,netdev=netdev0,model=ftgmac100
qemu-system-arm: device requires 134217728 bytes, block backend provides
Quoted 1 line
27726336 bytes
Quoted 83 lines · Cédric Le Goater
Quoted 3 lines · Sittisak Sinprem
Got it Cedric, I just know for it,
I am fixing, and will re-send the patch as V2.
Could you please use the patch below and send in your series ?
Thanks,
C.
From
cfbc865ffe8a4dffe4ac764eb10416aa906a7170Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <[email protected]>
Date: Wed, 28 Jun 2023 18:32:20 +0200
Subject: [PATCH] aspeed: IntroduceASPEED_RAM_SIZEhelper for 32-bit hosts
limitation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bitOn 32-bit hosts, RAM has a 2047 MB limit. Use a macro to define the default ram size of machines (AST2600 SoC) that can have 2 GB.
Signed-off-by Cédric Le Goater <[email protected]>--- hw/arm/aspeed.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)hw/arm/aspeed.c +8
-6@@ -49,6 +49,13 @@ struct AspeedMachineState {uint32_t hw_strap1; }; +/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ +#if HOST_LONG_BITS ==32 +#define ASPEED_RAM_SIZE (sz) MIN((sz), 1 * GiB) +#else +#define ASPEED_RAM_SIZE (sz) (sz) +#endif +/* Palmetto hardware value: 0x120CE416 */ #define PALMETTO_BMC_HW_STRAP1 ( \ SCU_AST2400_HW_STRAP_DRAM_SIZE(DRAM_SIZE_256MB) | \@@ -1504,12 +1511,7 @@ static void aspeed_machine_rainier_class_init(ObjectClass *oc, void *data)aspeed_machine_ast2600_class_init (oc, data); }; -/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ -#if HOST_LONG_BITS ==32 -#define FUJI_BMC_RAM_SIZE (1 * GiB) -#else -#define FUJI_BMC_RAM_SIZE (2 * GiB) -#endif +#define FUJI_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB)static void aspeed_machine_fuji_class_init (ObjectClass *oc,void *data){hw/arm/aspeed.c +1
-6@@ -1533,12 +1535,7 @@ static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data)aspeed_machine_ast2600_class_init (oc, data); }; -/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ -#if HOST_LONG_BITS ==32 -#define BLETCHLEY_BMC_RAM_SIZE (1 * GiB) -#else -#define BLETCHLEY_BMC_RAM_SIZE (2 * GiB) -#endif +#define BLETCHLEY_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void*data)
{
--
2.41.0
Quoted 8 lines · Sittisak Sinprem
Hi Cédric,
I had fixed the function name to support in current branch, but facing about below error while starting
./build/qemu-system-arm -machine montblanc-bmc -drive file=~/flash-montblanc,format=raw,if=mtd -nographic -netdev tap,id=netdev0,script=no,downscript=no,ifname=tap0 -net nic,netdev=netdev0,model=ftgmac100
qemu-system-arm: device requires 134217728 bytes, block backend provides 27726336 bytes
File ~/flash-montblanc is too big for the mx66l1g45g flash device and 128MB is expected. Use truncate maybe.
Thanks,
C.
Quoted 4 lines · ~ssinprem
From: Sittisak Sinprem <[email protected]>
- I2C list follow I2C Tree v1.6 20230320
- fru eeprom data use FB FRU format version 4
I don't think this qualifies for -stable. Unless it is fixing quite a serious issue in existing code in the process.
I'd love to hear some comments about this one.
Thanks,
/mjt
Quoted 10 lines · Michael Tokarev
Quoted 4 lines · ~ssinprem
From: Sittisak Sinprem <[email protected]>
- I2C list follow I2C Tree v1.6 20230320
- fru eeprom data use FB FRU format version 4I don't think this qualifies for -stable. Unless it is fixing quite a serious issue in existing code in the process.
I'd love to hear some comments about this one.
This is new stuff. Not for -stable.
Thanks,
C.