[PULL 7/7] hw/hppa: Add NS 87560 SuperIO chip to HP C3700 machine

[Helge Deller <deller@kernel.org>]

From: Abizer Lokhandwala <abizerlokhandwalastd10@gmail.com>

Due to the lack of the emulated NS 87560 SuperIO chip, we used until now the
emulated serial ports of a Diva GSP management board as a temporary
replacement.  Since the NS SuperIO chip emulation was just added in the
previous commits, switch over to use it which allows us to emulate the physical
hardware more closely.

Signed-off-by: Abizer Lokhandwala <abizerlokhandwalastd10@gmail.com>
Signed-off-by: Helge Deller <deller@gmx.de>
---
 hw/hppa/machine.c | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 98931481b2..96133f09ba 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -394,7 +394,7 @@ static TranslateFn *machine_HP_common_init_cpus(MachineState *machine)
  * Last creation step: Add NICs, graphics & load firmware
  */
 static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
-                                        TranslateFn *translate)
+                                    TranslateFn *translate, bool create_diva)
 {
     const char *kernel_filename = machine->kernel_filename;
     MachineClass *mc = MACHINE_GET_CLASS(machine);
@@ -426,7 +426,7 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
         pci_init_nic_devices(pci_bus, mc->default_nic);
     }
 
-    if (pci_bus && hppa_is_pa20(&cpu[0]->env)) {
+    if (pci_bus && hppa_is_pa20(&cpu[0]->env) && create_diva) {
         /* BMC board: HP Diva GSP PCI card */
         pci_dev = pci_new_multifunction(PCI_DEVFN(2, 0), "diva-gsp");
         if (!lasi_dev) {
@@ -442,8 +442,9 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
     /* create USB OHCI controller for USB keyboard & mouse on Astro machines */
     if (!lasi_dev && machine->enable_graphics && defaults_enabled()) {
         USBBus *usb_bus;
-
-        pci_create_simple(pci_bus, -1, "pci-ohci");
+        if (create_diva) {
+            pci_create_simple(pci_bus, -1, "pci-ohci");
+        }
         usb_bus = USB_BUS(object_resolve_type_unambiguous(TYPE_USB_BUS,
                                                           &error_abort));
         usb_create_simple(usb_bus, "usb-kbd");
@@ -647,7 +648,7 @@ static void machine_HP_715_init(MachineState *machine)
     }
 
     /* Add NICs, graphics & load firmware */
-    machine_HP_common_init_tail(machine, NULL, translate);
+    machine_HP_common_init_tail(machine, NULL, translate, false);
 }
 
 /*
@@ -726,7 +727,7 @@ static void machine_HP_B160L_init(MachineState *machine)
     }
 
     /* Add NICs, graphics & load firmware */
-    machine_HP_common_init_tail(machine, pci_bus, translate);
+    machine_HP_common_init_tail(machine, pci_bus, translate, false);
 }
 
 static AstroState *astro_init(void)
@@ -771,6 +772,32 @@ static void machine_HP_C3700_init(MachineState *machine)
     pci_bus = PCI_BUS(qdev_get_child_bus(DEVICE(astro->elroy[0]), "pci"));
     assert(pci_bus);
 
+    /* The C3700 has a SuperIO chip, while the A400 hasn't. */
+    MachineClass *mc = MACHINE_GET_CLASS(machine);
+    bool is_C3700 = strcmp(mc->name, "C3700") == 0;
+    if (is_C3700)  {
+        PCIDevice *ide_pdev = pci_create_simple(pci_bus, PCI_DEVFN(2, 0),
+                                                "pc87560-ide");
+        PCIDevice *usb_pdev = pci_create_simple(pci_bus, PCI_DEVFN(2, 2),
+                                                "pc87560-ohci");
+        PCIDevice *sio_pdev = pci_new(PCI_DEVFN(2, 1), "pc87560-superio");
+        if (serial_hd(0)) {
+            qdev_prop_set_chr(DEVICE(sio_pdev), "serial0", serial_hd(0));
+        }
+        if (serial_hd(1)) {
+            qdev_prop_set_chr(DEVICE(sio_pdev), "serial1", serial_hd(1));
+        }
+        pci_realize_and_unref(sio_pdev, pci_bus, &error_fatal);
+
+        qdev_connect_gpio_out(DEVICE(ide_pdev), 0,
+            qdev_get_gpio_in_named(DEVICE(sio_pdev), "pic-irq", 7));
+        qdev_connect_gpio_out(DEVICE(usb_pdev), 0,
+            qdev_get_gpio_in_named(DEVICE(sio_pdev), "pic-irq", 1));
+
+        qdev_connect_gpio_out_named(DEVICE(sio_pdev), "pic-out", 0,
+                                    pci_allocate_irq(usb_pdev));
+    }
+
     /* SCSI disk setup. */
     if (drive_get_max_bus(IF_SCSI) >= 0) {
         DeviceState *dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
@@ -778,7 +805,7 @@ static void machine_HP_C3700_init(MachineState *machine)
     }
 
     /* Add NICs, graphics & load firmware */
-    machine_HP_common_init_tail(machine, pci_bus, translate);
+    machine_HP_common_init_tail(machine, pci_bus, translate, !is_C3700);
 }
 
 /*
-- 
2.54.0