From: Helge Deller <deller@gmx.de>
Add a new emulation for a 715/64 machine.
This machines has no PCI bus, and has the majority of the devices (SCSI,
network, serial ports, ...) provided by a LASI multi-function I/O chip.
v2: based on feedback from Richard
- Fix indenting and use assert() to check ncr710 device availability
Signed-off-by: Helge Deller <deller@gmx.de>
---
hw/hppa/machine.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 93 insertions(+), 2 deletions(-)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 81ed050b5e..7b130a0db0 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -30,6 +30,8 @@
#include "hw/pci-host/astro.h"
#include "hw/pci-host/dino.h"
#include "hw/misc/lasi.h"
+#include "hw/scsi/ncr53c710.h"
+#include "hw/scsi/lasi_ncr710.h"
#include "hppa_hardware.h"
#include "qemu/units.h"
#include "qapi/error.h"
@@ -363,8 +365,17 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
/* SCSI disk setup. */
if (drive_get_max_bus(IF_SCSI) >= 0) {
- dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
- lsi53c8xx_handle_legacy_cmdline(dev);
+ if (pci_bus) {
+ dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
+ lsi53c8xx_handle_legacy_cmdline(dev);
+ } else {
+ dev = lasi_ncr710_init(addr_space,
+ translate(NULL, LASI_HPA_715 + 0x6000),
+ qdev_get_gpio_in(lasi_dev,
+ LASI_IRQ_SCSI_HPA));
+ assert(dev);
+ lasi_ncr710_handle_legacy_cmdline(dev);
+ }
}
/* Graphics setup. */
@@ -537,6 +548,63 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
cpu[0]->env.kernel_entry = kernel_entry;
}
+/*
+ * Create HP 715/64 workstation
+ */
+static void machine_HP_715_init(MachineState *machine)
+{
+ DeviceState *dev;
+ MemoryRegion *addr_space = get_system_memory();
+ TranslateFn *translate;
+ ISABus *isa_bus;
+
+ /* Create CPUs and RAM. */
+ translate = machine_HP_common_init_cpus(machine);
+
+ if (hppa_is_pa20(&cpu[0]->env)) {
+ error_report("The HP 715/64 workstation requires a 32-bit "
+ "CPU. Use '-machine 715' instead.");
+ exit(1);
+ }
+
+ /* Create ISA bus, needed for PS/2 kbd/mouse port emulation */
+ isa_bus = hppa_isa_bus(translate(NULL, IDE_HPA));
+ assert(isa_bus);
+
+ /* Init Lasi chip */
+ lasi_dev = DEVICE(lasi_init());
+ memory_region_add_subregion(addr_space, translate(NULL, LASI_HPA_715),
+ sysbus_mmio_get_region(
+ SYS_BUS_DEVICE(lasi_dev), 0));
+
+ /* Serial ports: Lasi use a 7.272727 MHz clock. */
+ serial_mm_init(addr_space, translate(NULL, LASI_HPA_715 + LASI_UART + 0x800), 0,
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_UART_HPA), 7272727 / 16,
+ serial_hd(0), DEVICE_BIG_ENDIAN);
+
+ /* Parallel port */
+ parallel_mm_init(addr_space, translate(NULL, LASI_HPA_715 + LASI_LPT + 0x800), 0,
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_LPT_HPA),
+ parallel_hds[0]);
+
+ /* PS/2 Keyboard/Mouse */
+ dev = qdev_new(TYPE_LASIPS2);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_PS2KBD_HPA));
+ memory_region_add_subregion(addr_space,
+ translate(NULL, LASI_HPA_715 + LASI_PS2),
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
+ 0));
+ memory_region_add_subregion(addr_space,
+ translate(NULL, LASI_HPA_715 + LASI_PS2 + 0x100),
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
+ 1));
+
+ /* Add SCSI discs, NICs, graphics & load firmware */
+ machine_HP_common_init_tail(machine, NULL, translate);
+}
+
/*
* Create HP B160L workstation
*/
@@ -743,6 +811,25 @@ static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *data)
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[] = {
+ TYPE_HPPA_CPU,
+ NULL
+ };
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->desc = "HP 715/64 workstation";
+ mc->default_cpu_type = TYPE_HPPA_CPU;
+ mc->valid_cpu_types = valid_cpu_types;
+ mc->init = machine_HP_715_init;
+ /* can only support up to max. 8 CPUs due inventory major numbers */
+ mc->max_cpus = MIN_CONST(HPPA_MAX_CPUS, 8);
+ mc->default_ram_size = 256 * MiB;
+ mc->default_nic = NULL;
+}
+
+
static const TypeInfo hppa_machine_types[] = {
{
.name = TYPE_HPPA_COMMON_MACHINE,
@@ -762,6 +849,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("715"),
+ .parent = TYPE_HPPA_COMMON_MACHINE,
+ .class_init = HP_715_machine_init_class_init,
},
};
--
2.51.0On 25/10/25 18:19, deller@kernel.org wrote:
> From: Helge Deller <deller@gmx.de>
>
> Add a new emulation for a 715/64 machine.
> This machines has no PCI bus, and has the majority of the devices (SCSI,
> network, serial ports, ...) provided by a LASI multi-function I/O chip.
>
> v2: based on feedback from Richard
> - Fix indenting and use assert() to check ncr710 device availability
>
> Signed-off-by: Helge Deller <deller@gmx.de>
> ---
> hw/hppa/machine.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 93 insertions(+), 2 deletions(-)
>
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index 81ed050b5e..7b130a0db0 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -30,6 +30,8 @@
> #include "hw/pci-host/astro.h"
> #include "hw/pci-host/dino.h"
> #include "hw/misc/lasi.h"
> +#include "hw/scsi/ncr53c710.h"
> +#include "hw/scsi/lasi_ncr710.h"
> #include "hppa_hardware.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> @@ -363,8 +365,17 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
>
> /* SCSI disk setup. */
> if (drive_get_max_bus(IF_SCSI) >= 0) {
> - dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
> - lsi53c8xx_handle_legacy_cmdline(dev);
> + if (pci_bus) {
> + dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
> + lsi53c8xx_handle_legacy_cmdline(dev);
> + } else {
> + dev = lasi_ncr710_init(addr_space,
> + translate(NULL, LASI_HPA_715 + 0x6000),
> + qdev_get_gpio_in(lasi_dev,
> + LASI_IRQ_SCSI_HPA));
> + assert(dev);
> + lasi_ncr710_handle_legacy_cmdline(dev);
> + }
> }
Can we move this code in the callers to keep the rest really common?
On 10/25/25 18:25, Philippe Mathieu-Daudé wrote:
> On 25/10/25 18:19, deller@kernel.org wrote:
>> From: Helge Deller <deller@gmx.de>
>>
>> Add a new emulation for a 715/64 machine.
>> This machines has no PCI bus, and has the majority of the devices (SCSI,
>> network, serial ports, ...) provided by a LASI multi-function I/O chip.
>>
>> v2: based on feedback from Richard
>> - Fix indenting and use assert() to check ncr710 device availability
>>
>> Signed-off-by: Helge Deller <deller@gmx.de>
>> ---
>> hw/hppa/machine.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 93 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
>> index 81ed050b5e..7b130a0db0 100644
>> --- a/hw/hppa/machine.c
>> +++ b/hw/hppa/machine.c
>> @@ -30,6 +30,8 @@
>> #include "hw/pci-host/astro.h"
>> #include "hw/pci-host/dino.h"
>> #include "hw/misc/lasi.h"
>> +#include "hw/scsi/ncr53c710.h"
>> +#include "hw/scsi/lasi_ncr710.h"
>> #include "hppa_hardware.h"
>> #include "qemu/units.h"
>> #include "qapi/error.h"
>> @@ -363,8 +365,17 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
>> /* SCSI disk setup. */
>> if (drive_get_max_bus(IF_SCSI) >= 0) {
>> - dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
>> - lsi53c8xx_handle_legacy_cmdline(dev);
>> + if (pci_bus) {
>> + dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
>> + lsi53c8xx_handle_legacy_cmdline(dev);
>> + } else {
>> + dev = lasi_ncr710_init(addr_space,
>> + translate(NULL, LASI_HPA_715 + 0x6000),
>> + qdev_get_gpio_in(lasi_dev,
>> + LASI_IRQ_SCSI_HPA));
>> + assert(dev);
>> + lasi_ncr710_handle_legacy_cmdline(dev);
>> + }
>> }
>
> Can we move this code in the callers to keep the rest really common?
Yes, ok.
I will respin this patch and resend soon.
Helge
Add a new emulation for a 715/64 machine.
This machines has no PCI bus, and has the majority of the devices (SCSI,
network, serial ports, ...) provided by a LASI multi-function I/O chip.
v2: based on feedback from Richard
- Fix indenting and use assert() to check ncr710 device availability
v3: based on feedback from Philippe Mathieu-Daudé <philmd@linaro.org>
- create SCSI device at caller site, not inside machine_HP_common_init_tail()
Signed-off-by: Helge Deller <deller@gmx.de>
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 81ed050b5e..92e9fcf437 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -30,6 +30,8 @@
#include "hw/pci-host/astro.h"
#include "hw/pci-host/dino.h"
#include "hw/misc/lasi.h"
+#include "hw/scsi/ncr53c710.h"
+#include "hw/scsi/lasi_ncr710.h"
#include "hppa_hardware.h"
#include "qemu/units.h"
#include "qapi/error.h"
@@ -346,7 +348,7 @@ static TranslateFn *machine_HP_common_init_cpus(MachineState *machine)
}
/*
- * Last creation step: Add SCSI discs, NICs, graphics & load firmware
+ * Last creation step: Add NICs, graphics & load firmware
*/
static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
TranslateFn *translate)
@@ -361,12 +363,6 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
MemoryRegion *rom_region;
SysBusDevice *s;
- /* SCSI disk setup. */
- if (drive_get_max_bus(IF_SCSI) >= 0) {
- dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
- lsi53c8xx_handle_legacy_cmdline(dev);
- }
-
/* Graphics setup. */
if (machine->enable_graphics && vga_interface_type != VGA_NONE) {
dev = qdev_new("artist");
@@ -537,6 +533,71 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
cpu[0]->env.kernel_entry = kernel_entry;
}
+/*
+ * Create HP 715/64 workstation
+ */
+static void machine_HP_715_init(MachineState *machine)
+{
+ DeviceState *dev;
+ MemoryRegion *addr_space = get_system_memory();
+ TranslateFn *translate;
+ ISABus *isa_bus;
+
+ /* Create CPUs and RAM. */
+ translate = machine_HP_common_init_cpus(machine);
+
+ if (hppa_is_pa20(&cpu[0]->env)) {
+ error_report("The HP 715/64 workstation requires a 32-bit "
+ "CPU. Use '-machine 715' instead.");
+ exit(1);
+ }
+
+ /* Create ISA bus, needed for PS/2 kbd/mouse port emulation */
+ isa_bus = hppa_isa_bus(translate(NULL, IDE_HPA));
+ assert(isa_bus);
+
+ /* Init Lasi chip */
+ lasi_dev = DEVICE(lasi_init());
+ memory_region_add_subregion(addr_space, translate(NULL, LASI_HPA_715),
+ sysbus_mmio_get_region(
+ SYS_BUS_DEVICE(lasi_dev), 0));
+
+ /* Serial ports: Lasi use a 7.272727 MHz clock. */
+ serial_mm_init(addr_space, translate(NULL, LASI_HPA_715 + LASI_UART + 0x800), 0,
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_UART_HPA), 7272727 / 16,
+ serial_hd(0), DEVICE_BIG_ENDIAN);
+
+ /* Parallel port */
+ parallel_mm_init(addr_space, translate(NULL, LASI_HPA_715 + LASI_LPT + 0x800), 0,
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_LPT_HPA),
+ parallel_hds[0]);
+
+ /* PS/2 Keyboard/Mouse */
+ dev = qdev_new(TYPE_LASIPS2);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_PS2KBD_HPA));
+ memory_region_add_subregion(addr_space,
+ translate(NULL, LASI_HPA_715 + LASI_PS2),
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
+ 0));
+ memory_region_add_subregion(addr_space,
+ translate(NULL, LASI_HPA_715 + LASI_PS2 + 0x100),
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
+ 1));
+ /* SCSI disk setup. */
+ if (drive_get_max_bus(IF_SCSI) >= 0) {
+ dev = lasi_ncr710_init(addr_space,
+ translate(NULL, LASI_HPA_715 + 0x6000),
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_SCSI_HPA));
+ assert(dev);
+ lasi_ncr710_handle_legacy_cmdline(dev);
+ }
+
+ /* Add NICs, graphics & load firmware */
+ machine_HP_common_init_tail(machine, NULL, translate);
+}
+
/*
* Create HP B160L workstation
*/
@@ -603,7 +664,13 @@ static void machine_HP_B160L_init(MachineState *machine)
sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
1));
- /* Add SCSI discs, NICs, graphics & load firmware */
+ /* SCSI disk setup. */
+ if (drive_get_max_bus(IF_SCSI) >= 0) {
+ dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
+ lsi53c8xx_handle_legacy_cmdline(dev);
+ }
+
+ /* Add NICs, graphics & load firmware */
machine_HP_common_init_tail(machine, pci_bus, translate);
}
@@ -646,7 +713,13 @@ static void machine_HP_C3700_init(MachineState *machine)
pci_bus = PCI_BUS(qdev_get_child_bus(DEVICE(astro->elroy[0]), "pci"));
assert(pci_bus);
- /* Add SCSI discs, NICs, graphics & load firmware */
+ /* SCSI disk setup. */
+ if (drive_get_max_bus(IF_SCSI) >= 0) {
+ dev = DEVICE(pci_create_simple(pci_bus, -1, "lsi53c895a"));
+ lsi53c8xx_handle_legacy_cmdline(dev);
+ }
+
+ /* Add NICs, graphics & load firmware */
machine_HP_common_init_tail(machine, pci_bus, translate);
}
@@ -743,6 +816,25 @@ static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *data)
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[] = {
+ TYPE_HPPA_CPU,
+ NULL
+ };
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->desc = "HP 715/64 workstation";
+ mc->default_cpu_type = TYPE_HPPA_CPU;
+ mc->valid_cpu_types = valid_cpu_types;
+ mc->init = machine_HP_715_init;
+ /* can only support up to max. 8 CPUs due inventory major numbers */
+ mc->max_cpus = MIN_CONST(HPPA_MAX_CPUS, 8);
+ mc->default_ram_size = 256 * MiB;
+ mc->default_nic = NULL;
+}
+
+
static const TypeInfo hppa_machine_types[] = {
{
.name = TYPE_HPPA_COMMON_MACHINE,
@@ -762,6 +854,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("715"),
+ .parent = TYPE_HPPA_COMMON_MACHINE,
+ .class_init = HP_715_machine_init_class_init,
},
};
© 2016 - 2025 Red Hat, Inc.