target-sparc: fix up niagara machine
Remove the Niagara stub implementation from sun4u.c and add a machine, compatible with Legion simulator from the OpenSPARC T1 project. The machine uses the firmware supplied with the OpenSPARC T1 project, http://download.oracle.com/technetwork/systems/opensparc/OpenSPARCT1_Arch.1.5.tar.bz2 in the directory S10image/, and is able to boot the supplied Solaris 10 image. Note that for compatibility with the naming conventions for SPARC machines the new machine name is lowercase niagara. Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com> Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Artyom Tarasenko
parent
fff54d2269
commit
a2664ca0ec
13
MAINTAINERS
13
MAINTAINERS
|
|
@ -725,6 +725,13 @@ S: Maintained
|
|||
F: hw/sparc64/sun4u.c
|
||||
F: pc-bios/openbios-sparc64
|
||||
|
||||
Sun4v
|
||||
M: Artyom Tarasenko <atar4qemu@gmail.com>
|
||||
S: Maintained
|
||||
F: hw/sparc64/sun4v.c
|
||||
F: hw/timer/sun4v-rtc.c
|
||||
F: include/hw/timer/sun4v-rtc.h
|
||||
|
||||
Leon3
|
||||
M: Fabien Chouteau <chouteau@adacore.com>
|
||||
S: Maintained
|
||||
|
|
@ -1098,12 +1105,6 @@ F: hw/nvram/chrp_nvram.c
|
|||
F: include/hw/nvram/chrp_nvram.h
|
||||
F: tests/prom-env-test.c
|
||||
|
||||
sun4v RTC
|
||||
M: Artyom Tarasenko <atar4qemu@gmail.com>
|
||||
S: Maintained
|
||||
F: hw/timer/sun4v-rtc.c
|
||||
F: include/hw/timer/sun4v-rtc.h
|
||||
|
||||
Subsystems
|
||||
----------
|
||||
Audio
|
||||
|
|
|
|||
|
|
@ -13,3 +13,5 @@ CONFIG_IDE_CMD646=y
|
|||
CONFIG_PCI_APB=y
|
||||
CONFIG_MC146818RTC=y
|
||||
CONFIG_ISA_TESTDEV=y
|
||||
CONFIG_EMPTY_SLOT=y
|
||||
CONFIG_SUN4V_RTC=y
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
obj-y += sparc64.o
|
||||
obj-y += sun4u.o
|
||||
obj-y += niagara.o
|
||||
|
|
@ -0,0 +1,177 @@
|
|||
/*
|
||||
* QEMU Sun4v/Niagara System Emulator
|
||||
*
|
||||
* Copyright (c) 2016 Artyom Tarasenko
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu-common.h"
|
||||
#include "cpu.h"
|
||||
#include "hw/hw.h"
|
||||
#include "hw/boards.h"
|
||||
#include "hw/char/serial.h"
|
||||
#include "hw/empty_slot.h"
|
||||
#include "hw/loader.h"
|
||||
#include "hw/sparc/sparc64.h"
|
||||
#include "hw/timer/sun4v-rtc.h"
|
||||
#include "exec/address-spaces.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
|
||||
|
||||
typedef struct NiagaraBoardState {
|
||||
MemoryRegion hv_ram;
|
||||
MemoryRegion partition_ram;
|
||||
MemoryRegion nvram;
|
||||
MemoryRegion md_rom;
|
||||
MemoryRegion hv_rom;
|
||||
MemoryRegion vdisk_ram;
|
||||
MemoryRegion prom;
|
||||
} NiagaraBoardState;
|
||||
|
||||
#define NIAGARA_HV_RAM_BASE 0x100000ULL
|
||||
#define NIAGARA_HV_RAM_SIZE 0x3f00000ULL /* 63 MiB */
|
||||
|
||||
#define NIAGARA_PARTITION_RAM_BASE 0x80000000ULL
|
||||
|
||||
#define NIAGARA_UART_BASE 0x1f10000000ULL
|
||||
|
||||
#define NIAGARA_NVRAM_BASE 0x1f11000000ULL
|
||||
#define NIAGARA_NVRAM_SIZE 0x2000
|
||||
|
||||
#define NIAGARA_MD_ROM_BASE 0x1f12000000ULL
|
||||
#define NIAGARA_MD_ROM_SIZE 0x2000
|
||||
|
||||
#define NIAGARA_HV_ROM_BASE 0x1f12080000ULL
|
||||
#define NIAGARA_HV_ROM_SIZE 0x2000
|
||||
|
||||
#define NIAGARA_IOBBASE 0x9800000000ULL
|
||||
#define NIAGARA_IOBSIZE 0x0100000000ULL
|
||||
|
||||
#define NIAGARA_VDISK_BASE 0x1f40000000ULL
|
||||
#define NIAGARA_RTC_BASE 0xfff0c1fff8ULL
|
||||
#define NIAGARA_UART_BASE 0x1f10000000ULL
|
||||
|
||||
/* Firmware layout
|
||||
*
|
||||
* |------------------|
|
||||
* | openboot.bin |
|
||||
* |------------------| PROM_ADDR + OBP_OFFSET
|
||||
* | q.bin |
|
||||
* |------------------| PROM_ADDR + Q_OFFSET
|
||||
* | reset.bin |
|
||||
* |------------------| PROM_ADDR
|
||||
*/
|
||||
#define NIAGARA_PROM_BASE 0xfff0000000ULL
|
||||
#define NIAGARA_Q_OFFSET 0x10000ULL
|
||||
#define NIAGARA_OBP_OFFSET 0x80000ULL
|
||||
#define PROM_SIZE_MAX (4 * 1024 * 1024)
|
||||
|
||||
/* Niagara hardware initialisation */
|
||||
static void niagara_init(MachineState *machine)
|
||||
{
|
||||
NiagaraBoardState *s = g_new(NiagaraBoardState, 1);
|
||||
DriveInfo *dinfo = drive_get_next(IF_PFLASH);
|
||||
MemoryRegion *sysmem = get_system_memory();
|
||||
|
||||
/* init CPUs */
|
||||
sparc64_cpu_devinit(machine->cpu_model, "Sun UltraSparc T1",
|
||||
NIAGARA_PROM_BASE);
|
||||
/* set up devices */
|
||||
memory_region_allocate_system_memory(&s->hv_ram, NULL, "sun4v-hv.ram",
|
||||
NIAGARA_HV_RAM_SIZE);
|
||||
memory_region_add_subregion(sysmem, NIAGARA_HV_RAM_BASE, &s->hv_ram);
|
||||
|
||||
memory_region_allocate_system_memory(&s->partition_ram, NULL,
|
||||
"sun4v-partition.ram",
|
||||
machine->ram_size);
|
||||
memory_region_add_subregion(sysmem, NIAGARA_PARTITION_RAM_BASE,
|
||||
&s->partition_ram);
|
||||
|
||||
memory_region_allocate_system_memory(&s->nvram, NULL,
|
||||
"sun4v.nvram", NIAGARA_NVRAM_SIZE);
|
||||
memory_region_add_subregion(sysmem, NIAGARA_NVRAM_BASE, &s->nvram);
|
||||
memory_region_allocate_system_memory(&s->md_rom, NULL,
|
||||
"sun4v-md.rom", NIAGARA_MD_ROM_SIZE);
|
||||
memory_region_add_subregion(sysmem, NIAGARA_MD_ROM_BASE, &s->md_rom);
|
||||
memory_region_allocate_system_memory(&s->hv_rom, NULL,
|
||||
"sun4v-hv.rom", NIAGARA_HV_ROM_SIZE);
|
||||
memory_region_add_subregion(sysmem, NIAGARA_HV_ROM_BASE, &s->hv_rom);
|
||||
memory_region_allocate_system_memory(&s->prom, NULL,
|
||||
"sun4v.prom", PROM_SIZE_MAX);
|
||||
memory_region_add_subregion(sysmem, NIAGARA_PROM_BASE, &s->prom);
|
||||
|
||||
rom_add_file_fixed("nvram1", NIAGARA_NVRAM_BASE, -1);
|
||||
rom_add_file_fixed("1up-md.bin", NIAGARA_MD_ROM_BASE, -1);
|
||||
rom_add_file_fixed("1up-hv.bin", NIAGARA_HV_ROM_BASE, -1);
|
||||
|
||||
rom_add_file_fixed("reset.bin", NIAGARA_PROM_BASE, -1);
|
||||
rom_add_file_fixed("q.bin", NIAGARA_PROM_BASE + NIAGARA_Q_OFFSET, -1);
|
||||
rom_add_file_fixed("openboot.bin", NIAGARA_PROM_BASE + NIAGARA_OBP_OFFSET,
|
||||
-1);
|
||||
|
||||
/* the virtual ramdisk is kind of initrd, but it resides
|
||||
outside of the partition RAM */
|
||||
if (dinfo) {
|
||||
BlockBackend *blk = blk_by_legacy_dinfo(dinfo);
|
||||
int size = blk_getlength(blk);
|
||||
if (size > 0) {
|
||||
memory_region_allocate_system_memory(&s->vdisk_ram, NULL,
|
||||
"sun4v_vdisk.ram", size);
|
||||
memory_region_add_subregion(get_system_memory(),
|
||||
NIAGARA_VDISK_BASE, &s->vdisk_ram);
|
||||
dinfo->is_default = 1;
|
||||
rom_add_file_fixed(blk_bs(blk)->filename, NIAGARA_VDISK_BASE, -1);
|
||||
} else {
|
||||
fprintf(stderr, "qemu: could not load ram disk '%s'\n",
|
||||
blk_bs(blk)->filename);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, 115200,
|
||||
serial_hds[0], DEVICE_BIG_ENDIAN);
|
||||
|
||||
empty_slot_init(NIAGARA_IOBBASE, NIAGARA_IOBSIZE);
|
||||
sun4v_rtc_init(NIAGARA_RTC_BASE);
|
||||
}
|
||||
|
||||
static void niagara_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
|
||||
mc->desc = "Sun4v platform, Niagara";
|
||||
mc->init = niagara_init;
|
||||
mc->max_cpus = 1; /* XXX for now */
|
||||
mc->default_boot_order = "c";
|
||||
}
|
||||
|
||||
static const TypeInfo niagara_type = {
|
||||
.name = MACHINE_TYPE_NAME("niagara"),
|
||||
.parent = TYPE_MACHINE,
|
||||
.class_init = niagara_class_init,
|
||||
};
|
||||
|
||||
static void niagara_register_types(void)
|
||||
{
|
||||
type_register_static(&niagara_type);
|
||||
}
|
||||
|
||||
type_init(niagara_register_types)
|
||||
|
|
@ -542,7 +542,6 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
|
|||
enum {
|
||||
sun4u_id = 0,
|
||||
sun4v_id = 64,
|
||||
niagara_id,
|
||||
};
|
||||
|
||||
static const struct hwdef hwdefs[] = {
|
||||
|
|
@ -560,13 +559,6 @@ static const struct hwdef hwdefs[] = {
|
|||
.prom_addr = 0x1fff0000000ULL,
|
||||
.console_serial_base = 0,
|
||||
},
|
||||
/* Sun4v generic Niagara machine */
|
||||
{
|
||||
.default_cpu_model = "Sun UltraSparc T1",
|
||||
.machine_id = niagara_id,
|
||||
.prom_addr = 0xfff0000000ULL,
|
||||
.console_serial_base = 0xfff0c2c000ULL,
|
||||
},
|
||||
};
|
||||
|
||||
/* Sun4u hardware initialisation */
|
||||
|
|
@ -581,12 +573,6 @@ static void sun4v_init(MachineState *machine)
|
|||
sun4uv_init(get_system_memory(), machine, &hwdefs[1]);
|
||||
}
|
||||
|
||||
/* Niagara hardware initialisation */
|
||||
static void niagara_init(MachineState *machine)
|
||||
{
|
||||
sun4uv_init(get_system_memory(), machine, &hwdefs[2]);
|
||||
}
|
||||
|
||||
static void sun4u_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
|
|
@ -620,22 +606,6 @@ static const TypeInfo sun4v_type = {
|
|||
.class_init = sun4v_class_init,
|
||||
};
|
||||
|
||||
static void niagara_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
|
||||
mc->desc = "Sun4v platform, Niagara";
|
||||
mc->init = niagara_init;
|
||||
mc->max_cpus = 1; /* XXX for now */
|
||||
mc->default_boot_order = "c";
|
||||
}
|
||||
|
||||
static const TypeInfo niagara_type = {
|
||||
.name = MACHINE_TYPE_NAME("Niagara"),
|
||||
.parent = TYPE_MACHINE,
|
||||
.class_init = niagara_class_init,
|
||||
};
|
||||
|
||||
static void sun4u_register_types(void)
|
||||
{
|
||||
type_register_static(&ebus_info);
|
||||
|
|
@ -644,7 +614,6 @@ static void sun4u_register_types(void)
|
|||
|
||||
type_register_static(&sun4u_type);
|
||||
type_register_static(&sun4v_type);
|
||||
type_register_static(&niagara_type);
|
||||
}
|
||||
|
||||
type_init(sun4u_register_types)
|
||||
|
|
|
|||
|
|
@ -2138,7 +2138,17 @@ Use the executable @file{qemu-system-sparc64} to simulate a Sun4u
|
|||
(UltraSPARC PC-like machine), Sun4v (T1 PC-like machine), or generic
|
||||
Niagara (T1) machine. The Sun4u emulator is mostly complete, being
|
||||
able to run Linux, NetBSD and OpenBSD in headless (-nographic) mode. The
|
||||
Sun4v and Niagara emulators are still a work in progress.
|
||||
Sun4v emulator is still a work in progress.
|
||||
|
||||
The Niagara T1 emulator makes use of firmware and OS binaries supplied in the S10image/ directory
|
||||
of the OpenSPARC T1 project @url{http://download.oracle.com/technetwork/systems/opensparc/OpenSPARCT1_Arch.1.5.tar.bz2}
|
||||
and is able to boot the disk.s10hw2 Solaris image.
|
||||
@example
|
||||
qemu-system-sparc64 -M niagara -L /path-to/S10image/ \
|
||||
-nographic -m 256 \
|
||||
-drive if=pflash,readonly=on,file=/S10image/disk.s10hw2
|
||||
@end example
|
||||
|
||||
|
||||
QEMU emulates the following peripherals:
|
||||
|
||||
|
|
@ -2173,7 +2183,7 @@ Set OpenBIOS variables in NVRAM, for example:
|
|||
qemu-system-sparc64 -prom-env 'auto-boot?=false'
|
||||
@end example
|
||||
|
||||
@item -M [sun4u|sun4v|Niagara]
|
||||
@item -M [sun4u|sun4v|niagara]
|
||||
|
||||
Set the emulated machine type. The default is sun4u.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue