* [PATCH v3] arm: Remove swift-bmc machine
@ 2022-02-17 10:31 Joel Stanley
2022-02-18 8:09 ` Cédric Le Goater
2022-02-18 17:36 ` Philippe Mathieu-Daudé via
0 siblings, 2 replies; 3+ messages in thread
From: Joel Stanley @ 2022-02-17 10:31 UTC (permalink / raw)
To: Peter Maydell; +Cc: Andrew Jeffery, qemu-arm, Cédric Le Goater, qemu-devel
It was scheduled for removal in 7.0.
Signed-off-by: Joel Stanley <joel@jms.id.au>
--
v2: also remove from docs/about/deprecated.rst
v3: remove strap define, add note to removed-features.rst
---
docs/about/deprecated.rst | 7 ----
docs/about/removed-features.rst | 5 +++
docs/system/arm/aspeed.rst | 1 -
hw/arm/aspeed.c | 64 ---------------------------------
4 files changed, 5 insertions(+), 72 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 26d00812ba94..85773db631c1 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -315,13 +315,6 @@ Use the more generic event ``DEVICE_UNPLUG_GUEST_ERROR`` instead.
System emulator machines
------------------------
-Aspeed ``swift-bmc`` machine (since 6.1)
-''''''''''''''''''''''''''''''''''''''''
-
-This machine is deprecated because we have enough AST2500 based OpenPOWER
-machines. It can be easily replaced by the ``witherspoon-bmc`` or the
-``romulus-bmc`` machines.
-
PPC 405 ``taihu`` machine (since 7.0)
'''''''''''''''''''''''''''''''''''''
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index cb0575fd4975..4b831ea29176 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -588,6 +588,11 @@ The Raspberry Pi machines come in various models (A, A+, B, B+). To be able
to distinguish which model QEMU is implementing, the ``raspi2`` and ``raspi3``
machines have been renamed ``raspi2b`` and ``raspi3b``.
+Aspeed ``swift-bmc`` machine (removed in 7.0)
+'''''''''''''''''''''''''''''''''''''''''''''
+
+This machine was removed because it was unused. Alternative AST2500 based
+OpenPOWER machines are ``witherspoon-bmc`` and ``romulus-bmc``.
linux-user mode CPUs
--------------------
diff --git a/docs/system/arm/aspeed.rst b/docs/system/arm/aspeed.rst
index d8b102fa0ad0..60ed94f18759 100644
--- a/docs/system/arm/aspeed.rst
+++ b/docs/system/arm/aspeed.rst
@@ -22,7 +22,6 @@ AST2500 SoC based machines :
- ``romulus-bmc`` OpenPOWER Romulus POWER9 BMC
- ``witherspoon-bmc`` OpenPOWER Witherspoon POWER9 BMC
- ``sonorapass-bmc`` OCP SonoraPass BMC
-- ``swift-bmc`` OpenPOWER Swift BMC POWER9 (to be removed in v7.0)
- ``fp5280g2-bmc`` Inspur FP5280G2 BMC
- ``g220a-bmc`` Bytedance G220A BMC
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index d911dc904fb3..faf7a9fd6863 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -106,17 +106,6 @@ struct AspeedMachineState {
SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \
SCU_AST2500_HW_STRAP_RESERVED1)
-/* Swift hardware value: 0xF11AD206 */
-#define SWIFT_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_DDR4_ENABLE | \
- SCU_H_PLL_BYPASS_EN | \
- SCU_AST2500_HW_STRAP_ACPI_ENABLE | \
- SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))
-
#define G220A_BMC_HW_STRAP1 ( \
SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \
SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \
@@ -544,35 +533,6 @@ static void romulus_bmc_i2c_init(AspeedMachineState *bmc)
i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
}
-static void swift_bmc_i2c_init(AspeedMachineState *bmc)
-{
- AspeedSoCState *soc = &bmc->soc;
-
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "pca9552", 0x60);
-
- /* The swift board expects a TMP275 but a TMP105 is compatible */
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "tmp105", 0x48);
- /* The swift board expects a pca9551 but a pca9552 is compatible */
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "pca9552", 0x60);
-
- /* The swift board expects an Epson RX8900 RTC but a ds1338 is compatible */
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "ds1338", 0x32);
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60);
-
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423", 0x4c);
- /* The swift board expects a pca9539 but a pca9552 is compatible */
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "pca9552", 0x74);
-
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423", 0x4c);
- /* The swift board expects a pca9539 but a pca9552 is compatible */
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "pca9552",
- 0x74);
-
- /* The swift board expects a TMP275 but a TMP105 is compatible */
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x48);
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x4a);
-}
-
static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
{
AspeedSoCState *soc = &bmc->soc;
@@ -1102,26 +1062,6 @@ static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data)
aspeed_soc_num_cpus(amc->soc_name);
};
-static void aspeed_machine_swift_class_init(ObjectClass *oc, void *data)
-{
- MachineClass *mc = MACHINE_CLASS(oc);
- AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
-
- mc->desc = "OpenPOWER Swift BMC (ARM1176)";
- amc->soc_name = "ast2500-a1";
- amc->hw_strap1 = SWIFT_BMC_HW_STRAP1;
- amc->fmc_model = "mx66l1g45g";
- amc->spi_model = "mx66l1g45g";
- amc->num_cs = 2;
- amc->i2c_init = swift_bmc_i2c_init;
- mc->default_ram_size = 512 * MiB;
- mc->default_cpus = mc->min_cpus = mc->max_cpus =
- aspeed_soc_num_cpus(amc->soc_name);
-
- mc->deprecation_reason = "redundant system. Please use a similar "
- "OpenPOWER BMC, Witherspoon or Romulus.";
-};
-
static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -1277,10 +1217,6 @@ static const TypeInfo aspeed_machine_types[] = {
.name = MACHINE_TYPE_NAME("romulus-bmc"),
.parent = TYPE_ASPEED_MACHINE,
.class_init = aspeed_machine_romulus_class_init,
- }, {
- .name = MACHINE_TYPE_NAME("swift-bmc"),
- .parent = TYPE_ASPEED_MACHINE,
- .class_init = aspeed_machine_swift_class_init,
}, {
.name = MACHINE_TYPE_NAME("sonorapass-bmc"),
.parent = TYPE_ASPEED_MACHINE,
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] arm: Remove swift-bmc machine
2022-02-17 10:31 [PATCH v3] arm: Remove swift-bmc machine Joel Stanley
@ 2022-02-18 8:09 ` Cédric Le Goater
2022-02-18 17:36 ` Philippe Mathieu-Daudé via
1 sibling, 0 replies; 3+ messages in thread
From: Cédric Le Goater @ 2022-02-18 8:09 UTC (permalink / raw)
To: Joel Stanley, Peter Maydell; +Cc: Andrew Jeffery, qemu-arm, qemu-devel
On 2/17/22 11:31, Joel Stanley wrote:
> It was scheduled for removal in 7.0.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> --
> v2: also remove from docs/about/deprecated.rst
> v3: remove strap define, add note to removed-features.rst
> ---
> docs/about/deprecated.rst | 7 ----
> docs/about/removed-features.rst | 5 +++
> docs/system/arm/aspeed.rst | 1 -
> hw/arm/aspeed.c | 64 ---------------------------------
> 4 files changed, 5 insertions(+), 72 deletions(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 26d00812ba94..85773db631c1 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -315,13 +315,6 @@ Use the more generic event ``DEVICE_UNPLUG_GUEST_ERROR`` instead.
> System emulator machines
> ------------------------
>
> -Aspeed ``swift-bmc`` machine (since 6.1)
> -''''''''''''''''''''''''''''''''''''''''
> -
> -This machine is deprecated because we have enough AST2500 based OpenPOWER
> -machines. It can be easily replaced by the ``witherspoon-bmc`` or the
> -``romulus-bmc`` machines.
> -
> PPC 405 ``taihu`` machine (since 7.0)
> '''''''''''''''''''''''''''''''''''''
>
> diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
> index cb0575fd4975..4b831ea29176 100644
> --- a/docs/about/removed-features.rst
> +++ b/docs/about/removed-features.rst
> @@ -588,6 +588,11 @@ The Raspberry Pi machines come in various models (A, A+, B, B+). To be able
> to distinguish which model QEMU is implementing, the ``raspi2`` and ``raspi3``
> machines have been renamed ``raspi2b`` and ``raspi3b``.
>
> +Aspeed ``swift-bmc`` machine (removed in 7.0)
> +'''''''''''''''''''''''''''''''''''''''''''''
> +
> +This machine was removed because it was unused. Alternative AST2500 based
> +OpenPOWER machines are ``witherspoon-bmc`` and ``romulus-bmc``.
>
> linux-user mode CPUs
> --------------------
> diff --git a/docs/system/arm/aspeed.rst b/docs/system/arm/aspeed.rst
> index d8b102fa0ad0..60ed94f18759 100644
> --- a/docs/system/arm/aspeed.rst
> +++ b/docs/system/arm/aspeed.rst
> @@ -22,7 +22,6 @@ AST2500 SoC based machines :
> - ``romulus-bmc`` OpenPOWER Romulus POWER9 BMC
> - ``witherspoon-bmc`` OpenPOWER Witherspoon POWER9 BMC
> - ``sonorapass-bmc`` OCP SonoraPass BMC
> -- ``swift-bmc`` OpenPOWER Swift BMC POWER9 (to be removed in v7.0)
> - ``fp5280g2-bmc`` Inspur FP5280G2 BMC
> - ``g220a-bmc`` Bytedance G220A BMC
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index d911dc904fb3..faf7a9fd6863 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -106,17 +106,6 @@ struct AspeedMachineState {
> SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \
> SCU_AST2500_HW_STRAP_RESERVED1)
>
> -/* Swift hardware value: 0xF11AD206 */
> -#define SWIFT_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_DDR4_ENABLE | \
> - SCU_H_PLL_BYPASS_EN | \
> - SCU_AST2500_HW_STRAP_ACPI_ENABLE | \
> - SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))
> -
> #define G220A_BMC_HW_STRAP1 ( \
> SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \
> SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \
> @@ -544,35 +533,6 @@ static void romulus_bmc_i2c_init(AspeedMachineState *bmc)
> i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
> }
>
> -static void swift_bmc_i2c_init(AspeedMachineState *bmc)
> -{
> - AspeedSoCState *soc = &bmc->soc;
> -
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "pca9552", 0x60);
> -
> - /* The swift board expects a TMP275 but a TMP105 is compatible */
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "tmp105", 0x48);
> - /* The swift board expects a pca9551 but a pca9552 is compatible */
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "pca9552", 0x60);
> -
> - /* The swift board expects an Epson RX8900 RTC but a ds1338 is compatible */
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "ds1338", 0x32);
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60);
> -
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423", 0x4c);
> - /* The swift board expects a pca9539 but a pca9552 is compatible */
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "pca9552", 0x74);
> -
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423", 0x4c);
> - /* The swift board expects a pca9539 but a pca9552 is compatible */
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "pca9552",
> - 0x74);
> -
> - /* The swift board expects a TMP275 but a TMP105 is compatible */
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x48);
> - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x4a);
> -}
> -
> static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
> {
> AspeedSoCState *soc = &bmc->soc;
> @@ -1102,26 +1062,6 @@ static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data)
> aspeed_soc_num_cpus(amc->soc_name);
> };
>
> -static void aspeed_machine_swift_class_init(ObjectClass *oc, void *data)
> -{
> - MachineClass *mc = MACHINE_CLASS(oc);
> - AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
> -
> - mc->desc = "OpenPOWER Swift BMC (ARM1176)";
> - amc->soc_name = "ast2500-a1";
> - amc->hw_strap1 = SWIFT_BMC_HW_STRAP1;
> - amc->fmc_model = "mx66l1g45g";
> - amc->spi_model = "mx66l1g45g";
> - amc->num_cs = 2;
> - amc->i2c_init = swift_bmc_i2c_init;
> - mc->default_ram_size = 512 * MiB;
> - mc->default_cpus = mc->min_cpus = mc->max_cpus =
> - aspeed_soc_num_cpus(amc->soc_name);
> -
> - mc->deprecation_reason = "redundant system. Please use a similar "
> - "OpenPOWER BMC, Witherspoon or Romulus.";
> -};
> -
> static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
> @@ -1277,10 +1217,6 @@ static const TypeInfo aspeed_machine_types[] = {
> .name = MACHINE_TYPE_NAME("romulus-bmc"),
> .parent = TYPE_ASPEED_MACHINE,
> .class_init = aspeed_machine_romulus_class_init,
> - }, {
> - .name = MACHINE_TYPE_NAME("swift-bmc"),
> - .parent = TYPE_ASPEED_MACHINE,
> - .class_init = aspeed_machine_swift_class_init,
> }, {
> .name = MACHINE_TYPE_NAME("sonorapass-bmc"),
> .parent = TYPE_ASPEED_MACHINE,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] arm: Remove swift-bmc machine
2022-02-17 10:31 [PATCH v3] arm: Remove swift-bmc machine Joel Stanley
2022-02-18 8:09 ` Cédric Le Goater
@ 2022-02-18 17:36 ` Philippe Mathieu-Daudé via
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-02-18 17:36 UTC (permalink / raw)
To: Joel Stanley, Peter Maydell
Cc: Andrew Jeffery, qemu-arm, Cédric Le Goater, qemu-devel
On 17/2/22 11:31, Joel Stanley wrote:
> It was scheduled for removal in 7.0.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> --
> v2: also remove from docs/about/deprecated.rst
> v3: remove strap define, add note to removed-features.rst
> ---
> docs/about/deprecated.rst | 7 ----
> docs/about/removed-features.rst | 5 +++
> docs/system/arm/aspeed.rst | 1 -
> hw/arm/aspeed.c | 64 ---------------------------------
> 4 files changed, 5 insertions(+), 72 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-18 17:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-17 10:31 [PATCH v3] arm: Remove swift-bmc machine Joel Stanley
2022-02-18 8:09 ` Cédric Le Goater
2022-02-18 17:36 ` Philippe Mathieu-Daudé via
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).