Bug fixes: * Fix die-id validation regression (Eduardo Habkost) * vmmouse: Properly reset state (Jan Kiszka) * hostmem-file: fix pmem file size check (Stefan Hajnoczi) * Keep query-hotpluggable-cpus output compatible with older QEMU if '-smp dies' is not set (Igor Mammedov) * migration: Do not re-read the clock on pre_save in case of paused guest (Maxiwell S. Garcia) Cleanups: * NUMA code cleanups (Tao Xu) * Remove stale externs from includes (Alex Bennée) Features: * qapi: report the default CPU type for each machine (Daniel P. Berrangé) -----BEGIN PGP SIGNATURE----- iQJIBAABCAAyFiEEWjIv1avE09usz9GqKAeTb5hNxaYFAl1u08EUHGVoYWJrb3N0 QHJlZGhhdC5jb20ACgkQKAeTb5hNxaaKGQ//WQY+JQgXj2M7i5bAuz1lkR0QKJvh n++70ugqNmmlj1YH7LKmZNll0tz+auo25PLgEBOamPZPFQXxkRhPBxTUnOdQJ1UC bSwyRzHrFluVITXD/nGkIXgmP4rjXil5QBWTxneWb7zYsXDGBEnauZnC1YsXzc9T 5LISvc5zEz6pEzz5s3LdUJ947jTui/dDHVHupeyK/5bPkiPoKVoymsd4p8rvAmFw 4obMftjuFzklm8oLPKpHYAm7VvXj5yb92/FE/ZKdaahcLPGStWixiHJ7xJlGMBti GqcWca+2sdbsraOz4Pg05x//vbOgiwIECqgKJRlJSAnG7Roz7E6J/xXQIYIkhpkL Sn0+s181WtFeNFlQgEP056iTUCq81oBjek2XzgsXzuQyFip5IJGLLQox4E+w0ty6 7houoCkJD70ddl3sEj/koXi6rBeswNStfuxVYxUgwYa7HecehNvVD5q9NlElRhev Lce4szuWJzHBbhW5ubGmN6rCbXNa+mPrBunrDwbjApl12DFkr163dj9DsyN/DUgy MmfsgqpKZ+g18VSajck2QtvTg+9Oqv0bv3SWtpDwzDxS9VULz0r2wfcN9TZDipV0 qCZWg39BpCIgdd4s5L0q6bamC9+eSwoByFx54WrkoQT81odHJqUHNsCE9wnoNvmG aZlV3idjGmsTFiE= =u5HZ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging Machine + x86 queue, 2019-09-03 Bug fixes: * Fix die-id validation regression (Eduardo Habkost) * vmmouse: Properly reset state (Jan Kiszka) * hostmem-file: fix pmem file size check (Stefan Hajnoczi) * Keep query-hotpluggable-cpus output compatible with older QEMU if '-smp dies' is not set (Igor Mammedov) * migration: Do not re-read the clock on pre_save in case of paused guest (Maxiwell S. Garcia) Cleanups: * NUMA code cleanups (Tao Xu) * Remove stale externs from includes (Alex Bennée) Features: * qapi: report the default CPU type for each machine (Daniel P. Berrangé) # gpg: Signature made Tue 03 Sep 2019 21:57:37 BST # gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6 # gpg: issuer "ehabkost@redhat.com" # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full] # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-next-pull-request: migration: Do not re-read the clock on pre_save in case of paused guest x86: do not advertise die-id in query-hotpluggbale-cpus if '-smp dies' is not set i386/vmmouse: Properly reset state hostmem-file: fix pmem file size check qapi: report the default CPU type for each machine pc: Don't make die-id mandatory unless necessary pc: Improve error message when die-id is omitted pc: Fix error message on die-id validation numa: move numa global variable numa_info into MachineState numa: move numa global variable have_numa_distance into MachineState numa: move numa global variable nb_numa_nodes into MachineState hw/arm: simplify arm_load_dtb includes: remove stale [smp|max]_cpus externs Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
199 lines
6.3 KiB
C
199 lines
6.3 KiB
C
/*
|
|
* Samsung exynos4 SoC based boards emulation
|
|
*
|
|
* Copyright (c) 2011 Samsung Electronics Co., Ltd. All rights reserved.
|
|
* Maksim Kozlov <m.kozlov@samsung.com>
|
|
* Evgeny Voevodin <e.voevodin@samsung.com>
|
|
* Igor Mitsyanko <i.mitsyanko@samsung.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/units.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/error-report.h"
|
|
#include "cpu.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "hw/sysbus.h"
|
|
#include "net/net.h"
|
|
#include "hw/arm/boot.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "hw/arm/exynos4210.h"
|
|
#include "hw/net/lan9118.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/irq.h"
|
|
|
|
#define SMDK_LAN9118_BASE_ADDR 0x05000000
|
|
|
|
typedef enum Exynos4BoardType {
|
|
EXYNOS4_BOARD_NURI,
|
|
EXYNOS4_BOARD_SMDKC210,
|
|
EXYNOS4_NUM_OF_BOARDS
|
|
} Exynos4BoardType;
|
|
|
|
typedef struct Exynos4BoardState {
|
|
Exynos4210State soc;
|
|
MemoryRegion dram0_mem;
|
|
MemoryRegion dram1_mem;
|
|
} Exynos4BoardState;
|
|
|
|
static int exynos4_board_id[EXYNOS4_NUM_OF_BOARDS] = {
|
|
[EXYNOS4_BOARD_NURI] = 0xD33,
|
|
[EXYNOS4_BOARD_SMDKC210] = 0xB16,
|
|
};
|
|
|
|
static int exynos4_board_smp_bootreg_addr[EXYNOS4_NUM_OF_BOARDS] = {
|
|
[EXYNOS4_BOARD_NURI] = EXYNOS4210_SECOND_CPU_BOOTREG,
|
|
[EXYNOS4_BOARD_SMDKC210] = EXYNOS4210_SECOND_CPU_BOOTREG,
|
|
};
|
|
|
|
static unsigned long exynos4_board_ram_size[EXYNOS4_NUM_OF_BOARDS] = {
|
|
[EXYNOS4_BOARD_NURI] = 1 * GiB,
|
|
[EXYNOS4_BOARD_SMDKC210] = 1 * GiB,
|
|
};
|
|
|
|
static struct arm_boot_info exynos4_board_binfo = {
|
|
.loader_start = EXYNOS4210_BASE_BOOT_ADDR,
|
|
.smp_loader_start = EXYNOS4210_SMP_BOOT_ADDR,
|
|
.nb_cpus = EXYNOS4210_NCPUS,
|
|
.write_secondary_boot = exynos4210_write_secondary,
|
|
};
|
|
|
|
static void lan9215_init(uint32_t base, qemu_irq irq)
|
|
{
|
|
DeviceState *dev;
|
|
SysBusDevice *s;
|
|
|
|
/* This should be a 9215 but the 9118 is close enough */
|
|
if (nd_table[0].used) {
|
|
qemu_check_nic_model(&nd_table[0], "lan9118");
|
|
dev = qdev_create(NULL, TYPE_LAN9118);
|
|
qdev_set_nic_properties(dev, &nd_table[0]);
|
|
qdev_prop_set_uint32(dev, "mode_16bit", 1);
|
|
qdev_init_nofail(dev);
|
|
s = SYS_BUS_DEVICE(dev);
|
|
sysbus_mmio_map(s, 0, base);
|
|
sysbus_connect_irq(s, 0, irq);
|
|
}
|
|
}
|
|
|
|
static void exynos4_boards_init_ram(Exynos4BoardState *s,
|
|
MemoryRegion *system_mem,
|
|
unsigned long ram_size)
|
|
{
|
|
unsigned long mem_size = ram_size;
|
|
|
|
if (mem_size > EXYNOS4210_DRAM_MAX_SIZE) {
|
|
memory_region_init_ram(&s->dram1_mem, NULL, "exynos4210.dram1",
|
|
mem_size - EXYNOS4210_DRAM_MAX_SIZE,
|
|
&error_fatal);
|
|
memory_region_add_subregion(system_mem, EXYNOS4210_DRAM1_BASE_ADDR,
|
|
&s->dram1_mem);
|
|
mem_size = EXYNOS4210_DRAM_MAX_SIZE;
|
|
}
|
|
|
|
memory_region_init_ram(&s->dram0_mem, NULL, "exynos4210.dram0", mem_size,
|
|
&error_fatal);
|
|
memory_region_add_subregion(system_mem, EXYNOS4210_DRAM0_BASE_ADDR,
|
|
&s->dram0_mem);
|
|
}
|
|
|
|
static Exynos4BoardState *
|
|
exynos4_boards_init_common(MachineState *machine,
|
|
Exynos4BoardType board_type)
|
|
{
|
|
Exynos4BoardState *s = g_new(Exynos4BoardState, 1);
|
|
|
|
exynos4_board_binfo.ram_size = exynos4_board_ram_size[board_type];
|
|
exynos4_board_binfo.board_id = exynos4_board_id[board_type];
|
|
exynos4_board_binfo.smp_bootreg_addr =
|
|
exynos4_board_smp_bootreg_addr[board_type];
|
|
exynos4_board_binfo.gic_cpu_if_addr =
|
|
EXYNOS4210_SMP_PRIVATE_BASE_ADDR + 0x100;
|
|
|
|
exynos4_boards_init_ram(s, get_system_memory(),
|
|
exynos4_board_ram_size[board_type]);
|
|
|
|
sysbus_init_child_obj(OBJECT(machine), "soc",
|
|
&s->soc, sizeof(s->soc), TYPE_EXYNOS4210_SOC);
|
|
object_property_set_bool(OBJECT(&s->soc), true, "realized",
|
|
&error_fatal);
|
|
|
|
return s;
|
|
}
|
|
|
|
static void nuri_init(MachineState *machine)
|
|
{
|
|
exynos4_boards_init_common(machine, EXYNOS4_BOARD_NURI);
|
|
|
|
arm_load_kernel(ARM_CPU(first_cpu), machine, &exynos4_board_binfo);
|
|
}
|
|
|
|
static void smdkc210_init(MachineState *machine)
|
|
{
|
|
Exynos4BoardState *s = exynos4_boards_init_common(machine,
|
|
EXYNOS4_BOARD_SMDKC210);
|
|
|
|
lan9215_init(SMDK_LAN9118_BASE_ADDR,
|
|
qemu_irq_invert(s->soc.irq_table[exynos4210_get_irq(37, 1)]));
|
|
arm_load_kernel(ARM_CPU(first_cpu), machine, &exynos4_board_binfo);
|
|
}
|
|
|
|
static void nuri_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
mc->desc = "Samsung NURI board (Exynos4210)";
|
|
mc->init = nuri_init;
|
|
mc->max_cpus = EXYNOS4210_NCPUS;
|
|
mc->min_cpus = EXYNOS4210_NCPUS;
|
|
mc->default_cpus = EXYNOS4210_NCPUS;
|
|
mc->ignore_memory_transaction_failures = true;
|
|
}
|
|
|
|
static const TypeInfo nuri_type = {
|
|
.name = MACHINE_TYPE_NAME("nuri"),
|
|
.parent = TYPE_MACHINE,
|
|
.class_init = nuri_class_init,
|
|
};
|
|
|
|
static void smdkc210_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
mc->desc = "Samsung SMDKC210 board (Exynos4210)";
|
|
mc->init = smdkc210_init;
|
|
mc->max_cpus = EXYNOS4210_NCPUS;
|
|
mc->min_cpus = EXYNOS4210_NCPUS;
|
|
mc->default_cpus = EXYNOS4210_NCPUS;
|
|
mc->ignore_memory_transaction_failures = true;
|
|
}
|
|
|
|
static const TypeInfo smdkc210_type = {
|
|
.name = MACHINE_TYPE_NAME("smdkc210"),
|
|
.parent = TYPE_MACHINE,
|
|
.class_init = smdkc210_class_init,
|
|
};
|
|
|
|
static void exynos4_machines_init(void)
|
|
{
|
|
type_register_static(&nuri_type);
|
|
type_register_static(&smdkc210_type);
|
|
}
|
|
|
|
type_init(exynos4_machines_init)
|