- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
Move a lot of declarations from these legacy mixed bag headers:
. "exec/cpu-all.h"
. "exec/cpu-common.h"
. "exec/cpu-defs.h"
. "exec/exec-all.h"
. "exec/translate-all"
to these more specific ones:
. "exec/page-protection.h"
. "exec/translation-block.h"
. "user/cpu_loop.h"
. "user/guest-host.h"
. "user/page-protection.h"
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
+kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
=cjz8
-----END PGP SIGNATURE-----
Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
Move a lot of declarations from these legacy mixed bag headers:
. "exec/cpu-all.h"
. "exec/cpu-common.h"
. "exec/cpu-defs.h"
. "exec/exec-all.h"
. "exec/translate-all"
to these more specific ones:
. "exec/page-protection.h"
. "exec/translation-block.h"
. "user/cpu_loop.h"
. "user/guest-host.h"
. "user/page-protection.h"
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
# wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
# KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
# A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
# 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
# 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
# xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
# VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
# ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
# 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
# +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
# x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
# =cjz8
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 20 Dec 2024 11:45:20 EST
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits)
util/qemu-timer: fix indentation
meson: Do not define CONFIG_DEVICES on user emulation
system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header
system/numa: Remove unnecessary 'exec/cpu-common.h' header
hw/xen: Remove unnecessary 'exec/cpu-common.h' header
target/mips: Drop left-over comment about Jazz machine
target/mips: Remove tswap() calls in semihosting uhi_fstat_cb()
target/xtensa: Remove tswap() calls in semihosting simcall() helper
accel/tcg: Un-inline translator_is_same_page()
accel/tcg: Include missing 'exec/translation-block.h' header
accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h'
accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'
qemu/coroutine: Include missing 'qemu/atomic.h' header
exec/translation-block: Include missing 'qemu/atomic.h' header
accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h'
exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined
target/sparc: Move sparc_restore_state_to_opc() to cpu.c
target/sparc: Uninline cpu_get_tb_cpu_state()
target/loongarch: Declare loongarch_cpu_dump_state() locally
user: Move various declarations out of 'exec/exec-all.h'
...
Conflicts:
hw/char/riscv_htif.c
hw/intc/riscv_aplic.c
target/s390x/cpu.c
Apply sysemu header path changes to not in the pull request.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
181 lines
6.5 KiB
C
181 lines
6.5 KiB
C
/*
|
|
* Cortex-A15MPCore internal peripheral emulation.
|
|
*
|
|
* Copyright (c) 2012 Linaro Limited.
|
|
* Written by Peter Maydell.
|
|
*
|
|
* 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 "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/cpu/a15mpcore.h"
|
|
#include "hw/irq.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "system/kvm.h"
|
|
#include "kvm_arm.h"
|
|
#include "target/arm/gtimer.h"
|
|
|
|
static void a15mp_priv_set_irq(void *opaque, int irq, int level)
|
|
{
|
|
A15MPPrivState *s = (A15MPPrivState *)opaque;
|
|
|
|
qemu_set_irq(qdev_get_gpio_in(DEVICE(&s->gic), irq), level);
|
|
}
|
|
|
|
static void a15mp_priv_initfn(Object *obj)
|
|
{
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
|
A15MPPrivState *s = A15MPCORE_PRIV(obj);
|
|
|
|
memory_region_init(&s->container, obj, "a15mp-priv-container", 0x8000);
|
|
sysbus_init_mmio(sbd, &s->container);
|
|
|
|
object_initialize_child(obj, "gic", &s->gic, gic_class_name());
|
|
qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 2);
|
|
}
|
|
|
|
static void a15mp_priv_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
|
A15MPPrivState *s = A15MPCORE_PRIV(dev);
|
|
DeviceState *gicdev;
|
|
SysBusDevice *busdev;
|
|
int i;
|
|
bool has_el3;
|
|
bool has_el2 = false;
|
|
Object *cpuobj;
|
|
|
|
gicdev = DEVICE(&s->gic);
|
|
qdev_prop_set_uint32(gicdev, "num-cpu", s->num_cpu);
|
|
qdev_prop_set_uint32(gicdev, "num-irq", s->num_irq);
|
|
|
|
if (!kvm_irqchip_in_kernel()) {
|
|
/* Make the GIC's TZ support match the CPUs. We assume that
|
|
* either all the CPUs have TZ, or none do.
|
|
*/
|
|
cpuobj = OBJECT(qemu_get_cpu(0));
|
|
has_el3 = object_property_find(cpuobj, "has_el3") &&
|
|
object_property_get_bool(cpuobj, "has_el3", &error_abort);
|
|
qdev_prop_set_bit(gicdev, "has-security-extensions", has_el3);
|
|
/* Similarly for virtualization support */
|
|
has_el2 = object_property_find(cpuobj, "has_el2") &&
|
|
object_property_get_bool(cpuobj, "has_el2", &error_abort);
|
|
qdev_prop_set_bit(gicdev, "has-virtualization-extensions", has_el2);
|
|
}
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gic), errp)) {
|
|
return;
|
|
}
|
|
busdev = SYS_BUS_DEVICE(&s->gic);
|
|
|
|
/* Pass through outbound IRQ lines from the GIC */
|
|
sysbus_pass_irq(sbd, busdev);
|
|
|
|
/* Pass through inbound GPIO lines to the GIC */
|
|
qdev_init_gpio_in(dev, a15mp_priv_set_irq, s->num_irq - 32);
|
|
|
|
/* Wire the outputs from each CPU's generic timer to the
|
|
* appropriate GIC PPI inputs
|
|
*/
|
|
for (i = 0; i < s->num_cpu; i++) {
|
|
DeviceState *cpudev = DEVICE(qemu_get_cpu(i));
|
|
int ppibase = s->num_irq - 32 + i * 32;
|
|
int irq;
|
|
/* Mapping from the output timer irq lines from the CPU to the
|
|
* GIC PPI inputs used on the A15:
|
|
*/
|
|
const int timer_irq[] = {
|
|
[GTIMER_PHYS] = 30,
|
|
[GTIMER_VIRT] = 27,
|
|
[GTIMER_HYP] = 26,
|
|
[GTIMER_SEC] = 29,
|
|
};
|
|
for (irq = 0; irq < ARRAY_SIZE(timer_irq); irq++) {
|
|
qdev_connect_gpio_out(cpudev, irq,
|
|
qdev_get_gpio_in(gicdev,
|
|
ppibase + timer_irq[irq]));
|
|
}
|
|
if (has_el2) {
|
|
/* Connect the GIC maintenance interrupt to PPI ID 25 */
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(gicdev), i + 4 * s->num_cpu,
|
|
qdev_get_gpio_in(gicdev, ppibase + 25));
|
|
}
|
|
}
|
|
|
|
/* Memory map (addresses are offsets from PERIPHBASE):
|
|
* 0x0000-0x0fff -- reserved
|
|
* 0x1000-0x1fff -- GIC Distributor
|
|
* 0x2000-0x3fff -- GIC CPU interface
|
|
* 0x4000-0x4fff -- GIC virtual interface control for this CPU
|
|
* 0x5000-0x51ff -- GIC virtual interface control for CPU 0
|
|
* 0x5200-0x53ff -- GIC virtual interface control for CPU 1
|
|
* 0x5400-0x55ff -- GIC virtual interface control for CPU 2
|
|
* 0x5600-0x57ff -- GIC virtual interface control for CPU 3
|
|
* 0x6000-0x7fff -- GIC virtual CPU interface
|
|
*/
|
|
memory_region_add_subregion(&s->container, 0x1000,
|
|
sysbus_mmio_get_region(busdev, 0));
|
|
memory_region_add_subregion(&s->container, 0x2000,
|
|
sysbus_mmio_get_region(busdev, 1));
|
|
if (has_el2) {
|
|
memory_region_add_subregion(&s->container, 0x4000,
|
|
sysbus_mmio_get_region(busdev, 2));
|
|
memory_region_add_subregion(&s->container, 0x6000,
|
|
sysbus_mmio_get_region(busdev, 3));
|
|
for (i = 0; i < s->num_cpu; i++) {
|
|
hwaddr base = 0x5000 + i * 0x200;
|
|
MemoryRegion *mr = sysbus_mmio_get_region(busdev,
|
|
4 + s->num_cpu + i);
|
|
memory_region_add_subregion(&s->container, base, mr);
|
|
}
|
|
}
|
|
}
|
|
|
|
static const Property a15mp_priv_properties[] = {
|
|
DEFINE_PROP_UINT32("num-cpu", A15MPPrivState, num_cpu, 1),
|
|
/* The Cortex-A15MP may have anything from 0 to 224 external interrupt
|
|
* IRQ lines (with another 32 internal). We default to 128+32, which
|
|
* is the number provided by the Cortex-A15MP test chip in the
|
|
* Versatile Express A15 development board.
|
|
* Other boards may differ and should set this property appropriately.
|
|
*/
|
|
DEFINE_PROP_UINT32("num-irq", A15MPPrivState, num_irq, 160),
|
|
};
|
|
|
|
static void a15mp_priv_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
dc->realize = a15mp_priv_realize;
|
|
device_class_set_props(dc, a15mp_priv_properties);
|
|
/* We currently have no saveable state */
|
|
}
|
|
|
|
static const TypeInfo a15mp_priv_info = {
|
|
.name = TYPE_A15MPCORE_PRIV,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(A15MPPrivState),
|
|
.instance_init = a15mp_priv_initfn,
|
|
.class_init = a15mp_priv_class_init,
|
|
};
|
|
|
|
static void a15mp_register_types(void)
|
|
{
|
|
type_register_static(&a15mp_priv_info);
|
|
}
|
|
|
|
type_init(a15mp_register_types)
|