QEMU and CI
Hello,
I'm looking into what it might take to get the Intel S2600WF (Wolf Pass) board running in QEMU and possibly CI.
In the OpenBMC docs, it points to a QEMU fork here: https://github.com/openbmc/qemu. Is this the right place for me to start looking at what is currently implemented for QEMU in OpenBMC?
Thanks!
-Jason
Hi Jason,
Quoted 8 lines · Jason M
Hello,
I'm looking into what it might take to get the Intel S2600WF (Wolf Pass) board running in QEMU and possibly CI.
In the OpenBMC docs, it points to a QEMU fork here:
https://github.com/openbmc/qemu. Is this the right place for me to start looking at what is currently implemented for QEMU in OpenBMC?
Yes, with the note that most of the support is already upstream. openbmc/qemu contains the patches that haven't quite yet made it. If you're planning to add S2600WF support to QEMU I suggest you send your patches upstream first (like we do for the kernel), and we can backport them to our fork once they're accepted.
It's mainly Cédric, Joel and myself hacking on it - if you have WIP patches that you want to run past people before sending upstream then Cc us and the OpenBMC list for some quick feedback.
Hope that helps!
Andrew
Quoted 4 lines
Thanks!
-Jason
Joel Stanley
maintainerQuoted 8 lines · Andrew Jeffery
Hi Jason,
Quoted 4 lines · Jason M
Hello,
I'm looking into what it might take to get the Intel S2600WF (Wolf Pass) board running in QEMU and possibly CI.
You can boot your wolf pass image in the current qemu. To demonstrate I grabbed a tiogapass flash image from CI and booted it:
$ arm-softmmu/qemu-system-arm -M ast2500-evb -drive file=flash-tiogapass,format=raw,if=mtd -serial mon:stdio -nographic ... root@tiogapass:~# cat /etc/os-release ID="openbmc-phosphor" NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" VERSION="2.7.0-dev" VERSION_ID="2.7.0-dev-347-gd631110d4" PRETTY_NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro) 2.7.0-dev" BUILD_ID="2.7.0-dev" OPENBMC_TARGET_MACHINE="tiogapass"
As Andrew said, your next step would be to add a wolfpass machine type to upstream qemu. Take a look at the aspeed_boards array in hw/arm/aspeed.c.
From there the next step is to add the peripherals that your machine has. This will involve writing models for the i2c devices you have attached, and perhaps emulators for host connected devices (PECI?). This could be more involved so please use the list to discuss your plans.
There are also a large number of peripherals inside the ASPEED SoC that lack models. Let us know on the list if you think you will start working on one so we don't duplicate efforts.
Submit your patches against the upstream qemu tree. Andrew, Cedric and I are the upstream maintainers so we will be on cc there.
Cheers,
Joel
Quoted 23 lines
Quoted 4 lines
In the OpenBMC docs, it points to a QEMU fork here:
https://github.com/openbmc/qemu. Is this the right place for me to start looking at what is currently implemented for QEMU in OpenBMC?Yes, with the note that most of the support is already upstream. openbmc/qemu contains the patches that haven't quite yet made it. If you're planning to add S2600WF support to QEMU I suggest you send your patches upstream first (like we do for the kernel), and we can backport them to our fork once they're accepted.
It's mainly Cédric, Joel and myself hacking on it - if you have WIP patches that you want to run past people before sending upstream then Cc us and the OpenBMC list for some quick feedback.
Hope that helps!
Andrew
Quoted 4 lines
Thanks!
-Jason
Quoted 26 lines · Joel Stanley
Quoted 8 lines · Andrew Jeffery
Hi Jason,
Quoted 4 lines · Jason M
Hello,
I'm looking into what it might take to get the Intel S2600WF (Wolf Pass) board running in QEMU and possibly CI.
You can boot your wolf pass image in the current qemu. To demonstrate I grabbed a tiogapass flash image from CI and booted it:
$ arm-softmmu/qemu-system-arm -M ast2500-evb -drive file=flash-tiogapass,format=raw,if=mtd -serial mon:stdio -nographic ... root@tiogapass:~# cat /etc/os-release ID="openbmc-phosphor" NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" VERSION="2.7.0-dev" VERSION_ID="2.7.0-dev-347-gd631110d4" PRETTY_NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro) 2.7.0-dev" BUILD_ID="2.7.0-dev" OPENBMC_TARGET_MACHINE="tiogapass"
Quoted 3 lines
As Andrew said, your next step would be to add a wolfpass machine type to upstream qemu. Take a look at the
aspeed_boardsarray inhw/arm/aspeed.c.
Yes. it should be relatively easy to add the machine.
Quoted 5 lines
From there the next step is to add the peripherals that your machine has. This will involve writing models for the i2c devices you have attached, and perhaps emulators for host connected devices (PECI?). This could be more involved so please use the list to discuss your plans.
Yes please. It would be nice to have better support for I2C devices and work on a simple interface (QMP based) to interact with them, so that we can exercise the monitoring done by OpenBMC. PSU devices are a good topic for that.
Quoted 6 lines
There are also a large number of peripherals inside the ASPEED SoC that lack models. Let us know on the list if you think you will start working on one so we don't duplicate efforts.
Submit your patches against the upstream qemu tree. Andrew, Cedric and I are the upstream maintainers so we will be on cc there.
We are keeping the models in development under in this tree :
https://github.com/openbmc/qemu
Some have been there a bit too long because we lacked time to make them ready but please prefer mainline. We rebase quite often anyhow. I should push today a new version on 4.0-rc3.
Check out this page before sending :
https://wiki.qemu.org/Contribute/SubmitAPatch
Thanks,
C.
Quoted 18 lines
Quoted 18 lines
You can boot your wolf pass image in the current qemu. To demonstrate I grabbed a tiogapass flash image from CI and booted it:
$ arm-softmmu/qemu-system-arm -M ast2500-evb -drive file=flash-tiogapass,format=raw,if=mtd -serial mon:stdio -nographic ... root@tiogapass:~# cat /etc/os-release ID="openbmc-phosphor" NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" VERSION="2.7.0-dev" VERSION_ID="2.7.0-dev-347-gd631110d4" PRETTY_NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro) 2.7.0-dev" BUILD_ID="2.7.0-dev" OPENBMC_TARGET_MACHINE="tiogapass"
Quoted 5 lines
Quoted 3 lines
As Andrew said, your next step would be to add a wolfpass machine type to upstream qemu. Take a look at the
aspeed_boardsarray inhw/arm/aspeed.c.Yes. it should be relatively easy to add the machine.
Thanks! I was able to get an initial s2600wf machine booted from one of my own builds.
One issue I have on my machine, that I don't see with witherspoon-bmc, is something in U-Boot that is preventing it from booting automatically.
When I start my image, it stops at the U-Boot prompt below where I can
just run 'boot' and it will boot normally. Is this something you have seen before?
qemu-system-arm: Aspeed iBT has no chardev backend
U-Boot 2016.07 (Apr 04 2019 - 23:46:17 +0000)
SOC : AST2500-A1
RST : 0x01
PLL : 24 MHz
CPU : 792 MHz
MEM : 2.240 MHz, EEC: Disable, Cache: Disable
VGA : 16 MiB
DRAM : init by SOC
Watchdog enabled
DRAM: 240 MiB
kcs_init Channel: 3
Flash: 64 MiB
In: serial
Out: serial
Err: serial
Net: MAC0 : RMII/NCSI
MAC1 : RGMIIFTGMAC100#0
Error: FTGMAC100#0 address not set.
, FTGMAC100#1
Error: FTGMAC100#1 address not set.
ast#
Quoted 11 lines
Quoted 6 lines
From there the next step is to add the peripherals that your machine
has. This will involve writing models for the i2c devices you have attached, and perhaps emulators for host connected devices (PECI?). This could be more involved so please use the list to discuss your plans.Yes please. It would be nice to have better support for I2C devices and work on a simple interface (QMP based) to interact with them, so that we can exercise the monitoring done by OpenBMC. PSU devices are a good topic for that.
I added some i2c temp sensor devices from the existing models. They were
detected and loaded properly by entity-manager, but the readings were all zeroes. This is all new for me, so I assume I'm missing something. I still need to go through the existing QEMU tests on OpenBMC and see what is done there.
Quoted 12 lines
Quoted 7 lines
There are also a large number of peripherals inside the ASPEED SoC that lack models. Let us know on the list if you think you will start working on one so we don't duplicate efforts.
Submit your patches against the upstream qemu tree. Andrew, Cedric and I are the upstream maintainers so we will be on cc there.
We are keeping the models in development under in this tree :
Quoted 8 lines
Some have been there a bit too long because we lacked time to make them ready but please prefer mainline. We rebase quite often anyhow. I should push today a new version on 4.0-rc3.
Check out this page before sending :
Thanks for the help! Here is what I have for my s2600wf machine so far:
Subject: [PATCH] Add an s2600wf machine type
Include the HW strap setting and some I2C temperature sensors.
--- hw/arm/aspeed.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
hw/arm/aspeed.c +15 -0
@@ -60,6 +60,21 @@ struct AspeedBoardState { SCU_HW_STRAP_MAC0_RGMII) & \ ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* S2600WF hardware value: 0xF3CCC286 */ +#define S2600WF_BMC_HW_STRAP1 (( \ + AST2500_HW_STRAP1_DEFAULTS | \ + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \ + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \ + SCU_AST2500_HW_STRAP_UART_DEBUG | \ + SCU_AST2500_HW_STRAP_ESPI_ENABLE | \ + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \ + SCU_HW_STRAP_GPIOE_PT_EN | \ + SCU_AST2400_HW_STRAP_ACPI_DIS | \ + SCU_HW_STRAP_CLK_48M_IN | \ + SCU_HW_STRAP_VGA_CLASS_CODE | \ + SCU_HW_STRAP_MAC1_RGMII) & \ + ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* Romulus hardware value: 0xF10AD206 */ #define ROMULUS_BMC_HW_STRAP1 ( \ AST2500_HW_STRAP1_DEFAULTS | \
@@ -281,6 +296,18 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc) i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11),
"ds1338", 0x32);
}
+static void s2600wf_bmc_i2c_init(AspeedBoardState *bmc) +{
+ AspeedSoCState *soc = &bmc->soc;
+
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp421", 0x4d);
+ /* The s2600wf expects a TMP75 but a TMP105 is compatible */
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x48);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x49);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x4a);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x4b);
+}
+
static void romulus_bmc_i2c_init(AspeedBoardState *bmc)
{
AspeedSoCState *soc = &bmc->soc;
@@ -390,6 +417,15 @@ static const AspeedBoardConfig aspeed_boards[] = {
.spi_model = "mx25l25635e",
.num_cs = 1,
.i2c_init = ast2500_evb_i2c_init,
+ }, {
+ .name = MACHINE_TYPE_NAME("s2600wf-bmc"),
+ .desc = "Intel S2600WF BMC (ARM1176)",
+ .soc_name = "ast2500-a1",
+ .hw_strap1 = S2600WF_BMC_HW_STRAP1,
+ .fmc_model = "n25q512a",
+ .spi_model = "n25q512a",
+ .num_cs = 1,
+ .i2c_init = s2600wf_bmc_i2c_init, }, {
.name = MACHINE_TYPE_NAME("romulus-bmc"),
.desc = "OpenPOWER Romulus BMC (ARM1176)",
--
2.17.1
-Jason
Quoted 23 lines · Jason M
Quoted 18 lines
Quoted 18 lines
You can boot your wolf pass image in the current qemu. To demonstrate I grabbed a tiogapass flash image from CI and booted it:
$ arm-softmmu/qemu-system-arm -M ast2500-evb -drive file=flash-tiogapass,format=raw,if=mtd -serial mon:stdio -nographic ... root@tiogapass:~# cat /etc/os-release ID="openbmc-phosphor" NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" VERSION="2.7.0-dev" VERSION_ID="2.7.0-dev-347-gd631110d4" PRETTY_NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro) 2.7.0-dev" BUILD_ID="2.7.0-dev" OPENBMC_TARGET_MACHINE="tiogapass"Quoted 5 lines
Quoted 3 lines
As Andrew said, your next step would be to add a wolfpass machine type to upstream qemu. Take a look at the
aspeed_boardsarray inhw/arm/aspeed.c.Yes. it should be relatively easy to add the machine.
Quoted 8 lines
Thanks! I was able to get an initial s2600wf machine booted from one of my own builds.
One issue I have on my machine, that I don't see with witherspoon-bmc, is something in U-Boot that is preventing it from booting automatically.
When I start my image, it stops at the U-Boot prompt below where I can
just run 'boot' and it will boot normally. Is this something you have seen before?
How are you testing witherspoon-bmc? Using a Witherspoon OpenBMC image?
My gut feeling is it's some kind of u-boot configuration issue. I don't see the output Hit any key to stop autoboot: 0 in the log below, which might hint that your u-boot has auto-boot disabled (or something like that).
Have you tried running your u-boot on hardware to see if it has the same behaviour (eliminating qemu as the cause)?
Quoted 41 lines
qemu-system-arm: Aspeed iBT has no chardev backend
U-Boot 2016.07 (Apr 04 2019 - 23:46:17 +0000)
SOC : AST2500-A1 RST : 0x01 PLL : 24 MHz CPU : 792 MHz MEM : 2.240 MHz, EEC: Disable, Cache: Disable VGA : 16 MiB DRAM : init by SOC Watchdog enabled DRAM: 240 MiB kcs_init Channel: 3 Flash: 64 MiB In: serial Out: serial Err: serial Net: MAC0 : RMII/NCSI MAC1 : RGMIIFTGMAC100#0
Error: FTGMAC100#0 address not set.
, FTGMAC100#1
Error: FTGMAC100#1 address not set.ast#
Quoted 11 lines
Quoted 6 lines
From there the next step is to add the peripherals that your machine
has. This will involve writing models for the i2c devices you have attached, and perhaps emulators for host connected devices (PECI?). This could be more involved so please use the list to discuss your plans.Yes please. It would be nice to have better support for I2C devices and work on a simple interface (QMP based) to interact with them, so that we can exercise the monitoring done by OpenBMC. PSU devices are a good topic for that.
Quoted 5 lines
I added some i2c temp sensor devices from the existing models. They were detected and loaded properly by entity-manager, but the readings were all zeroes. This is all new for me, so I assume I'm missing something. I still need to go through the existing QEMU tests on OpenBMC and see what is done there.
If the kernel exposes the devices then you've probably got them hooked up correctly. Have you looked at the models to see what data they should be producing? How were you observing the values? Probably best to poke directly with e.g. i2cget (either unbind the drivers, or just use -f).
Quoted 89 lines
Quoted 13 lines
Quoted 8 lines
There are also a large number of peripherals inside the ASPEED SoC that lack models. Let us know on the list if you think you will start working on one so we don't duplicate efforts.
Submit your patches against the upstream qemu tree. Andrew, Cedric and I are the upstream maintainers so we will be on cc there.
We are keeping the models in development under in this tree :
Quoted 8 lines
Some have been there a bit too long because we lacked time to make them ready but please prefer mainline. We rebase quite often anyhow. I should push today a new version on 4.0-rc3.
Check out this page before sending :
Thanks for the help! Here is what I have for my s2600wf machine so far:
Subject: [PATCH] Add an s2600wf machine typeInclude the HW strap setting and some I2C temperature sensors.
Signed-off-by Jason M. Bills <[email protected]>--- hw/arm/aspeed.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)hw/arm/aspeed.c +23
-0@@ -60,6 +60,21 @@ struct AspeedBoardState { SCU_HW_STRAP_MAC0_RGMII) & \ ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* S2600WF hardware value: 0xF3CCC286 */ +#define S2600WF_BMC_HW_STRAP1 (( \ + AST2500_HW_STRAP1_DEFAULTS | \ + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \ + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \ + SCU_AST2500_HW_STRAP_UART_DEBUG | \ + SCU_AST2500_HW_STRAP_ESPI_ENABLE | \ + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \ + SCU_HW_STRAP_GPIOE_PT_EN | \ + SCU_AST2400_HW_STRAP_ACPI_DIS | \ + SCU_HW_STRAP_CLK_48M_IN | \ + SCU_HW_STRAP_VGA_CLASS_CODE | \ + SCU_HW_STRAP_MAC1_RGMII) & \ + ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* Romulus hardware value: 0xF10AD206 */ #define ROMULUS_BMC_HW_STRAP1 ( \ AST2500_HW_STRAP1_DEFAULTS | \@@ -281,6 +296,18 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"ds1338" ,0x32 ); } +static void s2600wf_bmc_i2c_init (AspeedBoardState *bmc) +{ +AspeedSoCState *soc = &bmc->soc; + +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),6 ),"tmp421" ,0x4d ); +/* The s2600wf expects a TMP75 but a TMP105 is compatible */ +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),6 ),"tmp105" ,0x48 ); + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),"tmp105",
0x49);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),
"tmp105",0x4a);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),
"tmp105",0x4b);hw/arm/aspeed.c +4
-0+} +static void romulus_bmc_i2c_init (AspeedBoardState *bmc) {AspeedSoCState *soc = &bmc->soc;@@ -390,6 +417,15 @@ static const AspeedBoardConfig aspeed_boards[] = { .spi_model = "mx25l25635e", .num_cs = 1, .i2c_init = ast2500_evb_i2c_init, + }, { + .name = MACHINE_TYPE_NAME("s2600wf-bmc"),
hw/arm/aspeed.c static const AspeedBoardConfig aspeed_boards[] = { · line 431
Quoted 10 lines
hw/arm/aspeed.c +7
-0+ .desc = "Intel S2600WF BMC (ARM1176)", + .soc_name = "ast2500-a1", + .hw_strap1 = S2600WF_BMC_HW_STRAP1, + .fmc_model = "n25q512a", + .spi_model = "n25q512a", + .num_cs = 1, + .i2c_init = s2600wf_bmc_i2c_init, }, { .name = MACHINE_TYPE_NAME("romulus-bmc"), .desc = "OpenPOWER Romulus BMC (ARM1176)",
Nice!
Andrew
Quoted 5 lines
--
2.17.1-Jason
Quoted 38 lines · Andrew Jeffery
Quoted 23 lines · Jason M
Quoted 18 lines
Quoted 18 lines
You can boot your wolf pass image in the current qemu. To demonstrate I grabbed a tiogapass flash image from CI and booted it:
$ arm-softmmu/qemu-system-arm -M ast2500-evb -drive file=flash-tiogapass,format=raw,if=mtd -serial mon:stdio -nographic ... root@tiogapass:~# cat /etc/os-release ID="openbmc-phosphor" NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" VERSION="2.7.0-dev" VERSION_ID="2.7.0-dev-347-gd631110d4" PRETTY_NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro) 2.7.0-dev" BUILD_ID="2.7.0-dev" OPENBMC_TARGET_MACHINE="tiogapass"Quoted 5 lines
Quoted 3 lines
As Andrew said, your next step would be to add a wolfpass machine type to upstream qemu. Take a look at the
aspeed_boardsarray inhw/arm/aspeed.c.Yes. it should be relatively easy to add the machine.
Quoted 8 lines
Thanks! I was able to get an initial s2600wf machine booted from one of my own builds.
One issue I have on my machine, that I don't see with witherspoon-bmc, is something in U-Boot that is preventing it from booting automatically.
When I start my image, it stops at the U-Boot prompt below where I can
just run 'boot' and it will boot normally. Is this something you have seen before?How are you testing witherspoon-bmc? Using a Witherspoon OpenBMC image?
Quoted 6 lines
My gut feeling is it's some kind of u-boot configuration issue. I don't see the output
Hit any key to stop autoboot: 0in the log below, which might hint that your u-boot has auto-boot disabled (or something like that).Have you tried running your u-boot on hardware to see if it has the same behaviour (eliminating qemu as the cause)?
what is the u-boot environment like ?
Quoted 48 lines
Quoted 42 lines
qemu-system-arm: Aspeed iBT has no chardev backend
U-Boot 2016.07 (Apr 04 2019 - 23:46:17 +0000)
SOC : AST2500-A1 RST : 0x01 PLL : 24 MHz CPU : 792 MHz MEM : 2.240 MHz, EEC: Disable, Cache: Disable VGA : 16 MiB DRAM : init by SOC Watchdog enabled DRAM: 240 MiB kcs_init Channel: 3 Flash: 64 MiB In: serial Out: serial Err: serial Net: MAC0 : RMII/NCSI MAC1 : RGMIIFTGMAC100#0
Error: FTGMAC100#0 address not set.
, FTGMAC100#1
Error: FTGMAC100#1 address not set.ast#
Quoted 11 lines
Quoted 6 lines
From there the next step is to add the peripherals that your machine
has. This will involve writing models for the i2c devices you have attached, and perhaps emulators for host connected devices (PECI?). This could be more involved so please use the list to discuss your plans.Yes please. It would be nice to have better support for I2C devices and work on a simple interface (QMP based) to interact with them, so that we can exercise the monitoring done by OpenBMC. PSU devices are a good topic for that.
Quoted 5 lines
I added some i2c temp sensor devices from the existing models. They were detected and loaded properly by entity-manager, but the readings were all zeroes. This is all new for me, so I assume I'm missing something. I still need to go through the existing QEMU tests on OpenBMC and see what is done there.
Quoted 4 lines
If the kernel exposes the devices then you've probably got them hooked up correctly. Have you looked at the models to see what data they should be producing? How were you observing the values? Probably best to poke directly with e.g. i2cget (either unbind the drivers, or just use
-f).
yes. take a look at the tmp421. tmp105 should be the same.
The palmetto machine sets the temperature values at init time :
object_property_set_int(OBJECT(dev), 31000, "temperature0", &error_abort);
object_property_set_int(OBJECT(dev), 28000, "temperature1", &error_abort);
object_property_set_int(OBJECT(dev), 20000, "temperature2", &error_abort);
object_property_set_int(OBJECT(dev), 110000, "temperature3", &error_abort);which can be seen at run time :
root@palmetto:~# cat /sys/class/hwmon/hwmon0/temp*input 30938 27938 19938 109938
if you run from the monitor :
(qemu) qom-set /machine/unattached/device[5]/ temperature0 10000 (qemu) qom-set /machine/unattached/device[5]/ temperature1 20000 (qemu) qom-set /machine/unattached/device[5]/ temperature2 30000 (qemu) qom-set /machine/unattached/device[5]/ temperature3 40000
you will see the changes in the guest :
root@palmetto:~# cat /sys/class/hwmon/hwmon0/temp*input 9938 19938 29938 39938
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 8 lines
There are also a large number of peripherals inside the ASPEED SoC that lack models. Let us know on the list if you think you will start working on one so we don't duplicate efforts.
Submit your patches against the upstream qemu tree. Andrew, Cedric and I are the upstream maintainers so we will be on cc there.
We are keeping the models in development under in this tree :
https://github.com/openbmc/qemu
Some have been there a bit too long because we lacked time to make them ready but please prefer mainline. We rebase quite often anyhow. I should push today a new version on 4.0-rc3.
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Check out this page before sending :
Thanks for the help! Here is what I have for my s2600wf machine so far:
Subject: [PATCH] Add an s2600wf machine type
add a "hw/arm/aspeed: " prefix to the subject.
Quoted 69 lines
Quoted 69 lines
Include the HW strap setting and some I2C temperature sensors.
Signed-off-by Jason M. Bills <[email protected]>--- hw/arm/aspeed.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)hw/arm/aspeed.c +23
-0@@ -60,6 +60,21 @@ struct AspeedBoardState { SCU_HW_STRAP_MAC0_RGMII) & \ ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* S2600WF hardware value: 0xF3CCC286 */ +#define S2600WF_BMC_HW_STRAP1 (( \ + AST2500_HW_STRAP1_DEFAULTS | \ + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \ + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \ + SCU_AST2500_HW_STRAP_UART_DEBUG | \ + SCU_AST2500_HW_STRAP_ESPI_ENABLE | \ + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \ + SCU_HW_STRAP_GPIOE_PT_EN | \ + SCU_AST2400_HW_STRAP_ACPI_DIS | \ + SCU_HW_STRAP_CLK_48M_IN | \ + SCU_HW_STRAP_VGA_CLASS_CODE | \ + SCU_HW_STRAP_MAC1_RGMII) & \ + ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* Romulus hardware value: 0xF10AD206 */ #define ROMULUS_BMC_HW_STRAP1 ( \ AST2500_HW_STRAP1_DEFAULTS | \@@ -281,6 +296,18 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"ds1338" ,0x32 ); } +static void s2600wf_bmc_i2c_init (AspeedBoardState *bmc) +{ +AspeedSoCState *soc = &bmc->soc; + +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),6 ),"tmp421" ,0x4d ); +/* The s2600wf expects a TMP75 but a TMP105 is compatible */ +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),6 ),"tmp105" ,0x48 ); + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),"tmp105",
0x49);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),
"tmp105",0x4a);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),
"tmp105",0x4b);hw/arm/aspeed.c +8
-0+} +static void romulus_bmc_i2c_init (AspeedBoardState *bmc) {AspeedSoCState *soc = &bmc->soc;@@ -390,6 +417,15 @@ static const AspeedBoardConfig aspeed_boards[] = { .spi_model = "mx25l25635e", .num_cs = 1, .i2c_init = ast2500_evb_i2c_init, + }, { + .name = MACHINE_TYPE_NAME("s2600wf-bmc"), + .desc = "Intel S2600WF BMC (ARM1176)", + .soc_name = "ast2500-a1", + .hw_strap1 = S2600WF_BMC_HW_STRAP1, + .fmc_model = "n25q512a",
Quoted 8 lines
hw/arm/aspeed.c static const AspeedBoardConfig aspeed_boards[] = { · line 431
Quoted 6 lines
hw/arm/aspeed.c +3
-0+ .spi_model = "n25q512a", + .num_cs = 1, + .i2c_init = s2600wf_bmc_i2c_init, }, { .name = MACHINE_TYPE_NAME("romulus-bmc"), .desc = "OpenPOWER Romulus BMC (ARM1176)",Nice!
Yes. Please send to mainline.
Thanks,
C.
Quoted 8 lines
Quoted 8 lines
Quoted 5 lines
One issue I have on my machine, that I don't see with witherspoon-bmc, is something in U-Boot that is preventing it from booting automatically.
When I start my image, it stops at the U-Boot prompt below where I can
just run 'boot' and it will boot normally. Is this something you have seen before?How are you testing witherspoon-bmc? Using a Witherspoon OpenBMC image?
Yes, I built a Witherspoon OpenBMC image to test the QEMU machine.
Quoted 7 lines
Quoted 7 lines
My gut feeling is it's some kind of u-boot configuration issue. I don't see the output
Hit any key to stop autoboot: 0in the log below, which might hint that your u-boot has auto-boot disabled (or something like that).Have you tried running your u-boot on hardware to see if it has the same behaviour (eliminating qemu as the cause)?
Yes, I'm running the same image as on the physical platform. However, I may know what is causing it to stop booting. On the S2600WF system, we have a "force update" jumper connected to GPIOD0 that forces the system to stop in U-Boot.
On my QEMU system that GPIO is 0 (low-asserted), but on my physical platform it is 1 which explains why QEMU stops in U-Boot and my physical system doesn't.
I searched around in the qemu repo and online but so far haven't found the right way to set GPIOD0 to 1 during init (or during runtime for that matter). I found the Aspeed GPIO device, but it looks like it might just be the memory region, so not sure if manipulating the registers is the right approach:
(qemu) qom-list /machine/soc/gpio/aspeed.gpio[0]
type (string)
addr (uint64)
container (link<qemu:memory-region>)
priority (uint32)
size (uint64)
Quoted 2 lines
what is the u-boot environment like ?
Not sure it's still needed, but here is my u-boot environment for completeness:
ast# print
baudrate=115200
bootargs=console=ttyS4,115200n8 root=/dev/ram rw resetreason=0x1 resetreason=0x1 bootcmd=bootm 20080000
bootdelay=2
ethact=FTGMAC100#0
spi_dma=yes
stderr=serial
stdin=serial
stdout=serial
verify=yes
Environment size: 236/65531 bytes
Quoted 79 lines
Quoted 49 lines
Quoted 43 lines
qemu-system-arm: Aspeed iBT has no chardev backend
U-Boot 2016.07 (Apr 04 2019 - 23:46:17 +0000)
SOC : AST2500-A1 RST : 0x01 PLL : 24 MHz CPU : 792 MHz MEM : 2.240 MHz, EEC: Disable, Cache: Disable VGA : 16 MiB DRAM : init by SOC Watchdog enabled DRAM: 240 MiB kcs_init Channel: 3 Flash: 64 MiB In: serial Out: serial Err: serial Net: MAC0 : RMII/NCSI MAC1 : RGMIIFTGMAC100#0
Error: FTGMAC100#0 address not set.
, FTGMAC100#1
Error: FTGMAC100#1 address not set.ast#
Quoted 11 lines
Quoted 6 lines
From there the next step is to add the peripherals that your machine
has. This will involve writing models for the i2c devices you have attached, and perhaps emulators for host connected devices (PECI?). This could be more involved so please use the list to discuss your plans.Yes please. It would be nice to have better support for I2C devices and work on a simple interface (QMP based) to interact with them, so that we can exercise the monitoring done by OpenBMC. PSU devices are a good topic for that.
Quoted 5 lines
I added some i2c temp sensor devices from the existing models. They were detected and loaded properly by entity-manager, but the readings were all zeroes. This is all new for me, so I assume I'm missing something. I still need to go through the existing QEMU tests on OpenBMC and see what is done there.
Quoted 4 lines
If the kernel exposes the devices then you've probably got them hooked up correctly. Have you looked at the models to see what data they should be producing? How were you observing the values? Probably best to poke directly with e.g. i2cget (either unbind the drivers, or just use
-f).yes. take a look at the tmp421. tmp105 should be the same.
The palmetto machine sets the temperature values at init time :
object_property_set_int(OBJECT(dev), 31000, "temperature0", &error_abort); object_property_set_int(OBJECT(dev), 28000, "temperature1", &error_abort); object_property_set_int(OBJECT(dev), 20000, "temperature2", &error_abort); object_property_set_int(OBJECT(dev), 110000, "temperature3", &error_abort);which can be seen at run time :
root@palmetto:~# cat /sys/class/hwmon/hwmon0/temp*input 30938 27938 19938 109938if you run from the monitor :
(qemu) qom-set /machine/unattached/device[5]/ temperature0 10000 (qemu) qom-set /machine/unattached/device[5]/ temperature1 20000 (qemu) qom-set /machine/unattached/device[5]/ temperature2 30000 (qemu) qom-set /machine/unattached/device[5]/ temperature3 40000
Quoted 9 lines
you will see the changes in the guest :
root@palmetto:~# cat /sys/class/hwmon/hwmon0/temp*input 9938 19938 29938 39938
This example was excellent! I was able to find my temperature sensor devices and use qom-set to change them above the threshold and see OpenBMC log a SEL event. I've updated my patch to set each sensor to 50C at init time.
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 8 lines
There are also a large number of peripherals inside the ASPEED SoC that lack models. Let us know on the list if you think you will start working on one so we don't duplicate efforts.
Submit your patches against the upstream qemu tree. Andrew, Cedric and I are the upstream maintainers so we will be on cc there.
We are keeping the models in development under in this tree :
https://github.com/openbmc/qemu
Some have been there a bit too long because we lacked time to make them ready but please prefer mainline. We rebase quite often anyhow. I should push today a new version on 4.0-rc3.
Check out this page before sending :
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
Thanks for the help! Here is what I have for my s2600wf machine so far:
Subject: [PATCH] Add an s2600wf machine typeadd a "hw/arm/aspeed: " prefix to the subject.
Done. I also added the default 50C setting to each temp sensor. Once I can get the GPIO to stop interfering with boot, I think it will be ready to go.
Thanks again for your time and help!
-Jason
Quoted 86 lines
Quoted 71 lines
Quoted 71 lines
Include the HW strap setting and some I2C temperature sensors.
Signed-off-by Jason M. Bills <[email protected]>--- hw/arm/aspeed.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)hw/arm/aspeed.c +23
-0@@ -60,6 +60,21 @@ struct AspeedBoardState { SCU_HW_STRAP_MAC0_RGMII) & \ ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* S2600WF hardware value: 0xF3CCC286 */ +#define S2600WF_BMC_HW_STRAP1 (( \ + AST2500_HW_STRAP1_DEFAULTS | \ + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \ + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \ + SCU_AST2500_HW_STRAP_UART_DEBUG | \ + SCU_AST2500_HW_STRAP_ESPI_ENABLE | \ + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \ + SCU_HW_STRAP_GPIOE_PT_EN | \ + SCU_AST2400_HW_STRAP_ACPI_DIS | \ + SCU_HW_STRAP_CLK_48M_IN | \ + SCU_HW_STRAP_VGA_CLASS_CODE | \ + SCU_HW_STRAP_MAC1_RGMII) & \ + ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* Romulus hardware value: 0xF10AD206 */ #define ROMULUS_BMC_HW_STRAP1 ( \ AST2500_HW_STRAP1_DEFAULTS | \@@ -281,6 +296,18 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"ds1338" ,0x32 ); } +static void s2600wf_bmc_i2c_init (AspeedBoardState *bmc) +{ +AspeedSoCState *soc = &bmc->soc; + +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),6 ),"tmp421" ,0x4d ); +/* The s2600wf expects a TMP75 but a TMP105 is compatible */ +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),6 ),"tmp105" ,0x48 ); + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),"tmp105",
0x49);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),
"tmp105",0x4a);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),
"tmp105",0x4b);hw/arm/aspeed.c +8
-0+} +static void romulus_bmc_i2c_init (AspeedBoardState *bmc) {AspeedSoCState *soc = &bmc->soc;@@ -390,6 +417,15 @@ static const AspeedBoardConfig aspeed_boards[] = { .spi_model = "mx25l25635e", .num_cs = 1, .i2c_init = ast2500_evb_i2c_init, + }, { + .name = MACHINE_TYPE_NAME("s2600wf-bmc"), + .desc = "Intel S2600WF BMC (ARM1176)", + .soc_name = "ast2500-a1", + .hw_strap1 = S2600WF_BMC_HW_STRAP1, + .fmc_model = "n25q512a",Quoted 8 lines
hw/arm/aspeed.c static const AspeedBoardConfig aspeed_boards[] = { · line 431
Quoted 6 lines
hw/arm/aspeed.c +3
-0+ .spi_model = "n25q512a", + .num_cs = 1, + .i2c_init = s2600wf_bmc_i2c_init, }, { .name = MACHINE_TYPE_NAME("romulus-bmc"), .desc = "OpenPOWER Romulus BMC (ARM1176)",Nice!
Yes. Please send to mainline.
Thanks,
C.
Quoted 26 lines · Jason M
Quoted 8 lines
Quoted 8 lines
Quoted 5 lines
One issue I have on my machine, that I don't see with witherspoon-bmc, is something in U-Boot that is preventing it from booting automatically.
When I start my image, it stops at the U-Boot prompt below where I can
just run 'boot' and it will boot normally. Is this something you have seen before?How are you testing witherspoon-bmc? Using a Witherspoon OpenBMC image?
Yes, I built a Witherspoon OpenBMC image to test the QEMU machine.
Quoted 7 lines
Quoted 7 lines
My gut feeling is it's some kind of u-boot configuration issue. I don't see the output
Hit any key to stop autoboot: 0in the log below, which might hint that your u-boot has auto-boot disabled (or something like that).Have you tried running your u-boot on hardware to see if it has the same behaviour (eliminating qemu as the cause)?
Yes, I'm running the same image as on the physical platform. However, I may know what is causing it to stop booting. On the S2600WF system, we have a "force update" jumper connected to GPIOD0 that forces the system to stop in U-Boot.
On my QEMU system that GPIO is 0 (low-asserted), but on my physical platform it is 1 which explains why QEMU stops in U-Boot and my physical system doesn't.
Quoted 11 lines
I searched around in the qemu repo and online but so far haven't found the right way to set GPIOD0 to 1 during init (or during runtime for that matter). I found the Aspeed GPIO device, but it looks like it might just be the memory region, so not sure if manipulating the registers is the right approach:
(qemu) qom-list /machine/soc/gpio/aspeed.gpio[0]
type (string)
addr (uint64)
container (link<qemu:memory-region>)
priority (uint32)
size (uint64)
Right, sounds like the cause of your issue. I'm meant to be modelling the GPIO controller properly, though that task is still languishing somewhere in my todo list.
If you want to take up hacking on it, please do (and let me know)!
Andrew
Quoted 234 lines
Quoted 3 lines
what is the u-boot environment like ?
Not sure it's still needed, but here is my u-boot environment for completeness:
ast# print
baudrate=115200
bootargs=console=ttyS4,115200n8 root=/dev/ram rw resetreason=0x1 resetreason=0x1
bootcmd=bootm 20080000
bootdelay=2
ethact=FTGMAC100#0
spi_dma=yes
stderr=serial
stdin=serial
stdout=serial
verify=yesEnvironment size: 236/65531 bytes
Quoted 79 lines
Quoted 49 lines
Quoted 43 lines
qemu-system-arm: Aspeed iBT has no chardev backend
U-Boot 2016.07 (Apr 04 2019 - 23:46:17 +0000)
SOC : AST2500-A1 RST : 0x01 PLL : 24 MHz CPU : 792 MHz MEM : 2.240 MHz, EEC: Disable, Cache: Disable VGA : 16 MiB DRAM : init by SOC Watchdog enabled DRAM: 240 MiB kcs_init Channel: 3 Flash: 64 MiB In: serial Out: serial Err: serial Net: MAC0 : RMII/NCSI MAC1 : RGMIIFTGMAC100#0
Error: FTGMAC100#0 address not set.
, FTGMAC100#1
Error: FTGMAC100#1 address not set.ast#
Quoted 11 lines
Quoted 6 lines
From there the next step is to add the peripherals that your machine
has. This will involve writing models for the i2c devices you have attached, and perhaps emulators for host connected devices (PECI?). This could be more involved so please use the list to discuss your plans.Yes please. It would be nice to have better support for I2C devices and work on a simple interface (QMP based) to interact with them, so that we can exercise the monitoring done by OpenBMC. PSU devices are a good topic for that.
Quoted 5 lines
I added some i2c temp sensor devices from the existing models. They were detected and loaded properly by entity-manager, but the readings were all zeroes. This is all new for me, so I assume I'm missing something. I still need to go through the existing QEMU tests on OpenBMC and see what is done there.
Quoted 4 lines
If the kernel exposes the devices then you've probably got them hooked up correctly. Have you looked at the models to see what data they should be producing? How were you observing the values? Probably best to poke directly with e.g. i2cget (either unbind the drivers, or just use
-f).yes. take a look at the tmp421. tmp105 should be the same.
The palmetto machine sets the temperature values at init time :
object_property_set_int(OBJECT(dev), 31000, "temperature0", &error_abort); object_property_set_int(OBJECT(dev), 28000, "temperature1", &error_abort); object_property_set_int(OBJECT(dev), 20000, "temperature2", &error_abort); object_property_set_int(OBJECT(dev), 110000, "temperature3", &error_abort);which can be seen at run time :
root@palmetto:~# cat /sys/class/hwmon/hwmon0/temp*input 30938 27938 19938 109938if you run from the monitor :
(qemu) qom-set /machine/unattached/device[5]/ temperature0 10000 (qemu) qom-set /machine/unattached/device[5]/ temperature1 20000 (qemu) qom-set /machine/unattached/device[5]/ temperature2 30000 (qemu) qom-set /machine/unattached/device[5]/ temperature3 40000
Quoted 9 lines
you will see the changes in the guest :
root@palmetto:~# cat /sys/class/hwmon/hwmon0/temp*input 9938 19938 29938 39938This example was excellent! I was able to find my temperature sensor devices and use qom-set to change them above the threshold and see OpenBMC log a SEL event. I've updated my patch to set each sensor to 50C at init time.
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 8 lines
There are also a large number of peripherals inside the ASPEED SoC that lack models. Let us know on the list if you think you will start working on one so we don't duplicate efforts.
Submit your patches against the upstream qemu tree. Andrew, Cedric and I are the upstream maintainers so we will be on cc there.
We are keeping the models in development under in this tree :
https://github.com/openbmc/qemu
Some have been there a bit too long because we lacked time to make them ready but please prefer mainline. We rebase quite often anyhow. I should push today a new version on 4.0-rc3.
Check out this page before sending :
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
Thanks for the help! Here is what I have for my s2600wf machine so far:
Subject: [PATCH] Add an s2600wf machine typeadd a "hw/arm/aspeed: " prefix to the subject.
Done. I also added the default 50C setting to each temp sensor. Once I can get the GPIO to stop interfering with boot, I think it will be ready to go.
Thanks again for your time and help!
-JasonQuoted 86 lines
Quoted 71 lines
Quoted 71 lines
Include the HW strap setting and some I2C temperature sensors.
Signed-off-by Jason M. Bills <[email protected]>--- hw/arm/aspeed.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)hw/arm/aspeed.c +23
-0@@ -60,6 +60,21 @@ struct AspeedBoardState { SCU_HW_STRAP_MAC0_RGMII) & \ ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* S2600WF hardware value: 0xF3CCC286 */ +#define S2600WF_BMC_HW_STRAP1 (( \ + AST2500_HW_STRAP1_DEFAULTS | \ + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \ + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \ + SCU_AST2500_HW_STRAP_UART_DEBUG | \ + SCU_AST2500_HW_STRAP_ESPI_ENABLE | \ + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \ + SCU_HW_STRAP_GPIOE_PT_EN | \ + SCU_AST2400_HW_STRAP_ACPI_DIS | \ + SCU_HW_STRAP_CLK_48M_IN | \ + SCU_HW_STRAP_VGA_CLASS_CODE | \ + SCU_HW_STRAP_MAC1_RGMII) & \ + ~SCU_HW_STRAP_2ND_BOOT_WDT) +/* Romulus hardware value: 0xF10AD206 */ #define ROMULUS_BMC_HW_STRAP1 ( \ AST2500_HW_STRAP1_DEFAULTS | \@@ -281,6 +296,18 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"ds1338" ,0x32 ); } +static void s2600wf_bmc_i2c_init (AspeedBoardState *bmc) +{ +AspeedSoCState *soc = &bmc->soc; + +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),6 ),"tmp421" ,0x4d ); +/* The s2600wf expects a TMP75 but a TMP105 is compatible */ +i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),6 ),"tmp105" ,0x48 ); + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),"tmp105",
0x49);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),
"tmp105",0x4a);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6),
"tmp105",0x4b);hw/arm/aspeed.c +8
-0+} +static void romulus_bmc_i2c_init (AspeedBoardState *bmc) {AspeedSoCState *soc = &bmc->soc;@@ -390,6 +417,15 @@ static const AspeedBoardConfig aspeed_boards[] = { .spi_model = "mx25l25635e", .num_cs = 1, .i2c_init = ast2500_evb_i2c_init, + }, { + .name = MACHINE_TYPE_NAME("s2600wf-bmc"), + .desc = "Intel S2600WF BMC (ARM1176)", + .soc_name = "ast2500-a1", + .hw_strap1 = S2600WF_BMC_HW_STRAP1, + .fmc_model = "n25q512a",Quoted 8 lines
hw/arm/aspeed.c static const AspeedBoardConfig aspeed_boards[] = { · line 431
Quoted 6 lines
hw/arm/aspeed.c +3
-0+ .spi_model = "n25q512a", + .num_cs = 1, + .i2c_init = s2600wf_bmc_i2c_init, }, { .name = MACHINE_TYPE_NAME("romulus-bmc"), .desc = "OpenPOWER Romulus BMC (ARM1176)",Nice!
Yes. Please send to mainline.
Thanks,
C.