On 2/25/21 8:47 PM, BALATON Zoltan wrote:
> Add new machine called pegasos2 emulating the Genesi/bPlan Pegasos II,
> a PowerPC board based on the Marvell MV64361 system controller and the
> VIA VT8231 integrated south bridge/superio chips. It can run Linux,
> AmigaOS and a wide range of MorphOS versions. Currently a firmware ROM
> image is needed to boot and only MorphOS has a video driver to produce
> graphics output. Linux could work too but distros that supported this
> machine don't include usual video drivers so those only run with
> serial console for now.
>
> Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
> ---
> MAINTAINERS | 10 ++
> default-configs/devices/ppc-softmmu.mak | 2 +
> hw/ppc/Kconfig | 10 ++
> hw/ppc/meson.build | 2 +
> hw/ppc/pegasos2.c | 144 ++++++++++++++++++++++++
> 5 files changed, 168 insertions(+)
> create mode 100644 hw/ppc/pegasos2.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 9b2aa18e1f..a023217702 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1345,6 +1345,16 @@ F: pc-bios/canyonlands.dt[sb]
> F: pc-bios/u-boot-sam460ex-20100605.bin
> F: roms/u-boot-sam460ex
>
> +pegasos2
> +M: BALATON Zoltan <bala...@eik.bme.hu>
> +R: David Gibson <da...@gibson.dropbear.id.au>
:)
> +L: qemu-...@nongnu.org
> +S: Maintained
> +F: hw/ppc/pegasos2.c
> +F: hw/pci-host/mv64361.c
> +F: hw/pci-host/mv643xx.h
> +F: include/hw/pci-host/mv64361.h
> +
> RISC-V Machines
> ---------------
> OpenTitan
> diff --git a/default-configs/devices/ppc-softmmu.mak
> b/default-configs/devices/ppc-softmmu.mak
> index 61b78b844d..4535993d8d 100644
> --- a/default-configs/devices/ppc-softmmu.mak
> +++ b/default-configs/devices/ppc-softmmu.mak
> @@ -14,5 +14,7 @@ CONFIG_SAM460EX=y
> CONFIG_MAC_OLDWORLD=y
> CONFIG_MAC_NEWWORLD=y
>
> +CONFIG_PEGASOS2=y
> +
> # For PReP
> CONFIG_PREP=y
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index d11dc30509..98d8dd1a84 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -68,6 +68,16 @@ config SAM460EX
> select USB_OHCI
> select FDT_PPC
>
> +config PEGASOS2
> + bool
> + select MV64361
> + select VT82C686
> + select IDE_VIA
> + select SMBUS_EEPROM
> +# These should come with VT82C686
> + select APM
> + select ACPI_X86
> +
> config PREP
> bool
> imply PCI_DEVICES
> diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build
> index 218631c883..86d6f379d1 100644
> --- a/hw/ppc/meson.build
> +++ b/hw/ppc/meson.build
> @@ -78,5 +78,7 @@ ppc_ss.add(when: 'CONFIG_E500', if_true: files(
> ))
> # PowerPC 440 Xilinx ML507 reference board.
> ppc_ss.add(when: 'CONFIG_VIRTEX', if_true: files('virtex_ml507.c'))
> +# Pegasos2
> +ppc_ss.add(when: 'CONFIG_PEGASOS2', if_true: files('pegasos2.c'))
>
> hw_arch += {'ppc': ppc_ss}
> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> new file mode 100644
> index 0000000000..427e884fbf
> --- /dev/null
> +++ b/hw/ppc/pegasos2.c
> @@ -0,0 +1,144 @@
> +/*
> + * QEMU PowerPC CHRP (Genesi/bPlan Pegasos II) hardware System Emulator
> + *
> + * Copyright (c) 2018-2020 BALATON Zoltan
2018-2021
> + *
> + * This work is licensed under the GNU GPL license version 2 or later.
> + *
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu-common.h"
> +#include "qemu/units.h"
> +#include "qapi/error.h"
> +#include "hw/hw.h"
> +#include "hw/ppc/ppc.h"
> +#include "hw/sysbus.h"
> +#include "hw/pci/pci_host.h"
> +#include "hw/irq.h"
> +#include "hw/pci-host/mv64361.h"
> +#include "hw/isa/vt82c686.h"
> +#include "hw/ide/pci.h"
> +#include "hw/i2c/smbus_eeprom.h"
> +#include "hw/qdev-properties.h"
> +#include "sysemu/reset.h"
> +#include "hw/boards.h"
> +#include "hw/loader.h"
> +#include "hw/fw-path-provider.h"
> +#include "elf.h"
> +#include "qemu/log.h"
> +#include "qemu/error-report.h"
> +#include "sysemu/kvm.h"
> +#include "kvm_ppc.h"
> +#include "exec/address-spaces.h"
> +#include "trace.h"
> +#include "qemu/datadir.h"
> +#include "sysemu/device_tree.h"
> +
> +#define PROM_FILENAME "pegasos2.rom"
> +#define PROM_ADDR 0xfff00000
> +#define PROM_SIZE 0x80000
> +
> +#define BUS_FREQ 133333333
Can you rename as BUS_FREQ_HZ?
> +
> +static void pegasos2_cpu_reset(void *opaque)
> +{
> + PowerPCCPU *cpu = opaque;
> +
> + cpu_reset(CPU(cpu));
> + cpu->env.spr[SPR_HID1] = 7ULL << 28;
> +}
> +
> +static void pegasos2_init(MachineState *machine)
> +{
> + PowerPCCPU *cpu = NULL;
> + MemoryRegion *rom = g_new(MemoryRegion, 1);
> + DeviceState *mv;
> + PCIBus *pci_bus;
> + PCIDevice *dev;
> + I2CBus *i2c_bus;
> + const char *fwname = machine->firmware ?: PROM_FILENAME;
> + char *filename;
> + int sz;
> + uint8_t *spd_data;
> +
> + /* init CPU */
> + cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
> + if (PPC_INPUT(&cpu->env) != PPC_FLAGS_INPUT_6xx) {
> + error_report("Incompatible CPU, only 6xx bus supported");
> + exit(1);
> + }
> +
> + /* Set time-base frequency */
> + cpu_ppc_tb_init(&cpu->env, BUS_FREQ / 4);
> + qemu_register_reset(pegasos2_cpu_reset, cpu);
> +
> + /* RAM */
> + memory_region_add_subregion(get_system_memory(), 0, machine->ram);
> +
> + /* allocate and load firmware */
> + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, fwname);
> + if (!filename) {
> + error_report("Could not find firmware '%s'", fwname);
> + exit(1);
> + }
> + memory_region_init_rom(rom, NULL, "pegasos2.rom", PROM_SIZE,
> &error_fatal);
> + memory_region_add_subregion(get_system_memory(), PROM_ADDR, rom);
> + sz = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1,
> + PPC_ELF_MACHINE, 0, 0);
> + if (sz <= 0) {
> + sz = load_image_targphys(filename, PROM_ADDR, PROM_SIZE);
> + }
> + if (sz <= 0 || sz > PROM_SIZE) {
> + error_report("Could not load firmware '%s'", filename);
> + exit(1);
> + }
> + g_free(filename);
> +
> + /* Marvell Discovery II system controller */
> + mv = DEVICE(sysbus_create_simple(TYPE_MV64361, -1,
> + ((qemu_irq
> *)cpu->env.irq_inputs)[PPC6xx_INPUT_INT]));
Indent off.
Otherwise:
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
