[PATCH 0/4] hppa a400 machine support

[PATCH 0/4] hppa a400 machine support

[deller]

From: Helge Deller <deller@gmx.de>

Major enhancements to SeaBIOS-hppa to support an A400
server. This server requires 64-bit PAT firmware, so
SeaBIOS-hppa was extendend a lot. PAT firmware is required
as well to support 64-bit HP-UX 11i3 or MPE.

The patches to qemu are quite small.

Please review.

Helge

Helge Deller (4):
  hw/hppa: Add BMC on 64-bit machines only
  target/hppa: Update SeaBIOS-hppa to version 22
  hw/hppa: Require SeaBIOS version 22 for A400 machine
  hw/hppa: Add emulation for the 64-bit A400 server

 hw/hppa/machine.c           |  32 +++++++++++++++++++++++++++++++-
 pc-bios/hppa-firmware.img   | Bin 628952 -> 632048 bytes
 pc-bios/hppa-firmware64.img | Bin 692032 -> 713608 bytes
 roms/seabios-hppa           |   2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)

-- 
2.53.0

[PATCH 1/4] hw/hppa: Add BMC on 64-bit machines only

[deller]

From: Helge Deller <deller@gmx.de>

Prevent adding the BMC with it's serial ports on 32-bit machines, even
if they have a PCI bus like the B160L. This fixes boot problems with
HP-UX on B160L.

Signed-off-by: Helge Deller <deller@gmx.de>
Fixes: 557bc5260cfd ("hw/hppa: PCI devices depend on availability of PCI bus")
Cc: qemu-stable@nongnu.org
---
 hw/hppa/machine.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index c3680667ae..d6aeb793c0 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -376,7 +376,9 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
 
     if (pci_bus) {
         pci_init_nic_devices(pci_bus, mc->default_nic);
+    }
 
+    if (pci_bus && hppa_is_pa20(&cpu[0]->env)) {
         /* BMC board: HP Diva GSP PCI card */
         dev = qdev_new("diva-gsp");
         if (dev && !object_property_get_bool(OBJECT(dev), "disable", NULL)) {
-- 
2.53.0

[PATCH 3/4] hw/hppa: Require SeaBIOS version 22 for A400 machine

[deller]

From: Helge Deller <deller@gmx.de>

Require at least SeaBIOS version 22 before adding the A400 machine.
This is required, because version 22 adds the A400 machine definition
and provides the necessary 64-bit PAT firmware. All other machines up to
now used only the 32- or 64-bit PDC firmware without the PAT extensions.

Signed-off-by: Helge Deller <deller@gmx.de>
---
 hw/hppa/machine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index d6aeb793c0..5ce4a17915 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -45,7 +45,7 @@ struct HppaMachineState {
     MachineState parent_obj;
 };
 
-#define MIN_SEABIOS_HPPA_VERSION 19 /* require at least this fw version */
+#define MIN_SEABIOS_HPPA_VERSION 22 /* require at least this fw version */
 
 #define HPA_POWER_BUTTON        (FIRMWARE_END - 0x10)
 static hwaddr soft_power_reg;
-- 
2.53.0

[PATCH 4/4] hw/hppa: Add emulation for the 64-bit A400 server

[deller]

From: Helge Deller <deller@gmx.de>

The A400 machine is the very first 64-bit-only machines which uses the 64-bit
PAT firmware and desn't support 32-bit PDC any longer.  Long-term goal is to
support the MPE and HP-UX 11iv3 operating systems, which both require a machine
with PAT firmware.

Signed-off-by: Helge Deller <deller@gmx.de>
---
 hw/hppa/machine.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 5ce4a17915..2cf4239a43 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -729,6 +729,14 @@ static void machine_HP_C3700_init(MachineState *machine)
     machine_HP_common_init_tail(machine, pci_bus, translate);
 }
 
+/*
+ * Create HP A400 server
+ */
+static void machine_HP_A400_init(MachineState *machine)
+{
+    machine_HP_C3700_init(machine);
+}
+
 static void hppa_machine_reset(MachineState *ms, ResetType type)
 {
     unsigned int smp_cpus = ms->smp.cpus;
@@ -822,6 +830,22 @@ static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *data)
     mc->default_ram_size = 1024 * MiB;
 }
 
+static void HP_A400_machine_init_class_init(ObjectClass *oc, const void *data)
+{
+    static const char * const valid_cpu_types[] = {
+        TYPE_HPPA64_CPU,
+        NULL
+    };
+    MachineClass *mc = MACHINE_CLASS(oc);
+
+    mc->desc = "HP A400-44 workstation";
+    mc->default_cpu_type = TYPE_HPPA64_CPU;
+    mc->valid_cpu_types = valid_cpu_types;
+    mc->init = machine_HP_A400_init;
+    mc->max_cpus = HPPA_MAX_CPUS;
+    mc->default_ram_size = 1024 * MiB;
+}
+
 static void HP_715_machine_init_class_init(ObjectClass *oc, const void *data)
 {
     static const char * const valid_cpu_types[] = {
@@ -860,6 +884,10 @@ static const TypeInfo hppa_machine_types[] = {
         .name = MACHINE_TYPE_NAME("C3700"),
         .parent = TYPE_HPPA_COMMON_MACHINE,
         .class_init = HP_C3700_machine_init_class_init,
+    }, {
+        .name = MACHINE_TYPE_NAME("A400"),
+        .parent = TYPE_HPPA_COMMON_MACHINE,
+        .class_init = HP_A400_machine_init_class_init,
     }, {
         .name = MACHINE_TYPE_NAME("715"),
         .parent = TYPE_HPPA_COMMON_MACHINE,
-- 
2.53.0

Re: [PATCH 1/4] hw/hppa: Add BMC on 64-bit machines only

[Anton Johansson via qemu development]

On 18/02/26, deller@kernel.org wrote:
> From: Helge Deller <deller@gmx.de>
> 
> Prevent adding the BMC with it's serial ports on 32-bit machines, even
> if they have a PCI bus like the B160L. This fixes boot problems with
> HP-UX on B160L.
> 
> Signed-off-by: Helge Deller <deller@gmx.de>
> Fixes: 557bc5260cfd ("hw/hppa: PCI devices depend on availability of PCI bus")
> Cc: qemu-stable@nongnu.org
> ---
>  hw/hppa/machine.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index c3680667ae..d6aeb793c0 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -376,7 +376,9 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
>  
>      if (pci_bus) {
>          pci_init_nic_devices(pci_bus, mc->default_nic);
> +    }
>  
> +    if (pci_bus && hppa_is_pa20(&cpu[0]->env)) {
>          /* BMC board: HP Diva GSP PCI card */
>          dev = qdev_new("diva-gsp");
>          if (dev && !object_property_get_bool(OBJECT(dev), "disable", NULL)) {
> -- 
> 2.53.0
> 

Reviewed-by: Anton Johansson <anjo@rev.ng>

Re: [PATCH 2/4] target/hppa: Update SeaBIOS-hppa to version 22

[Anton Johansson via qemu development]

On 18/02/26, deller@kernel.org wrote:
> From: Helge Deller <deller@gmx.de>
> 
> The new firmware includes support for an A400-44 machine
> with initial functional 64-bit PAT PDC support:
> - Linux 64-bit kernel runs nicely.
> - ODE 2006 works nicely on 715, B160L, and A400, but has problems on C3700.
> - MPE and 64-bit HP-UX11 need more work, although HP-UX11 boot up to a crash
>   where it reports where it had problems.
> 
> Signed-off-by: Helge Deller <deller@gmx.de>
> ---
>  pc-bios/hppa-firmware.img   | Bin 628952 -> 632048 bytes
>  pc-bios/hppa-firmware64.img | Bin 692032 -> 713608 bytes
>  roms/seabios-hppa           |   2 +-
>  3 files changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Anton Johansson <anjo@rev.ng>

Re: [PATCH 3/4] hw/hppa: Require SeaBIOS version 22 for A400 machine

[Anton Johansson via qemu development]

On 18/02/26, deller@kernel.org wrote:
> From: Helge Deller <deller@gmx.de>
> 
> Require at least SeaBIOS version 22 before adding the A400 machine.
> This is required, because version 22 adds the A400 machine definition
> and provides the necessary 64-bit PAT firmware. All other machines up to
> now used only the 32- or 64-bit PDC firmware without the PAT extensions.
> 
> Signed-off-by: Helge Deller <deller@gmx.de>
> ---
>  hw/hppa/machine.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index d6aeb793c0..5ce4a17915 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -45,7 +45,7 @@ struct HppaMachineState {
>      MachineState parent_obj;
>  };
>  
> -#define MIN_SEABIOS_HPPA_VERSION 19 /* require at least this fw version */
> +#define MIN_SEABIOS_HPPA_VERSION 22 /* require at least this fw version */
>  
>  #define HPA_POWER_BUTTON        (FIRMWARE_END - 0x10)
>  static hwaddr soft_power_reg;
> -- 
> 2.53.0
> 

Reviewed-by: Anton Johansson <anjo@rev.ng>

Re: [PATCH 4/4] hw/hppa: Add emulation for the 64-bit A400 server

[Anton Johansson via qemu development]

On 18/02/26, deller@kernel.org wrote:
> From: Helge Deller <deller@gmx.de>
> 
> The A400 machine is the very first 64-bit-only machines which uses the 64-bit
> PAT firmware and desn't support 32-bit PDC any longer.  Long-term goal is to

                   doesn't



> support the MPE and HP-UX 11iv3 operating systems, which both require a machine
> with PAT firmware.
> 
> Signed-off-by: Helge Deller <deller@gmx.de>
> ---
>  hw/hppa/machine.c | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)

Anyway, nice! I'll rebase my series then.

Reviewed-by: Anton Johansson <anjo@rev.ng>