| Message ID | 20230522153659.3379729-2-ninad@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add vpd data for Rainier machine | expand |
On 5/22/23 17:36, Ninad Palsule wrote: > The VPD data is added for system and BMC FRU. This data is fabricated. > > Tested: > - The system-vpd.service is active. > - VPD service related to bmc is active. > Signed-off-by: Ninad Palsule <ninad@linux.ibm.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > hw/arm/aspeed.c | 6 ++++-- > hw/arm/aspeed_eeprom.c | 45 +++++++++++++++++++++++++++++++++++++++++- > hw/arm/aspeed_eeprom.h | 5 +++++ > 3 files changed, 53 insertions(+), 3 deletions(-) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 0b29028fe1..bfc2070bd2 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -788,8 +788,10 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc) > 0x48); > i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), TYPE_TMP105, > 0x4a); > - 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); > + at24c_eeprom_init_rom(aspeed_i2c_get_bus(&soc->i2c, 8), 0x50, > + 64 * KiB, rainier_bb_fruid, rainier_bb_fruid_len); > + at24c_eeprom_init_rom(aspeed_i2c_get_bus(&soc->i2c, 8), 0x51, > + 64 * KiB, rainier_bmc_fruid, rainier_bmc_fruid_len); > create_pca9552(soc, 8, 0x60); > create_pca9552(soc, 8, 0x61); > /* Bus 8: ucd90320@11 */ > diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c > index dc33a88a54..ace5266cec 100644 > --- a/hw/arm/aspeed_eeprom.c > +++ b/hw/arm/aspeed_eeprom.c > @@ -119,9 +119,52 @@ const uint8_t yosemitev2_bmc_fruid[] = { > 0x6e, 0x66, 0x69, 0x67, 0x20, 0x41, 0xc1, 0x45, > }; > > +const uint8_t rainier_bb_fruid[] = { > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, > + 0x28, 0x00, 0x52, 0x54, 0x04, 0x56, 0x48, 0x44, 0x52, 0x56, 0x44, 0x02, > + 0x01, 0x00, 0x50, 0x54, 0x0e, 0x56, 0x54, 0x4f, 0x43, 0x00, 0x00, 0x37, > + 0x00, 0x4a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x08, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x00, 0x52, 0x54, > + 0x04, 0x56, 0x54, 0x4f, 0x43, 0x50, 0x54, 0x38, 0x56, 0x49, 0x4e, 0x49, > + 0x00, 0x00, 0x81, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x53, > + 0x59, 0x53, 0x00, 0x00, 0xbb, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x56, 0x43, 0x45, 0x4e, 0x00, 0x00, 0xe2, 0x00, 0x27, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x56, 0x53, 0x42, 0x50, 0x00, 0x00, 0x09, 0x01, 0x19, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x01, 0x00, 0x00, 0x00, 0x36, 0x00, > + 0x52, 0x54, 0x04, 0x56, 0x49, 0x4e, 0x49, 0x44, 0x52, 0x04, 0x44, 0x45, > + 0x53, 0x43, 0x48, 0x57, 0x02, 0x30, 0x31, 0x43, 0x43, 0x04, 0x33, 0x34, > + 0x35, 0x36, 0x46, 0x4e, 0x04, 0x46, 0x52, 0x34, 0x39, 0x53, 0x4e, 0x04, > + 0x53, 0x52, 0x31, 0x32, 0x50, 0x4e, 0x04, 0x50, 0x52, 0x39, 0x39, 0x50, > + 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x00, 0x52, 0x54, > + 0x04, 0x56, 0x53, 0x59, 0x53, 0x53, 0x45, 0x07, 0x49, 0x42, 0x4d, 0x53, > + 0x59, 0x53, 0x31, 0x54, 0x4d, 0x08, 0x32, 0x32, 0x32, 0x32, 0x2d, 0x32, > + 0x32, 0x32, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, > + 0x00, 0x52, 0x54, 0x04, 0x56, 0x43, 0x45, 0x4e, 0x53, 0x45, 0x07, 0x31, > + 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x46, 0x43, 0x08, 0x31, 0x31, 0x31, > + 0x31, 0x2d, 0x31, 0x31, 0x31, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x15, 0x00, 0x52, 0x54, 0x04, 0x56, 0x53, 0x42, 0x50, 0x49, > + 0x4d, 0x04, 0x50, 0x00, 0x10, 0x01, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, > + 0x00, 0x00, > +}; > + > +/* Rainier BMC FRU */ > +const uint8_t rainier_bmc_fruid[] = { > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, > + 0x28, 0x00, 0x52, 0x54, 0x04, 0x56, 0x48, 0x44, 0x52, 0x56, 0x44, 0x02, > + 0x01, 0x00, 0x50, 0x54, 0x0e, 0x56, 0x54, 0x4f, 0x43, 0x00, 0x00, 0x37, > + 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x08, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x52, 0x54, > + 0x04, 0x56, 0x54, 0x4f, 0x43, 0x50, 0x54, 0x0e, 0x56, 0x49, 0x4e, 0x49, > + 0x00, 0x00, 0x57, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, > + 0x01, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x52, 0x54, 0x04, 0x56, 0x49, 0x4e, > + 0x49, 0x44, 0x52, 0x04, 0x44, 0x45, 0x53, 0x43, 0x48, 0x57, 0x02, 0x30, > + 0x31, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, > +}; > + > 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); > 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); > diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h > index 86db6f0479..bbf9e54365 100644 > --- a/hw/arm/aspeed_eeprom.h > +++ b/hw/arm/aspeed_eeprom.h > @@ -22,4 +22,9 @@ extern const size_t fby35_bmc_fruid_len; > extern const uint8_t yosemitev2_bmc_fruid[]; > extern const size_t yosemitev2_bmc_fruid_len; > > +extern const uint8_t rainier_bb_fruid[]; > +extern const size_t rainier_bb_fruid_len; > +extern const uint8_t rainier_bmc_fruid[]; > +extern const size_t rainier_bmc_fruid_len; > + > #endif
Hi Ninad, On 22/5/23 17:36, Ninad Palsule wrote: > The VPD data is added for system and BMC FRU. This data is fabricated. Per https://www.qemu.org/docs/master/devel/submitting-a-patch.html#write-a-meaningful-commit-message: QEMU follows the usual standard for git commit messages: the first line (which becomes the email subject line) is “subsystem: single line summary of change”. In this patch the subsystem is "hw/arm", but you can also use "hw/arm/aspeed" or even "hw/arm/aspeed_eeprom" for subject prefix. > Tested: > - The system-vpd.service is active. > - VPD service related to bmc is active. ... more detailed description of the patch, another blank and your Signed-off-by: line. Missing a blank line :) > Signed-off-by: Ninad Palsule <ninad@linux.ibm.com> > --- > hw/arm/aspeed.c | 6 ++++-- > hw/arm/aspeed_eeprom.c | 45 +++++++++++++++++++++++++++++++++++++++++- > hw/arm/aspeed_eeprom.h | 5 +++++ > 3 files changed, 53 insertions(+), 3 deletions(-)
Hello Cedric, On 5/23/23 12:53 AM, Cédric Le Goater wrote: > On 5/22/23 17:36, Ninad Palsule wrote: >> The VPD data is added for system and BMC FRU. This data is fabricated. >> >> Tested: >> - The system-vpd.service is active. >> - VPD service related to bmc is active. >> Signed-off-by: Ninad Palsule <ninad@linux.ibm.com> > > Reviewed-by: Cédric Le Goater <clg@kaod.org> Thank you for the review! > > Thanks, > > C. > > >> --- >> hw/arm/aspeed.c | 6 ++++-- >> hw/arm/aspeed_eeprom.c | 45 +++++++++++++++++++++++++++++++++++++++++- >> hw/arm/aspeed_eeprom.h | 5 +++++ >> 3 files changed, 53 insertions(+), 3 deletions(-) >> >> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c >> index 0b29028fe1..bfc2070bd2 100644 >> --- a/hw/arm/aspeed.c >> +++ b/hw/arm/aspeed.c >> @@ -788,8 +788,10 @@ static void >> rainier_bmc_i2c_init(AspeedMachineState *bmc) >> 0x48); >> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), TYPE_TMP105, >> 0x4a); >> - 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); >> + at24c_eeprom_init_rom(aspeed_i2c_get_bus(&soc->i2c, 8), 0x50, >> + 64 * KiB, rainier_bb_fruid, >> rainier_bb_fruid_len); >> + at24c_eeprom_init_rom(aspeed_i2c_get_bus(&soc->i2c, 8), 0x51, >> + 64 * KiB, rainier_bmc_fruid, >> rainier_bmc_fruid_len); >> create_pca9552(soc, 8, 0x60); >> create_pca9552(soc, 8, 0x61); >> /* Bus 8: ucd90320@11 */ >> diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c >> index dc33a88a54..ace5266cec 100644 >> --- a/hw/arm/aspeed_eeprom.c >> +++ b/hw/arm/aspeed_eeprom.c >> @@ -119,9 +119,52 @@ const uint8_t yosemitev2_bmc_fruid[] = { >> 0x6e, 0x66, 0x69, 0x67, 0x20, 0x41, 0xc1, 0x45, >> }; >> +const uint8_t rainier_bb_fruid[] = { >> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, >> 0x00, 0x84, >> + 0x28, 0x00, 0x52, 0x54, 0x04, 0x56, 0x48, 0x44, 0x52, 0x56, >> 0x44, 0x02, >> + 0x01, 0x00, 0x50, 0x54, 0x0e, 0x56, 0x54, 0x4f, 0x43, 0x00, >> 0x00, 0x37, >> + 0x00, 0x4a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x08, >> 0x00, 0x00, >> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x00, >> 0x52, 0x54, >> + 0x04, 0x56, 0x54, 0x4f, 0x43, 0x50, 0x54, 0x38, 0x56, 0x49, >> 0x4e, 0x49, >> + 0x00, 0x00, 0x81, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, >> 0x56, 0x53, >> + 0x59, 0x53, 0x00, 0x00, 0xbb, 0x00, 0x27, 0x00, 0x00, 0x00, >> 0x00, 0x00, >> + 0x56, 0x43, 0x45, 0x4e, 0x00, 0x00, 0xe2, 0x00, 0x27, 0x00, >> 0x00, 0x00, >> + 0x00, 0x00, 0x56, 0x53, 0x42, 0x50, 0x00, 0x00, 0x09, 0x01, >> 0x19, 0x00, >> + 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x01, 0x00, 0x00, 0x00, >> 0x36, 0x00, >> + 0x52, 0x54, 0x04, 0x56, 0x49, 0x4e, 0x49, 0x44, 0x52, 0x04, >> 0x44, 0x45, >> + 0x53, 0x43, 0x48, 0x57, 0x02, 0x30, 0x31, 0x43, 0x43, 0x04, >> 0x33, 0x34, >> + 0x35, 0x36, 0x46, 0x4e, 0x04, 0x46, 0x52, 0x34, 0x39, 0x53, >> 0x4e, 0x04, >> + 0x53, 0x52, 0x31, 0x32, 0x50, 0x4e, 0x04, 0x50, 0x52, 0x39, >> 0x39, 0x50, >> + 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x00, >> 0x52, 0x54, >> + 0x04, 0x56, 0x53, 0x59, 0x53, 0x53, 0x45, 0x07, 0x49, 0x42, >> 0x4d, 0x53, >> + 0x59, 0x53, 0x31, 0x54, 0x4d, 0x08, 0x32, 0x32, 0x32, 0x32, >> 0x2d, 0x32, >> + 0x32, 0x32, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, >> 0x00, 0x23, >> + 0x00, 0x52, 0x54, 0x04, 0x56, 0x43, 0x45, 0x4e, 0x53, 0x45, >> 0x07, 0x31, >> + 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x46, 0x43, 0x08, 0x31, >> 0x31, 0x31, >> + 0x31, 0x2d, 0x31, 0x31, 0x31, 0x50, 0x46, 0x04, 0x00, 0x00, >> 0x00, 0x00, >> + 0x00, 0x00, 0x15, 0x00, 0x52, 0x54, 0x04, 0x56, 0x53, 0x42, >> 0x50, 0x49, >> + 0x4d, 0x04, 0x50, 0x00, 0x10, 0x01, 0x50, 0x46, 0x04, 0x00, >> 0x00, 0x00, >> + 0x00, 0x00, >> +}; >> + >> +/* Rainier BMC FRU */ >> +const uint8_t rainier_bmc_fruid[] = { >> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, >> 0x00, 0x84, >> + 0x28, 0x00, 0x52, 0x54, 0x04, 0x56, 0x48, 0x44, 0x52, 0x56, >> 0x44, 0x02, >> + 0x01, 0x00, 0x50, 0x54, 0x0e, 0x56, 0x54, 0x4f, 0x43, 0x00, >> 0x00, 0x37, >> + 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x08, >> 0x00, 0x00, >> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, >> 0x52, 0x54, >> + 0x04, 0x56, 0x54, 0x4f, 0x43, 0x50, 0x54, 0x0e, 0x56, 0x49, >> 0x4e, 0x49, >> + 0x00, 0x00, 0x57, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, >> 0x50, 0x46, >> + 0x01, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x52, 0x54, 0x04, 0x56, >> 0x49, 0x4e, >> + 0x49, 0x44, 0x52, 0x04, 0x44, 0x45, 0x53, 0x43, 0x48, 0x57, >> 0x02, 0x30, >> + 0x31, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, >> +}; >> + >> 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); >> 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); >> diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h >> index 86db6f0479..bbf9e54365 100644 >> --- a/hw/arm/aspeed_eeprom.h >> +++ b/hw/arm/aspeed_eeprom.h >> @@ -22,4 +22,9 @@ extern const size_t fby35_bmc_fruid_len; >> extern const uint8_t yosemitev2_bmc_fruid[]; >> extern const size_t yosemitev2_bmc_fruid_len; >> +extern const uint8_t rainier_bb_fruid[]; >> +extern const size_t rainier_bb_fruid_len; >> +extern const uint8_t rainier_bmc_fruid[]; >> +extern const size_t rainier_bmc_fruid_len; >> + >> #endif >
Hello Philippe, On 5/23/23 3:52 AM, Philippe Mathieu-Daudé wrote: > Hi Ninad, > > On 22/5/23 17:36, Ninad Palsule wrote: >> The VPD data is added for system and BMC FRU. This data is fabricated. > > Per > https://www.qemu.org/docs/master/devel/submitting-a-patch.html#write-a-meaningful-commit-message: > > QEMU follows the usual standard for git commit messages: the first > line (which becomes the email subject line) is “subsystem: single > line summary of change”. > > In this patch the subsystem is "hw/arm", but you can also use > "hw/arm/aspeed" or even "hw/arm/aspeed_eeprom" for subject prefix. > Added subsystem tag. >> Tested: >> - The system-vpd.service is active. >> - VPD service related to bmc is active. > > ... more detailed description of the patch, another blank and your > Signed-off-by: line. Added more details in the description. > > Missing a blank line :) Added blank line. Thank you for the review! > >> Signed-off-by: Ninad Palsule <ninad@linux.ibm.com> >> --- >> hw/arm/aspeed.c | 6 ++++-- >> hw/arm/aspeed_eeprom.c | 45 +++++++++++++++++++++++++++++++++++++++++- >> hw/arm/aspeed_eeprom.h | 5 +++++ >> 3 files changed, 53 insertions(+), 3 deletions(-)
On 5/23/23 23:48, Ninad Palsule wrote: > Hello Philippe, > > On 5/23/23 3:52 AM, Philippe Mathieu-Daudé wrote: >> Hi Ninad, >> >> On 22/5/23 17:36, Ninad Palsule wrote: >>> The VPD data is added for system and BMC FRU. This data is fabricated. >> >> Per https://www.qemu.org/docs/master/devel/submitting-a-patch.html#write-a-meaningful-commit-message: >> >> QEMU follows the usual standard for git commit messages: the first >> line (which becomes the email subject line) is “subsystem: single >> line summary of change”. >> >> In this patch the subsystem is "hw/arm", but you can also use >> "hw/arm/aspeed" or even "hw/arm/aspeed_eeprom" for subject prefix. >> > Added subsystem tag. >>> Tested: >>> - The system-vpd.service is active. >>> - VPD service related to bmc is active. >> >> ... more detailed description of the patch, another blank and your >> Signed-off-by: line. > Added more details in the description. This is not a fix, it's adding VPD support on the board. How is FW impacted ? Is there some output ? what are these new VPD services doing ? How is it helping the development team ? Reviewers like to know a bit more about changes and how useful they are. We are curious :) Thanks, C. >> >> Missing a blank line :) > > Added blank line. > > Thank you for the review! > >> >>> Signed-off-by: Ninad Palsule <ninad@linux.ibm.com> >>> --- >>> hw/arm/aspeed.c | 6 ++++-- >>> hw/arm/aspeed_eeprom.c | 45 +++++++++++++++++++++++++++++++++++++++++- >>> hw/arm/aspeed_eeprom.h | 5 +++++ >>> 3 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 0b29028fe1..bfc2070bd2 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -788,8 +788,10 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc) 0x48); i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), TYPE_TMP105, 0x4a); - 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); + at24c_eeprom_init_rom(aspeed_i2c_get_bus(&soc->i2c, 8), 0x50, + 64 * KiB, rainier_bb_fruid, rainier_bb_fruid_len); + at24c_eeprom_init_rom(aspeed_i2c_get_bus(&soc->i2c, 8), 0x51, + 64 * KiB, rainier_bmc_fruid, rainier_bmc_fruid_len); create_pca9552(soc, 8, 0x60); create_pca9552(soc, 8, 0x61); /* Bus 8: ucd90320@11 */ diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c index dc33a88a54..ace5266cec 100644 --- a/hw/arm/aspeed_eeprom.c +++ b/hw/arm/aspeed_eeprom.c @@ -119,9 +119,52 @@ const uint8_t yosemitev2_bmc_fruid[] = { 0x6e, 0x66, 0x69, 0x67, 0x20, 0x41, 0xc1, 0x45, }; +const uint8_t rainier_bb_fruid[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, + 0x28, 0x00, 0x52, 0x54, 0x04, 0x56, 0x48, 0x44, 0x52, 0x56, 0x44, 0x02, + 0x01, 0x00, 0x50, 0x54, 0x0e, 0x56, 0x54, 0x4f, 0x43, 0x00, 0x00, 0x37, + 0x00, 0x4a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x08, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x00, 0x52, 0x54, + 0x04, 0x56, 0x54, 0x4f, 0x43, 0x50, 0x54, 0x38, 0x56, 0x49, 0x4e, 0x49, + 0x00, 0x00, 0x81, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x53, + 0x59, 0x53, 0x00, 0x00, 0xbb, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x56, 0x43, 0x45, 0x4e, 0x00, 0x00, 0xe2, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x56, 0x53, 0x42, 0x50, 0x00, 0x00, 0x09, 0x01, 0x19, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x01, 0x00, 0x00, 0x00, 0x36, 0x00, + 0x52, 0x54, 0x04, 0x56, 0x49, 0x4e, 0x49, 0x44, 0x52, 0x04, 0x44, 0x45, + 0x53, 0x43, 0x48, 0x57, 0x02, 0x30, 0x31, 0x43, 0x43, 0x04, 0x33, 0x34, + 0x35, 0x36, 0x46, 0x4e, 0x04, 0x46, 0x52, 0x34, 0x39, 0x53, 0x4e, 0x04, + 0x53, 0x52, 0x31, 0x32, 0x50, 0x4e, 0x04, 0x50, 0x52, 0x39, 0x39, 0x50, + 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x00, 0x52, 0x54, + 0x04, 0x56, 0x53, 0x59, 0x53, 0x53, 0x45, 0x07, 0x49, 0x42, 0x4d, 0x53, + 0x59, 0x53, 0x31, 0x54, 0x4d, 0x08, 0x32, 0x32, 0x32, 0x32, 0x2d, 0x32, + 0x32, 0x32, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, + 0x00, 0x52, 0x54, 0x04, 0x56, 0x43, 0x45, 0x4e, 0x53, 0x45, 0x07, 0x31, + 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x46, 0x43, 0x08, 0x31, 0x31, 0x31, + 0x31, 0x2d, 0x31, 0x31, 0x31, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x15, 0x00, 0x52, 0x54, 0x04, 0x56, 0x53, 0x42, 0x50, 0x49, + 0x4d, 0x04, 0x50, 0x00, 0x10, 0x01, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, +}; + +/* Rainier BMC FRU */ +const uint8_t rainier_bmc_fruid[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, + 0x28, 0x00, 0x52, 0x54, 0x04, 0x56, 0x48, 0x44, 0x52, 0x56, 0x44, 0x02, + 0x01, 0x00, 0x50, 0x54, 0x0e, 0x56, 0x54, 0x4f, 0x43, 0x00, 0x00, 0x37, + 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, 0x08, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x52, 0x54, + 0x04, 0x56, 0x54, 0x4f, 0x43, 0x50, 0x54, 0x0e, 0x56, 0x49, 0x4e, 0x49, + 0x00, 0x00, 0x57, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x46, + 0x01, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x52, 0x54, 0x04, 0x56, 0x49, 0x4e, + 0x49, 0x44, 0x52, 0x04, 0x44, 0x45, 0x53, 0x43, 0x48, 0x57, 0x02, 0x30, + 0x31, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + 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); 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); diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h index 86db6f0479..bbf9e54365 100644 --- a/hw/arm/aspeed_eeprom.h +++ b/hw/arm/aspeed_eeprom.h @@ -22,4 +22,9 @@ extern const size_t fby35_bmc_fruid_len; extern const uint8_t yosemitev2_bmc_fruid[]; extern const size_t yosemitev2_bmc_fruid_len; +extern const uint8_t rainier_bb_fruid[]; +extern const size_t rainier_bb_fruid_len; +extern const uint8_t rainier_bmc_fruid[]; +extern const size_t rainier_bmc_fruid_len; + #endif
The VPD data is added for system and BMC FRU. This data is fabricated. Tested: - The system-vpd.service is active. - VPD service related to bmc is active. Signed-off-by: Ninad Palsule <ninad@linux.ibm.com> --- hw/arm/aspeed.c | 6 ++++-- hw/arm/aspeed_eeprom.c | 45 +++++++++++++++++++++++++++++++++++++++++- hw/arm/aspeed_eeprom.h | 5 +++++ 3 files changed, 53 insertions(+), 3 deletions(-)