hw/nvram/eeprom_at24c: Cleanup + FRUID EEPROM init example
Subsystems (2)
PATCH v5 2/5 hw/arm/aspeed: Replace aspeed_eeprom_init with at24c_eeprom_init
In reply to Peter Delevoryasaspeed_eeprom_init is an exact copy of at24c_eeprom_init, not needed.
--- hw/arm/aspeed.c | 95 ++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 52 deletions(-)
hw/arm/aspeed.c +43 -52
@@ -660,15 +660,6 @@ static void g220a_bmc_i2c_init(AspeedMachineState *bmc) eeprom_buf); } -static void aspeed_eeprom_init (I2CBus *bus,uint8_t addr,uint32_t rsize) -{ -I2CSlave *i2c_dev =i2c_slave_new ("at24c-eeprom" , addr); -DeviceState *dev =DEVICE (i2c_dev); - -qdev_prop_set_uint32 (dev,"rom-size" , rsize); -i2c_slave_realize_and_unref (i2c_dev, bus, &error_abort); -} -static void fp5280g2_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;
@@ -701,7 +692,7 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc)AspeedSoCState *soc = &bmc->soc;I2CSlave *i2c_mux; -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,0 ),0x51 ,32 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,0 ),0x51 ,32 * KiB);create_pca9552 (soc,3 ,0x61 );
@@ -714,9 +705,9 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc) 0x4a); i2c_mux =i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,4 ),"pca9546" ,0x70 ); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,0 ),0x50 ,64 * KiB); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,1 ),0x51 ,64 * KiB); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,2 ),0x52 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,0 ),0x50 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,1 ),0x51 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,2 ),0x52 ,64 * KiB);create_pca9552 (soc,4 ,0x60 ); i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 5), TYPE_TMP105,
@@ -727,8 +718,8 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc)create_pca9552 (soc,5 ,0x61 ); i2c_mux =i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,5 ),"pca9546" ,0x70 ); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,0 ),0x50 ,64 * KiB); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,1 ),0x51 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,0 ),0x50 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,1 ),0x51 ,64 * KiB);i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,6 ),TYPE_TMP105 ,0x48 );
@@ -738,10 +729,10 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc) 0x4b); i2c_mux =i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,6 ),"pca9546" ,0x70 ); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,0 ),0x50 ,64 * KiB); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,1 ),0x51 ,64 * KiB); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,2 ),0x50 ,64 * KiB); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,3 ),0x51 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,0 ),0x50 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,1 ),0x51 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,2 ),0x50 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,3 ),0x51 ,64 * KiB);create_pca9552 (soc,7 ,0x30 );create_pca9552 (soc,7 ,0x31 );
@@ -754,15 +745,15 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc)i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,7 ),TYPE_TMP105 ,0x48 );i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,7 ),"max31785" ,0x52 ); -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,7 ),0x50 ,64 * KiB); -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,7 ),0x51 ,64 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,7 ),0x50 ,64 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,7 ),0x51 ,64 * KiB);i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,8 ),TYPE_TMP105 ,0x48 );i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,8 ),TYPE_TMP105 ,0x4a ); -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,8 ),0x50 ,64 * KiB); -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,8 ),0x51 ,64 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,8 ),0x50 ,64 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,8 ),0x51 ,64 * KiB);create_pca9552 (soc,8 ,0x60 );create_pca9552 (soc,8 ,0x61 );/* Bus 8: ucd90320@11 */
@@ -771,11 +762,11 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc)i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,9 ),"tmp423" ,0x4c );i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,9 ),"tmp423" ,0x4d ); -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,9 ),0x50 ,128 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,9 ),0x50 ,128 * KiB);i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,10 ),"tmp423" ,0x4c );i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,10 ),"tmp423" ,0x4d ); -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,10 ),0x50 ,128 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,10 ),0x50 ,128 * KiB);i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,11 ),TYPE_TMP105 ,0x48 );
@@ -783,18 +774,18 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc) 0x49); i2c_mux =i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c,11 ),"pca9546" ,0x70 ); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,0 ),0x50 ,64 * KiB); -aspeed_eeprom_init (pca954x_i2c_get_bus (i2c_mux,1 ),0x51 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,0 ),0x50 ,64 * KiB); +at24c_eeprom_init (pca954x_i2c_get_bus (i2c_mux,1 ),0x51 ,64 * KiB);create_pca9552 (soc,11 ,0x60 ); -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,13 ),0x50 ,64 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,13 ),0x50 ,64 * KiB);create_pca9552 (soc,13 ,0x60 ); -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,14 ),0x50 ,64 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,14 ),0x50 ,64 * KiB);create_pca9552 (soc,14 ,0x60 ); -aspeed_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,15 ),0x50 ,64 * KiB); +at24c_eeprom_init (aspeed_i2c_get_bus (&soc->i2c,15 ),0x50 ,64 * KiB);create_pca9552 (soc,15 ,0x60 ); }
@@ -838,45 +829,45 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc)i2c_slave_create_simple (i2c[17 ],TYPE_LM75 ,0x4c );i2c_slave_create_simple (i2c[17 ],TYPE_LM75 ,0x4d ); -aspeed_eeprom_init (i2c[19 ],0x52 ,64 * KiB); -aspeed_eeprom_init (i2c[20 ],0x50 ,2 * KiB); -aspeed_eeprom_init (i2c[22 ],0x52 ,2 * KiB); +at24c_eeprom_init (i2c[19 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[20 ],0x50 ,2 * KiB); +at24c_eeprom_init (i2c[22 ],0x52 ,2 * KiB);i2c_slave_create_simple (i2c[3 ],TYPE_LM75 ,0x48 );i2c_slave_create_simple (i2c[3 ],TYPE_LM75 ,0x49 );i2c_slave_create_simple (i2c[3 ],TYPE_LM75 ,0x4a );i2c_slave_create_simple (i2c[3 ],TYPE_TMP422 ,0x4c ); -aspeed_eeprom_init (i2c[8 ],0x51 ,64 * KiB); +at24c_eeprom_init (i2c[8 ],0x51 ,64 * KiB);i2c_slave_create_simple (i2c[8 ],TYPE_LM75 ,0x4a );i2c_slave_create_simple (i2c[50 ],TYPE_LM75 ,0x4c ); -aspeed_eeprom_init (i2c[50 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[50 ],0x52 ,64 * KiB);i2c_slave_create_simple (i2c[51 ],TYPE_TMP75 ,0x48 );i2c_slave_create_simple (i2c[52 ],TYPE_TMP75 ,0x49 );i2c_slave_create_simple (i2c[59 ],TYPE_TMP75 ,0x48 );i2c_slave_create_simple (i2c[60 ],TYPE_TMP75 ,0x49 ); -aspeed_eeprom_init (i2c[65 ],0x53 ,64 * KiB); +at24c_eeprom_init (i2c[65 ],0x53 ,64 * KiB);i2c_slave_create_simple (i2c[66 ],TYPE_TMP75 ,0x49 );i2c_slave_create_simple (i2c[66 ],TYPE_TMP75 ,0x48 ); -aspeed_eeprom_init (i2c[68 ],0x52 ,64 * KiB); -aspeed_eeprom_init (i2c[69 ],0x52 ,64 * KiB); -aspeed_eeprom_init (i2c[70 ],0x52 ,64 * KiB); -aspeed_eeprom_init (i2c[71 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[68 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[69 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[70 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[71 ],0x52 ,64 * KiB); -aspeed_eeprom_init (i2c[73 ],0x53 ,64 * KiB); +at24c_eeprom_init (i2c[73 ],0x53 ,64 * KiB);i2c_slave_create_simple (i2c[74 ],TYPE_TMP75 ,0x49 );i2c_slave_create_simple (i2c[74 ],TYPE_TMP75 ,0x48 ); -aspeed_eeprom_init (i2c[76 ],0x52 ,64 * KiB); -aspeed_eeprom_init (i2c[77 ],0x52 ,64 * KiB); -aspeed_eeprom_init (i2c[78 ],0x52 ,64 * KiB); -aspeed_eeprom_init (i2c[79 ],0x52 ,64 * KiB); -aspeed_eeprom_init (i2c[28 ],0x50 ,2 * KiB); +at24c_eeprom_init (i2c[76 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[77 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[78 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[79 ],0x52 ,64 * KiB); +at24c_eeprom_init (i2c[28 ],0x50 ,2 * KiB);for (int i =0 ; i <8 ; i++) { -aspeed_eeprom_init (i2c[81 + i *8 ],0x56 ,64 * KiB); +at24c_eeprom_init (i2c[81 + i *8 ],0x56 ,64 * KiB);i2c_slave_create_simple (i2c[82 + i *8 ],TYPE_TMP75 ,0x48 );i2c_slave_create_simple (i2c[83 + i *8 ],TYPE_TMP75 ,0x4b );i2c_slave_create_simple (i2c[84 + i *8 ],TYPE_TMP75 ,0x4a );
@@ -947,11 +938,11 @@ static void fby35_i2c_init(AspeedMachineState *bmc)i2c_slave_create_simple (i2c[12 ],TYPE_LM75 ,0x4e );i2c_slave_create_simple (i2c[12 ],TYPE_LM75 ,0x4f ); -aspeed_eeprom_init (i2c[4 ],0x51 ,128 * KiB); -aspeed_eeprom_init (i2c[6 ],0x51 ,128 * KiB); -aspeed_eeprom_init (i2c[8 ],0x50 ,32 * KiB); -aspeed_eeprom_init (i2c[11 ],0x51 ,128 * KiB); -aspeed_eeprom_init (i2c[11 ],0x54 ,128 * KiB); +at24c_eeprom_init (i2c[4 ],0x51 ,128 * KiB); +at24c_eeprom_init (i2c[6 ],0x51 ,128 * KiB); +at24c_eeprom_init (i2c[8 ],0x50 ,32 * KiB); +at24c_eeprom_init (i2c[11 ],0x51 ,128 * KiB); +at24c_eeprom_init (i2c[11 ],0x54 ,128 * KiB);/* * TODO: There is a multi-master i2c connection to an AST1030 MiniBMC on
Signature · 1 line
2.39.0
PATCH v5 4/5 hw/arm/aspeed: Add aspeed_eeprom.c
In reply to Peter Delevoryas- Create aspeed_eeprom.c and aspeed_eeprom.h
- Include aspeed_eeprom.c in CONFIG_ASPEED meson source files
- Include aspeed_eeprom.h in aspeed.c
- Add fby35_bmc_fruid data
- Use new at24c_eeprom_init_rom helper to initialize BMC FRUID EEPROM with data from aspeed_eeprom.c
wget https://github.com/facebook/openbmc/releases/download/openbmc-e2294ff5d31d/fby35.mtd
qemu-system-aarch64 -machine fby35-bmc -nographic -mtdblock fby35.mtd
...
user: root
pass: 0penBmc
...
root@bmc-oob:~# fruid-util bb
FRU Information : Baseboard --------------- : ------------------ Chassis Type : Rack Mount Chassis Chassis Part Number : N/A Chassis Serial Number : N/A Board Mfg Date : Fri Jan 7 10:30:00 2022 Board Mfg : XXXXXX Board Product : Management Board wBMC Board Serial : XXXXXXXXXXXXX Board Part Number : XXXXXXXXXXXXXX Board FRU ID : 1.0 Board Custom Data 1 : XXXXXXXXX Board Custom Data 2 : XXXXXXXXXXXXXXXXXX Product Manufacturer : XXXXXX Product Name : Yosemite V3.5 EVT2 Product Part Number : XXXXXXXXXXXXXX Product Version : EVT2 Product Serial : XXXXXXXXXXXXX Product Asset Tag : XXXXXXX Product FRU ID : 1.0 Product Custom Data 1 : XXXXXXXXX Product Custom Data 2 : N/A root@bmc-oob:~# fruid-util bmc
FRU Information : BMC --------------- : ------------------ Board Mfg Date : Mon Jan 10 21:42:00 2022 Board Mfg : XXXXXX Board Product : BMC Storage Module Board Serial : XXXXXXXXXXXXX Board Part Number : XXXXXXXXXXXXXX Board FRU ID : 1.0 Board Custom Data 1 : XXXXXXXXX Board Custom Data 2 : XXXXXXXXXXXXXXXXXX Product Manufacturer : XXXXXX Product Name : Yosemite V3.5 EVT2 Product Part Number : XXXXXXXXXXXXXX Product Version : EVT2 Product Serial : XXXXXXXXXXXXX Product Asset Tag : XXXXXXX Product FRU ID : 1.0 Product Custom Data 1 : XXXXXXXXX Product Custom Data 2 : Config A root@bmc-oob:~# fruid-util nic
FRU Information : NIC --------------- : ------------------ Board Mfg Date : Tue Nov 2 08:51:00 2021 Board Mfg : XXXXXXXX Board Product : Mellanox ConnectX-6 DX OCP3.0 Board Serial : XXXXXXXXXXXXXXXXXXXXXXXX Board Part Number : XXXXXXXXXXXXXXXXXXXXX Board FRU ID : FRU Ver 0.02 Product Manufacturer : XXXXXXXX Product Name : Mellanox ConnectX-6 DX OCP3.0 Product Part Number : XXXXXXXXXXXXXXXXXXXXX Product Version : A9 Product Serial : XXXXXXXXXXXXXXXXXXXXXXXX Product Custom Data 3 : ConnectX-6 DX
--- hw/arm/aspeed.c | 10 ++++-- hw/arm/aspeed_eeprom.c | 82 ++++++++++++++++++++++++++++++++++++++++++ hw/arm/aspeed_eeprom.h | 19 ++++++++++ hw/arm/meson.build | 1 + 4 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 hw/arm/aspeed_eeprom.c create mode 100644 hw/arm/aspeed_eeprom.h
hw/arm/aspeed.c +7 -3
@@ -14,6 +14,7 @@#include "hw/arm/boot.h" #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" +#include "hw/arm/aspeed_eeprom.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/misc/pca9552.h"
@@ -940,9 +941,12 @@ static void fby35_i2c_init(AspeedMachineState *bmc)at24c_eeprom_init (i2c[4 ],0x51 ,128 * KiB);at24c_eeprom_init (i2c[6 ],0x51 ,128 * KiB); -at24c_eeprom_init (i2c[8 ],0x50 ,32 * KiB); -at24c_eeprom_init (i2c[11 ],0x51 ,128 * KiB); -at24c_eeprom_init (i2c[11 ],0x54 ,128 * KiB); +at24c_eeprom_init_rom (i2c[8 ],0x50 ,32 * KiB, fby35_nic_fruid, + fby35_nic_fruid_len); +at24c_eeprom_init_rom (i2c[11 ],0x51 ,128 * KiB, fby35_bb_fruid, + fby35_bb_fruid_len); +at24c_eeprom_init_rom (i2c[11 ],0x54 ,128 * KiB, fby35_bmc_fruid, + fby35_bmc_fruid_len);/* * TODO: There is a multi-master i2c connection to an AST1030 MiniBMC on
hw/arm/aspeed_eeprom.c new file +82 -0
82 lines not on this page · raw message
hw/arm/aspeed_eeprom.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* Copyright (c) Meta Platforms, Inc. and affiliates. +* +* SPDX-License-Identifier: GPL-2.0-only +*/ + +#ifndef ASPEED_EEPROM_H +#define ASPEED_EEPROM_H + +#include "qemu/osdep.h" + +extern const uint8_t fby35_nic_fruid[]; +extern const uint8_t fby35_bb_fruid[]; +extern const uint8_t fby35_bmc_fruid[]; +extern const size_t fby35_nic_fruid_len; +extern const size_t fby35_bb_fruid_len; +extern const size_t fby35_bmc_fruid_len; + +#endif
hw/arm/meson.build +1 -0
@@ -53,6 +53,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', 'aspeed_ast2600.c', 'aspeed_ast10x0.c', + 'aspeed_eeprom.c', 'fby35.c')) arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c'))
Signature · 1 line
2.39.0
PATCH v5 1/5 hw/arm: Extract at24c_eeprom_init helper from Aspeed and Nuvoton boards
In reply to Peter DelevoryasThis helper is useful in board initialization because lets users initialize and realize an EEPROM on an I2C bus with a single function call.
--- hw/arm/aspeed.c | 10 +--------- hw/arm/npcm7xx_boards.c | 20 +++++--------------- hw/nvram/eeprom_at24c.c | 12 ++++++++++++ include/hw/nvram/eeprom_at24c.h | 23 +++++++++++++++++++++++ 4 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 include/hw/nvram/eeprom_at24c.h
hw/arm/aspeed.c +1 -9
@@ -17,6 +17,7 @@#include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/misc/pca9552.h" +#include "hw/nvram/eeprom_at24c.h" #include "hw/sensor/tmp105.h" #include "hw/misc/led.h" #include "hw/qdev-properties.h"
@@ -429,15 +430,6 @@ static void aspeed_machine_init(MachineState *machine)arm_load_kernel (ARM_CPU (first_cpu), machine, &aspeed_board_binfo); } -static void at24c_eeprom_init (I2CBus *bus,uint8_t addr,uint32_t rsize) -{ -I2CSlave *i2c_dev =i2c_slave_new ("at24c-eeprom" , addr); -DeviceState *dev =DEVICE (i2c_dev); - -qdev_prop_set_uint32 (dev,"rom-size" , rsize); -i2c_slave_realize_and_unref (i2c_dev, bus, &error_abort); -} -static void palmetto_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;
hw/arm/npcm7xx_boards.c +5 -15
@@ -21,6 +21,7 @@#include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/loader.h" +#include "hw/nvram/eeprom_at24c.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "qapi/error.h"
@@ -140,17 +141,6 @@ static I2CBus *npcm7xx_i2c_get_bus(NPCM7xxState *soc, uint32_t num)return I2C_BUS (qdev_get_child_bus (DEVICE (&soc->smbus[num]),"i2c-bus" )); } -static void at24c_eeprom_init (NPCM7xxState *soc,int bus,uint8_t addr, -uint32_t rsize) -{ -I2CBus *i2c_bus =npcm7xx_i2c_get_bus (soc, bus); -I2CSlave *i2c_dev =i2c_slave_new ("at24c-eeprom" , addr); -DeviceState *dev =DEVICE (i2c_dev); - -qdev_prop_set_uint32 (dev,"rom-size" , rsize); -i2c_slave_realize_and_unref (i2c_dev, i2c_bus, &error_abort); -} -static void npcm7xx_init_pwm_splitter (NPCM7xxMachine *machine,NPCM7xxState *soc,const int *fan_counts) {
@@ -253,8 +243,8 @@ static void quanta_gsj_i2c_init(NPCM7xxState *soc)i2c_slave_create_simple (npcm7xx_i2c_get_bus (soc,3 ),"tmp105" ,0x5c );i2c_slave_create_simple (npcm7xx_i2c_get_bus (soc,4 ),"tmp105" ,0x5c ); -at24c_eeprom_init (soc,9 ,0x55 ,8192 ); -at24c_eeprom_init (soc,10 ,0x55 ,8192 ); +at24c_eeprom_init (npcm7xx_i2c_get_bus (soc,9 ),0x55 ,8192 ); +at24c_eeprom_init (npcm7xx_i2c_get_bus (soc,10 ),0x55 ,8192 );/* * i2c-11:
@@ -360,7 +350,7 @@ static void kudo_bmc_i2c_init(NPCM7xxState *soc)i2c_slave_create_simple (npcm7xx_i2c_get_bus (soc,4 ),TYPE_PCA9548 ,0x77 ); -at24c_eeprom_init (soc,4 ,0x50 ,8192 );/* mbfru */ +at24c_eeprom_init (npcm7xx_i2c_get_bus (soc,4 ),0x50 ,8192 );/* mbfru */ i2c_mux =i2c_slave_create_simple (npcm7xx_i2c_get_bus (soc,13 ),TYPE_PCA9548 ,0x77 );
@@ -371,7 +361,7 @@ static void kudo_bmc_i2c_init(NPCM7xxState *soc)i2c_slave_create_simple (pca954x_i2c_get_bus (i2c_mux,4 ),"tmp105" ,0x48 );i2c_slave_create_simple (pca954x_i2c_get_bus (i2c_mux,5 ),"tmp105" ,0x49 ); -at24c_eeprom_init (soc,14 ,0x55 ,8192 );/* bmcfru */ +at24c_eeprom_init (npcm7xx_i2c_get_bus (soc,14 ),0x55 ,8192 );/* bmcfru */ /* TODO: Add remaining i2c devices. */ }
hw/nvram/eeprom_at24c.c +12 -0
@@ -12,6 +12,7 @@#include "qapi/error.h" #include "qemu/module.h" #include "hw/i2c/i2c.h" +#include "hw/nvram/eeprom_at24c.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sysemu/block-backend.h"
@@ -128,6 +129,17 @@ int at24c_eeprom_send(I2CSlave *s, uint8_t data)return 0 ; } +I2CSlave *at24c_eeprom_init (I2CBus *bus,uint8_t address,uint32_t rom_size) +{ +I2CSlave *i2c_dev =i2c_slave_new (TYPE_AT24C_EE , address); +DeviceState *dev =DEVICE (i2c_dev); + +qdev_prop_set_uint32 (dev,"rom-size" , rom_size); +i2c_slave_realize_and_unref (i2c_dev, bus, &error_abort); + +return i2c_dev; +} +static void at24c_eeprom_realize (DeviceState *dev,Error **errp) {EEPROMState *ee =AT24C_EE (dev);
include/hw/nvram/eeprom_at24c.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* Copyright (c) Meta Platforms, Inc. and affiliates. +* +* SPDX-License-Identifier: GPL-2.0-only +*/ + +#ifndef EEPROM_AT24C_H +#define EEPROM_AT24C_H + +#include "hw/i2c/i2c.h" + +/* +* Create and realize an AT24C EEPROM device on the heap. +* @bus: I2C bus to put it on +* @address: I2C address of the EEPROM slave when put on a bus +* @rom_size: size of the EEPROM +* +* Create the device state structure, initialize it, put it on the specified +* @bus, and drop the reference to it (the device is realized). +*/ +I2CSlave *at24c_eeprom_init (I2CBus *bus,uint8_t address,uint32_t rom_size); + +#endif
Signature · 1 line
2.39.0
v5 cover hw/nvram/eeprom_at24c: Cleanup + FRUID EEPROM init example
v1: https://lore.kernel.org/qemu-devel/[email protected]/
v2:
- Squashed 3 commits from original series into extract helper commit
- Dropped last 2 commits from original series
- Changed at24c_eeprom_init to return the I2CSlave object
- Added commit to introduce at24c-eeprom "init_rom" attribute
- Added aspeed_eeprom.c and fby35-bmc BMC FRUID EEPROM initialization
- Added commit to change reset behavior for at24c-eeprom (optional)
v3:
- Added doc comments to function headers
- Added fby35 NIC and baseboard EEPROM's (to illustrate 2+ EEPROM's)
- Replaced "extern uint32 fby35_bmc_fruid_size" by adding explicit array sizes, e.g. "extern uint8_t fby35_bmc_fruid[200]".
- Fixed Meta Platforms licenses by adding SPDX-License-Identifier for GPL2.
- Moved ee->init_rom initialization code before ee->blk, so that -drive property overrides init_rom initialization. This gives more flexibility (people can override contents of an AT24C EEPROM using a file for debugging/prototyping) while still allowing the init_rom data to be specified for a board for default behavior.
v4:
- Moved at24c_eeprom_init_rom doc comment to the patch introducing the
function (moved from patch 4/5 to patch 3/5).
- Added review tags from Joel
v5:
- Added review tags from Corey
- Added tested-by tag from Ninad
- Switched back to i2c_slave_new in eeprom_at24c.c
- Switched back to "extern const size_t fby35_*_len" in aspeed_eeprom.h
NOTE: I rebased on the latest master and tlb exec segfaults in "Starting kernel" for fby35-bmc: I'll make a bug report separately. I've kept the base on 7c9236d6d61f because of this.
Thanks,
Peter
Peter Delevoryas (5):
hw/arm: Extract at24c_eeprom_init helper from Aspeed and Nuvoton
boards
hw/arm/aspeed: Replace aspeed_eeprom_init with at24c_eeprom_init hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom
helper
hw/arm/aspeed: Add aspeed_eeprom.c hw/nvram/eeprom_at24c: Make reset behavior more like hardware
hw/arm/aspeed.c | 109 ++++++++++++++------------------ hw/arm/aspeed_eeprom.c | 82 ++++++++++++++++++++++++ hw/arm/aspeed_eeprom.h | 19 ++++++ hw/arm/meson.build | 1 + hw/arm/npcm7xx_boards.c | 20 ++---- hw/nvram/eeprom_at24c.c | 58 +++++++++++++---- include/hw/nvram/eeprom_at24c.h | 39 ++++++++++++ 7 files changed, 241 insertions(+), 87 deletions(-) create mode 100644 hw/arm/aspeed_eeprom.c create mode 100644 hw/arm/aspeed_eeprom.h create mode 100644 include/hw/nvram/eeprom_at24c.h
Signature · 1 line
2.39.0
PATCH v5 5/5 hw/nvram/eeprom_at24c: Make reset behavior more like hardware
EEPROM's are a form of non-volatile memory. After power-cycling an EEPROM, I would expect the I2C state machine to be reset to default values, but I wouldn't really expect the memory to change at all.
The current implementation of the at24c EEPROM resets its internal memory on reset. This matches the specification in docs/devel/reset.rst:
Cold reset is supported by every resettable object. In QEMU, it means we reset to the initial state corresponding to the start of QEMU; this might differ from what is a real hardware cold reset. It differs from other resets (like warm or bus resets) which may keep certain parts untouched.
But differs from my intuition. For example, if someone writes some information to an EEPROM, then AC power cycles their board, they would expect the EEPROM to retain that information. It's very useful to be able to test things like this in QEMU as well, to verify software instrumentation like determining the cause of a reboot.
--- hw/nvram/eeprom_at24c.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
hw/nvram/eeprom_at24c.c +10 -12
@@ -184,18 +184,6 @@ static void at24c_eeprom_realize(DeviceState *dev, Error **errp) } ee->mem =g_malloc0 (ee->rsize); - -} - -static -void at24c_eeprom_reset (DeviceState *state) -{ -EEPROMState *ee =AT24C_EE (state); - - ee->changed = false; - ee->cur =0 ; - ee->haveaddr =0 ; -memset (ee->mem,0 , ee->rsize);if (ee->init_rom) {
@@ -213,6 +201,16 @@ void at24c_eeprom_reset(DeviceState *state) } } +static +void at24c_eeprom_reset (DeviceState *state) +{ +EEPROMState *ee =AT24C_EE (state); + + ee->changed = false; + ee->cur =0 ; + ee->haveaddr =0 ; +} +static Property at24c_eeprom_props[] = {DEFINE_PROP_UINT32 ("rom-size" , EEPROMState, rsize,0 ),DEFINE_PROP_BOOL ("writable" , EEPROMState, writable, true),
Signature · 1 line
2.39.0
PATCH v5 3/5 hw/nvram/eeprom_at24c: Add init_rom field and at24c_eeprom_init_rom helper
In reply to Peter DelevoryasAllows users to specify binary data to initialize an EEPROM, allowing users to emulate data programmed at manufacturing time.
- Added init_rom and init_rom_size attributes to TYPE_AT24C_EE
- Added at24c_eeprom_init_rom helper function to initialize attributes
- If -drive property is provided, it overrides init_rom data
--- hw/nvram/eeprom_at24c.c | 36 ++++++++++++++++++++++++++++----- include/hw/nvram/eeprom_at24c.h | 16 +++++++++++++++ 2 files changed, 47 insertions(+), 5 deletions(-)
hw/nvram/eeprom_at24c.c +31 -5
@@ -50,6 +50,9 @@ struct EEPROMState {uint8_t *mem;BlockBackend *blk; + +const uint8_t *init_rom; +uint32_t init_rom_size; }; static
@@ -131,19 +134,37 @@ int at24c_eeprom_send(I2CSlave *s, uint8_t data)I2CSlave *at24c_eeprom_init (I2CBus *bus,uint8_t address,uint32_t rom_size) { -I2CSlave *i2c_dev =i2c_slave_new (TYPE_AT24C_EE , address); -DeviceState *dev =DEVICE (i2c_dev); +return at24c_eeprom_init_rom (bus, address, rom_size,NULL ,0 ); +} + +I2CSlave *at24c_eeprom_init_rom (I2CBus *bus,uint8_t address,uint32_t rom_size, +const uint8_t *init_rom,uint32_t init_rom_size) +{ +EEPROMState *s; + + s =AT24C_EE (i2c_slave_new (TYPE_AT24C_EE , address)); + +qdev_prop_set_uint32 (DEVICE (s),"rom-size" , rom_size); -qdev_prop_set_uint32 (dev,"rom-size" , rom_size); -i2c_slave_realize_and_unref (i2c_dev, bus, &error_abort); +/* TODO: Model init_rom with QOM properties. */ + s->init_rom = init_rom; + s->init_rom_size = init_rom_size; -return i2c_dev; +i2c_slave_realize_and_unref (I2C_SLAVE (s), bus, &error_abort); + +return I2C_SLAVE (s); }static void at24c_eeprom_realize (DeviceState *dev,Error **errp) {EEPROMState *ee =AT24C_EE (dev); +if (ee->init_rom_size > ee->rsize) { +error_setg (errp,"%s: init rom is larger than rom: %u > %u" , +TYPE_AT24C_EE , ee->init_rom_size, ee->rsize); +return ; + } +if (ee->blk) {int64_t len =blk_getlength (ee->blk);
@@ -163,6 +184,7 @@ static void at24c_eeprom_realize(DeviceState *dev, Error **errp) } ee->mem =g_malloc0 (ee->rsize); + } static
@@ -176,6 +198,10 @@ void at24c_eeprom_reset(DeviceState *state)memset (ee->mem,0 , ee->rsize); +if (ee->init_rom) { +memcpy (ee->mem, ee->init_rom,MIN (ee->init_rom_size, ee->rsize)); + } +if (ee->blk) {int ret =blk_pread (ee->blk,0 , ee->rsize, ee->mem,0 );
include/hw/nvram/eeprom_at24c.h +16 -0
@@ -20,4 +20,20 @@*/ I2CSlave *at24c_eeprom_init (I2CBus *bus,uint8_t address,uint32_t rom_size); + +/* +* Create and realize an AT24C EEPROM device on the heap with initial data. +* @bus: I2C bus to put it on +* @address: I2C address of the EEPROM slave when put on a bus +* @rom_size: size of the EEPROM +* @init_rom: Array of bytes to initialize EEPROM memory with +* @init_rom_size: Size of @init_rom, must be less than or equal to @rom_size +* +* Create the device state structure, initialize it, put it on the specified +* @bus, and drop the reference to it (the device is realized). Copies the data +* from @init_rom to the beginning of the EEPROM memory buffer. +*/ +I2CSlave *at24c_eeprom_init_rom (I2CBus *bus,uint8_t address,uint32_t rom_size, +const uint8_t *init_rom,uint32_t init_rom_size); +#endif
Signature · 1 line
2.39.0