- 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>
184 lines
5.2 KiB
C
184 lines
5.2 KiB
C
/*
|
|
* QEMU IDE Emulation: mmio support (for embedded).
|
|
*
|
|
* Copyright (c) 2003 Fabrice Bellard
|
|
* Copyright (c) 2006 Openedhand Ltd.
|
|
*
|
|
* 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 "hw/sysbus.h"
|
|
#include "migration/vmstate.h"
|
|
#include "qemu/module.h"
|
|
#include "system/dma.h"
|
|
|
|
#include "hw/ide/mmio.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "ide-internal.h"
|
|
|
|
/***********************************************************/
|
|
/* MMIO based ide port
|
|
* This emulates IDE device connected directly to the CPU bus without
|
|
* dedicated ide controller, which is often seen on embedded boards.
|
|
*/
|
|
|
|
struct MMIOIDEState {
|
|
/*< private >*/
|
|
SysBusDevice parent_obj;
|
|
/*< public >*/
|
|
|
|
IDEBus bus;
|
|
|
|
uint32_t shift;
|
|
qemu_irq irq;
|
|
MemoryRegion iomem1, iomem2;
|
|
};
|
|
|
|
static void mmio_ide_reset(DeviceState *dev)
|
|
{
|
|
MMIOIDEState *s = MMIO_IDE(dev);
|
|
|
|
ide_bus_reset(&s->bus);
|
|
}
|
|
|
|
static uint64_t mmio_ide_read(void *opaque, hwaddr addr,
|
|
unsigned size)
|
|
{
|
|
MMIOIDEState *s = opaque;
|
|
addr >>= s->shift;
|
|
if (addr & 7)
|
|
return ide_ioport_read(&s->bus, addr);
|
|
else
|
|
return ide_data_readw(&s->bus, 0);
|
|
}
|
|
|
|
static void mmio_ide_write(void *opaque, hwaddr addr,
|
|
uint64_t val, unsigned size)
|
|
{
|
|
MMIOIDEState *s = opaque;
|
|
addr >>= s->shift;
|
|
if (addr & 7)
|
|
ide_ioport_write(&s->bus, addr, val);
|
|
else
|
|
ide_data_writew(&s->bus, 0, val);
|
|
}
|
|
|
|
static const MemoryRegionOps mmio_ide_ops = {
|
|
.read = mmio_ide_read,
|
|
.write = mmio_ide_write,
|
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
|
};
|
|
|
|
static uint64_t mmio_ide_status_read(void *opaque, hwaddr addr,
|
|
unsigned size)
|
|
{
|
|
MMIOIDEState *s = opaque;
|
|
return ide_status_read(&s->bus, 0);
|
|
}
|
|
|
|
static void mmio_ide_ctrl_write(void *opaque, hwaddr addr,
|
|
uint64_t val, unsigned size)
|
|
{
|
|
MMIOIDEState *s = opaque;
|
|
ide_ctrl_write(&s->bus, 0, val);
|
|
}
|
|
|
|
static const MemoryRegionOps mmio_ide_cs_ops = {
|
|
.read = mmio_ide_status_read,
|
|
.write = mmio_ide_ctrl_write,
|
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
|
};
|
|
|
|
static const VMStateDescription vmstate_ide_mmio = {
|
|
.name = "mmio-ide",
|
|
.version_id = 3,
|
|
.minimum_version_id = 0,
|
|
.fields = (const VMStateField[]) {
|
|
VMSTATE_IDE_BUS(bus, MMIOIDEState),
|
|
VMSTATE_IDE_DRIVES(bus.ifs, MMIOIDEState),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static void mmio_ide_realizefn(DeviceState *dev, Error **errp)
|
|
{
|
|
SysBusDevice *d = SYS_BUS_DEVICE(dev);
|
|
MMIOIDEState *s = MMIO_IDE(dev);
|
|
|
|
ide_bus_init_output_irq(&s->bus, s->irq);
|
|
|
|
memory_region_init_io(&s->iomem1, OBJECT(s), &mmio_ide_ops, s,
|
|
"ide-mmio.1", 16 << s->shift);
|
|
memory_region_init_io(&s->iomem2, OBJECT(s), &mmio_ide_cs_ops, s,
|
|
"ide-mmio.2", 2 << s->shift);
|
|
sysbus_init_mmio(d, &s->iomem1);
|
|
sysbus_init_mmio(d, &s->iomem2);
|
|
}
|
|
|
|
static void mmio_ide_initfn(Object *obj)
|
|
{
|
|
SysBusDevice *d = SYS_BUS_DEVICE(obj);
|
|
MMIOIDEState *s = MMIO_IDE(obj);
|
|
|
|
ide_bus_init(&s->bus, sizeof(s->bus), DEVICE(obj), 0, 2);
|
|
sysbus_init_irq(d, &s->irq);
|
|
}
|
|
|
|
static const Property mmio_ide_properties[] = {
|
|
DEFINE_PROP_UINT32("shift", MMIOIDEState, shift, 0),
|
|
};
|
|
|
|
static void mmio_ide_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = mmio_ide_realizefn;
|
|
device_class_set_legacy_reset(dc, mmio_ide_reset);
|
|
device_class_set_props(dc, mmio_ide_properties);
|
|
dc->vmsd = &vmstate_ide_mmio;
|
|
}
|
|
|
|
static const TypeInfo mmio_ide_type_info = {
|
|
.name = TYPE_MMIO_IDE,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(MMIOIDEState),
|
|
.instance_init = mmio_ide_initfn,
|
|
.class_init = mmio_ide_class_init,
|
|
};
|
|
|
|
static void mmio_ide_register_types(void)
|
|
{
|
|
type_register_static(&mmio_ide_type_info);
|
|
}
|
|
|
|
void mmio_ide_init_drives(DeviceState *dev, DriveInfo *hd0, DriveInfo *hd1)
|
|
{
|
|
MMIOIDEState *s = MMIO_IDE(dev);
|
|
|
|
if (hd0 != NULL) {
|
|
ide_bus_create_drive(&s->bus, 0, hd0);
|
|
}
|
|
if (hd1 != NULL) {
|
|
ide_bus_create_drive(&s->bus, 1, hd1);
|
|
}
|
|
}
|
|
|
|
type_init(mmio_ide_register_types)
|