mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 04:13:53 -06:00

- 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>
289 lines
8.3 KiB
C
289 lines
8.3 KiB
C
/*
|
|
* QEMU sPAPR NVRAM emulation
|
|
*
|
|
* Copyright (C) 2012 David Gibson, IBM Corporation.
|
|
*
|
|
* 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 "qemu/module.h"
|
|
#include "qemu/units.h"
|
|
#include "qapi/error.h"
|
|
#include <libfdt.h>
|
|
|
|
#include "system/block-backend.h"
|
|
#include "system/device_tree.h"
|
|
#include "system/system.h"
|
|
#include "system/runstate.h"
|
|
#include "migration/vmstate.h"
|
|
#include "hw/nvram/chrp_nvram.h"
|
|
#include "hw/ppc/spapr.h"
|
|
#include "hw/ppc/spapr_vio.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/qdev-properties-system.h"
|
|
#include "qom/object.h"
|
|
|
|
struct SpaprNvram {
|
|
SpaprVioDevice sdev;
|
|
uint32_t size;
|
|
uint8_t *buf;
|
|
BlockBackend *blk;
|
|
VMChangeStateEntry *vmstate;
|
|
};
|
|
|
|
#define TYPE_VIO_SPAPR_NVRAM "spapr-nvram"
|
|
OBJECT_DECLARE_SIMPLE_TYPE(SpaprNvram, VIO_SPAPR_NVRAM)
|
|
|
|
#define MIN_NVRAM_SIZE (8 * KiB)
|
|
#define DEFAULT_NVRAM_SIZE (64 * KiB)
|
|
#define MAX_NVRAM_SIZE (1 * MiB)
|
|
|
|
static void rtas_nvram_fetch(PowerPCCPU *cpu, SpaprMachineState *spapr,
|
|
uint32_t token, uint32_t nargs,
|
|
target_ulong args,
|
|
uint32_t nret, target_ulong rets)
|
|
{
|
|
SpaprNvram *nvram = spapr->nvram;
|
|
hwaddr offset, buffer, len;
|
|
void *membuf;
|
|
|
|
if ((nargs != 3) || (nret != 2)) {
|
|
rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);
|
|
return;
|
|
}
|
|
|
|
if (!nvram) {
|
|
rtas_st(rets, 0, RTAS_OUT_HW_ERROR);
|
|
rtas_st(rets, 1, 0);
|
|
return;
|
|
}
|
|
|
|
offset = rtas_ld(args, 0);
|
|
buffer = rtas_ld(args, 1);
|
|
len = rtas_ld(args, 2);
|
|
|
|
if (((offset + len) < offset)
|
|
|| ((offset + len) > nvram->size)) {
|
|
rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);
|
|
rtas_st(rets, 1, 0);
|
|
return;
|
|
}
|
|
|
|
assert(nvram->buf);
|
|
|
|
membuf = cpu_physical_memory_map(buffer, &len, true);
|
|
memcpy(membuf, nvram->buf + offset, len);
|
|
cpu_physical_memory_unmap(membuf, len, 1, len);
|
|
|
|
rtas_st(rets, 0, RTAS_OUT_SUCCESS);
|
|
rtas_st(rets, 1, len);
|
|
}
|
|
|
|
static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr,
|
|
uint32_t token, uint32_t nargs,
|
|
target_ulong args,
|
|
uint32_t nret, target_ulong rets)
|
|
{
|
|
SpaprNvram *nvram = spapr->nvram;
|
|
hwaddr offset, buffer, len;
|
|
int ret;
|
|
void *membuf;
|
|
|
|
if ((nargs != 3) || (nret != 2)) {
|
|
rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);
|
|
return;
|
|
}
|
|
|
|
if (!nvram) {
|
|
rtas_st(rets, 0, RTAS_OUT_HW_ERROR);
|
|
return;
|
|
}
|
|
|
|
offset = rtas_ld(args, 0);
|
|
buffer = rtas_ld(args, 1);
|
|
len = rtas_ld(args, 2);
|
|
|
|
if (((offset + len) < offset)
|
|
|| ((offset + len) > nvram->size)) {
|
|
rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);
|
|
return;
|
|
}
|
|
|
|
membuf = cpu_physical_memory_map(buffer, &len, false);
|
|
|
|
ret = 0;
|
|
if (nvram->blk) {
|
|
ret = blk_pwrite(nvram->blk, offset, len, membuf, 0);
|
|
}
|
|
|
|
assert(nvram->buf);
|
|
memcpy(nvram->buf + offset, membuf, len);
|
|
|
|
cpu_physical_memory_unmap(membuf, len, 0, len);
|
|
|
|
rtas_st(rets, 0, (ret < 0) ? RTAS_OUT_HW_ERROR : RTAS_OUT_SUCCESS);
|
|
rtas_st(rets, 1, (ret < 0) ? 0 : len);
|
|
}
|
|
|
|
static void spapr_nvram_realize(SpaprVioDevice *dev, Error **errp)
|
|
{
|
|
SpaprNvram *nvram = VIO_SPAPR_NVRAM(dev);
|
|
int ret;
|
|
|
|
if (nvram->blk) {
|
|
int64_t len = blk_getlength(nvram->blk);
|
|
|
|
if (len < 0) {
|
|
error_setg_errno(errp, -len,
|
|
"could not get length of backing image");
|
|
return;
|
|
}
|
|
|
|
nvram->size = len;
|
|
|
|
ret = blk_set_perm(nvram->blk,
|
|
BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE,
|
|
BLK_PERM_ALL, errp);
|
|
if (ret < 0) {
|
|
return;
|
|
}
|
|
} else {
|
|
nvram->size = DEFAULT_NVRAM_SIZE;
|
|
}
|
|
|
|
nvram->buf = g_malloc0(nvram->size);
|
|
|
|
if ((nvram->size < MIN_NVRAM_SIZE) || (nvram->size > MAX_NVRAM_SIZE)) {
|
|
error_setg(errp,
|
|
"spapr-nvram must be between %" PRId64
|
|
" and %" PRId64 " bytes in size",
|
|
MIN_NVRAM_SIZE, MAX_NVRAM_SIZE);
|
|
return;
|
|
}
|
|
|
|
if (nvram->blk) {
|
|
ret = blk_pread(nvram->blk, 0, nvram->size, nvram->buf, 0);
|
|
|
|
if (ret < 0) {
|
|
error_setg(errp, "can't read spapr-nvram contents");
|
|
return;
|
|
}
|
|
} else if (nb_prom_envs > 0) {
|
|
/* Create a system partition to pass the -prom-env variables */
|
|
chrp_nvram_create_system_partition(nvram->buf, MIN_NVRAM_SIZE / 4,
|
|
nvram->size);
|
|
chrp_nvram_create_free_partition(&nvram->buf[MIN_NVRAM_SIZE / 4],
|
|
nvram->size - MIN_NVRAM_SIZE / 4);
|
|
}
|
|
|
|
spapr_rtas_register(RTAS_NVRAM_FETCH, "nvram-fetch", rtas_nvram_fetch);
|
|
spapr_rtas_register(RTAS_NVRAM_STORE, "nvram-store", rtas_nvram_store);
|
|
}
|
|
|
|
static int spapr_nvram_devnode(SpaprVioDevice *dev, void *fdt, int node_off)
|
|
{
|
|
SpaprNvram *nvram = VIO_SPAPR_NVRAM(dev);
|
|
|
|
return fdt_setprop_cell(fdt, node_off, "#bytes", nvram->size);
|
|
}
|
|
|
|
static int spapr_nvram_pre_load(void *opaque)
|
|
{
|
|
SpaprNvram *nvram = VIO_SPAPR_NVRAM(opaque);
|
|
|
|
g_free(nvram->buf);
|
|
nvram->buf = NULL;
|
|
nvram->size = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void postload_update_cb(void *opaque, bool running, RunState state)
|
|
{
|
|
SpaprNvram *nvram = opaque;
|
|
|
|
/* This is called after bdrv_activate_all. */
|
|
|
|
qemu_del_vm_change_state_handler(nvram->vmstate);
|
|
nvram->vmstate = NULL;
|
|
|
|
blk_pwrite(nvram->blk, 0, nvram->size, nvram->buf, 0);
|
|
}
|
|
|
|
static int spapr_nvram_post_load(void *opaque, int version_id)
|
|
{
|
|
SpaprNvram *nvram = VIO_SPAPR_NVRAM(opaque);
|
|
|
|
if (nvram->blk) {
|
|
nvram->vmstate = qemu_add_vm_change_state_handler(postload_update_cb,
|
|
nvram);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const VMStateDescription vmstate_spapr_nvram = {
|
|
.name = "spapr_nvram",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.pre_load = spapr_nvram_pre_load,
|
|
.post_load = spapr_nvram_post_load,
|
|
.fields = (const VMStateField[]) {
|
|
VMSTATE_UINT32(size, SpaprNvram),
|
|
VMSTATE_VBUFFER_ALLOC_UINT32(buf, SpaprNvram, 1, NULL, size),
|
|
VMSTATE_END_OF_LIST()
|
|
},
|
|
};
|
|
|
|
static const Property spapr_nvram_properties[] = {
|
|
DEFINE_SPAPR_PROPERTIES(SpaprNvram, sdev),
|
|
DEFINE_PROP_DRIVE("drive", SpaprNvram, blk),
|
|
};
|
|
|
|
static void spapr_nvram_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
SpaprVioDeviceClass *k = VIO_SPAPR_DEVICE_CLASS(klass);
|
|
|
|
k->realize = spapr_nvram_realize;
|
|
k->devnode = spapr_nvram_devnode;
|
|
k->dt_name = "nvram";
|
|
k->dt_type = "nvram";
|
|
k->dt_compatible = "qemu,spapr-nvram";
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
device_class_set_props(dc, spapr_nvram_properties);
|
|
dc->vmsd = &vmstate_spapr_nvram;
|
|
/* Reason: Internal device only, uses spapr_rtas_register() in realize() */
|
|
dc->user_creatable = false;
|
|
}
|
|
|
|
static const TypeInfo spapr_nvram_type_info = {
|
|
.name = TYPE_VIO_SPAPR_NVRAM,
|
|
.parent = TYPE_VIO_SPAPR_DEVICE,
|
|
.instance_size = sizeof(SpaprNvram),
|
|
.class_init = spapr_nvram_class_init,
|
|
};
|
|
|
|
static void spapr_nvram_register_types(void)
|
|
{
|
|
type_register_static(&spapr_nvram_type_info);
|
|
}
|
|
|
|
type_init(spapr_nvram_register_types)
|