- 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>
176 lines
4.7 KiB
C
176 lines
4.7 KiB
C
/*
|
|
* SPAPR TPM Proxy/Hypercall
|
|
*
|
|
* Copyright IBM Corp. 2019
|
|
*
|
|
* Authors:
|
|
* Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/error-report.h"
|
|
#include "system/reset.h"
|
|
#include "hw/ppc/spapr.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "trace.h"
|
|
|
|
#define TPM_SPAPR_BUFSIZE 4096
|
|
|
|
enum {
|
|
TPM_COMM_OP_EXECUTE = 1,
|
|
TPM_COMM_OP_CLOSE_SESSION = 2,
|
|
};
|
|
|
|
static void spapr_tpm_proxy_reset(void *opaque)
|
|
{
|
|
SpaprTpmProxy *tpm_proxy = SPAPR_TPM_PROXY(opaque);
|
|
|
|
if (tpm_proxy->host_fd != -1) {
|
|
close(tpm_proxy->host_fd);
|
|
tpm_proxy->host_fd = -1;
|
|
}
|
|
}
|
|
|
|
static ssize_t tpm_execute(SpaprTpmProxy *tpm_proxy, target_ulong *args)
|
|
{
|
|
uint64_t data_in = ppc64_phys_to_real(args[1]);
|
|
target_ulong data_in_size = args[2];
|
|
uint64_t data_out = ppc64_phys_to_real(args[3]);
|
|
target_ulong data_out_size = args[4];
|
|
uint8_t buf_in[TPM_SPAPR_BUFSIZE];
|
|
uint8_t buf_out[TPM_SPAPR_BUFSIZE];
|
|
ssize_t ret;
|
|
|
|
trace_spapr_tpm_execute(data_in, data_in_size, data_out, data_out_size);
|
|
|
|
if (data_in_size > TPM_SPAPR_BUFSIZE) {
|
|
error_report("invalid TPM input buffer size: " TARGET_FMT_lu,
|
|
data_in_size);
|
|
return H_P3;
|
|
}
|
|
|
|
if (data_out_size < TPM_SPAPR_BUFSIZE) {
|
|
error_report("invalid TPM output buffer size: " TARGET_FMT_lu,
|
|
data_out_size);
|
|
return H_P5;
|
|
}
|
|
|
|
if (tpm_proxy->host_fd == -1) {
|
|
tpm_proxy->host_fd = open(tpm_proxy->host_path, O_RDWR);
|
|
if (tpm_proxy->host_fd == -1) {
|
|
error_report("failed to open TPM device %s: %d",
|
|
tpm_proxy->host_path, errno);
|
|
return H_RESOURCE;
|
|
}
|
|
}
|
|
|
|
cpu_physical_memory_read(data_in, buf_in, data_in_size);
|
|
|
|
do {
|
|
ret = write(tpm_proxy->host_fd, buf_in, data_in_size);
|
|
if (ret > 0) {
|
|
data_in_size -= ret;
|
|
}
|
|
} while ((ret >= 0 && data_in_size > 0) || (ret == -1 && errno == EINTR));
|
|
|
|
if (ret == -1) {
|
|
error_report("failed to write to TPM device %s: %d",
|
|
tpm_proxy->host_path, errno);
|
|
return H_RESOURCE;
|
|
}
|
|
|
|
do {
|
|
ret = read(tpm_proxy->host_fd, buf_out, data_out_size);
|
|
} while (ret == 0 || (ret == -1 && errno == EINTR));
|
|
|
|
if (ret == -1) {
|
|
error_report("failed to read from TPM device %s: %d",
|
|
tpm_proxy->host_path, errno);
|
|
return H_RESOURCE;
|
|
}
|
|
|
|
cpu_physical_memory_write(data_out, buf_out, ret);
|
|
args[0] = ret;
|
|
|
|
return H_SUCCESS;
|
|
}
|
|
|
|
static target_ulong h_tpm_comm(PowerPCCPU *cpu,
|
|
SpaprMachineState *spapr,
|
|
target_ulong opcode,
|
|
target_ulong *args)
|
|
{
|
|
target_ulong op = args[0];
|
|
SpaprTpmProxy *tpm_proxy = spapr->tpm_proxy;
|
|
|
|
if (!tpm_proxy) {
|
|
error_report("TPM proxy not available");
|
|
return H_FUNCTION;
|
|
}
|
|
|
|
trace_spapr_h_tpm_comm(tpm_proxy->host_path, op);
|
|
|
|
switch (op) {
|
|
case TPM_COMM_OP_EXECUTE:
|
|
return tpm_execute(tpm_proxy, args);
|
|
case TPM_COMM_OP_CLOSE_SESSION:
|
|
spapr_tpm_proxy_reset(tpm_proxy);
|
|
return H_SUCCESS;
|
|
default:
|
|
return H_PARAMETER;
|
|
}
|
|
}
|
|
|
|
static void spapr_tpm_proxy_realize(DeviceState *d, Error **errp)
|
|
{
|
|
SpaprTpmProxy *tpm_proxy = SPAPR_TPM_PROXY(d);
|
|
|
|
if (tpm_proxy->host_path == NULL) {
|
|
error_setg(errp, "must specify 'host-path' option for device");
|
|
return;
|
|
}
|
|
|
|
tpm_proxy->host_fd = -1;
|
|
qemu_register_reset(spapr_tpm_proxy_reset, tpm_proxy);
|
|
}
|
|
|
|
static void spapr_tpm_proxy_unrealize(DeviceState *d)
|
|
{
|
|
SpaprTpmProxy *tpm_proxy = SPAPR_TPM_PROXY(d);
|
|
|
|
qemu_unregister_reset(spapr_tpm_proxy_reset, tpm_proxy);
|
|
}
|
|
|
|
static const Property spapr_tpm_proxy_properties[] = {
|
|
DEFINE_PROP_STRING("host-path", SpaprTpmProxy, host_path),
|
|
};
|
|
|
|
static void spapr_tpm_proxy_class_init(ObjectClass *k, void *data)
|
|
{
|
|
DeviceClass *dk = DEVICE_CLASS(k);
|
|
|
|
dk->realize = spapr_tpm_proxy_realize;
|
|
dk->unrealize = spapr_tpm_proxy_unrealize;
|
|
dk->user_creatable = true;
|
|
device_class_set_props(dk, spapr_tpm_proxy_properties);
|
|
}
|
|
|
|
static const TypeInfo spapr_tpm_proxy_info = {
|
|
.name = TYPE_SPAPR_TPM_PROXY,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(SpaprTpmProxy),
|
|
.class_init = spapr_tpm_proxy_class_init,
|
|
};
|
|
|
|
static void spapr_tpm_proxy_register_types(void)
|
|
{
|
|
type_register_static(&spapr_tpm_proxy_info);
|
|
spapr_register_hypercall(SVM_H_TPM_COMM, h_tpm_comm);
|
|
}
|
|
|
|
type_init(spapr_tpm_proxy_register_types)
|