[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH qemu v2] spapr: Kill SLOF
|
From: |
Alexey Kardashevskiy |
|
Subject: |
[PATCH qemu v2] spapr: Kill SLOF |
|
Date: |
Mon, 6 Jan 2020 10:42:42 +1100 |
The Petitboot bootloader is way more advanced than SLOF is ever going to
be as Petitboot comes with the full-featured Linux kernel with all
the drivers, and initramdisk with quite user friendly interface.
The problem with ditching SLOF is that an unmodified pseries kernel can
either start via:
1. kexec, this requires presence of RTAS and skips
ibm,client-architecture-support entirely;
2. normal boot, this heavily relies on the OF1275 client interface to
fetch the device tree and do early setup (claim memory).
This adds a new bios-less mode to the pseries machine: "bios=on|off".
When enabled, QEMU does not load SLOF and jumps to the kernel from
"-kernel".
The client interface is implemented exactly as RTAS - a 20 bytes blob,
right next after the RTAS blob. The entry point is passed to the kernel
via GPR5.
This implements a handful of client interface methods just to get going.
In particular, this implements the device tree fetching,
ibm,client-architecture-support and instantiate-rtas.
This implements changing FDT properties only for "linux,rtas-base" and
"linux,rtas-entry", just to get early boot going.
This assigns "phandles" to device tree nodes as there is no more SLOF
and OF nodes addresses of which served as phandle values.
This keeps predefined nodes (such as XICS/NVLINK/...) unchanged.
phandles are regenerated at every FDT rebuild.
When bios=off, this adds "/chosen" every time QEMU builds a tree.
This implements "claim" which the client (Linux) uses for memory
allocation; this is also used by QEMU for claiming kernel/initrd images,
client interface entry point, RTAS and the initial stack.
While at this, add a "kernel-addr" machine parameter to allow moving
the kernel in memory. This is useful for debugging if the kernel is
loaded at @0, although not necessary.
This does not implement instances properly but in order to boot a VM,
we only really need a stdout instance and the "/" instance for
"call-method", we fake these.
The test command line:
qemu-system-ppc64 \
-nodefaults \
-chardev stdio,id=STDIO0,signal=off,mux=on \
-device spapr-vty,id=svty0,reg=0x71000110,chardev=STDIO0 \
-mon id=MON0,chardev=STDIO0,mode=readline \
-nographic \
-vga none \
-kernel vmldbg \
-machine pseries,bios=off \
-m 4G \
-enable-kvm \
-initrd pb/rootfs.cpio.xz \
img/u1804-64le.qcow2 \
-snapshot \
-smp 8,threads=8 \
-L /home/aik/t/qemu-ppc64-bios/ \
-trace events=qemu_trace_events \
-d guest_errors \
-chardev socket,id=SOCKET0,server,nowait,path=qemu.mon.ssh37874 \
-mon chardev=SOCKET0,mode=control
Signed-off-by: Alexey Kardashevskiy <address@hidden>
---
Changes:
v2:
* fixed claim()
* added "setprop"
* cleaner client interface and RTAS blobs management
* boots to petitboot and further to the target system
* more trace points
---
hw/ppc/Makefile.objs | 1 +
include/hw/loader.h | 1 +
include/hw/ppc/spapr.h | 25 ++-
hw/ppc/spapr.c | 231 ++++++++++++++++++--
hw/ppc/spapr_client.c | 464 +++++++++++++++++++++++++++++++++++++++++
hw/ppc/spapr_hcall.c | 49 +++--
hw/ppc/trace-events | 9 +
7 files changed, 743 insertions(+), 37 deletions(-)
create mode 100644 hw/ppc/spapr_client.c
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 101e9fc59185..ce31c0acd2fb 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -6,6 +6,7 @@ obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o
spapr_rtas.o
obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o
obj-$(CONFIG_PSERIES) += spapr_cpu_core.o spapr_ovec.o spapr_irq.o
obj-$(CONFIG_PSERIES) += spapr_tpm_proxy.o
+obj-$(CONFIG_PSERIES) += spapr_client.o
obj-$(CONFIG_SPAPR_RNG) += spapr_rng.o
# IBM PowerNV
obj-$(CONFIG_POWERNV) += pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.o
pnv_occ.o pnv_bmc.o
diff --git a/include/hw/loader.h b/include/hw/loader.h
index 48a96cd55904..a2f58077a47e 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -262,6 +262,7 @@ MemoryRegion *rom_add_blob(const char *name, const void
*blob, size_t len,
int rom_add_elf_program(const char *name, GMappedFile *mapped_file, void *data,
size_t datasize, size_t romsize, hwaddr addr,
AddressSpace *as);
+bool rom_intersect(uint64_t start, uint64_t size);
int rom_check_and_register_reset(void);
void rom_set_fw(FWCfgState *f);
void rom_set_order_override(int order);
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 61f005c6f686..876879d12029 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -105,6 +105,11 @@ struct SpaprCapabilities {
uint8_t caps[SPAPR_CAP_NUM];
};
+typedef struct {
+ uint64_t start;
+ uint64_t size;
+} spapr_of_claimed;
+
/**
* SpaprMachineClass:
*/
@@ -158,8 +163,13 @@ struct SpaprMachineState {
uint32_t fdt_size;
uint32_t fdt_initial_size;
void *fdt_blob;
+ uint32_t rtas_base;
long kernel_size;
bool kernel_le;
+ uint64_t kernel_addr;
+ bool bios_enabled;
+ GArray *claimed; /* array of spapr_of_claimed */
+ uint64_t claimed_base;
uint32_t initrd_base;
long initrd_size;
uint64_t rtc_offset; /* Now used only during incoming migration */
@@ -510,7 +520,8 @@ struct SpaprMachineState {
/* Client Architecture support */
#define KVMPPC_H_CAS (KVMPPC_HCALL_BASE + 0x2)
#define KVMPPC_H_UPDATE_DT (KVMPPC_HCALL_BASE + 0x3)
-#define KVMPPC_HCALL_MAX KVMPPC_H_UPDATE_DT
+#define KVMPPC_H_CLIENT (KVMPPC_HCALL_BASE + 0x5)
+#define KVMPPC_HCALL_MAX KVMPPC_H_CLIENT
/*
* The hcall range 0xEF00 to 0xEF80 is reserved for use in facilitating
@@ -538,6 +549,12 @@ void spapr_register_hypercall(target_ulong opcode,
spapr_hcall_fn fn);
target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode,
target_ulong *args);
+target_ulong do_client_architecture_support(PowerPCCPU *cpu,
+ SpaprMachineState *spapr,
+ target_ulong addr,
+ target_ulong fdt_buf,
+ target_ulong fdt_bufsize);
+
/* Virtual Processor Area structure constants */
#define VPA_MIN_SIZE 640
#define VPA_SIZE_OFFSET 0x4
@@ -769,6 +786,9 @@ struct SpaprEventLogEntry {
void *spapr_build_fdt(SpaprMachineState *spapr, bool reset, size_t space);
void spapr_events_init(SpaprMachineState *sm);
void spapr_dt_events(SpaprMachineState *sm, void *fdt);
+uint64_t spapr_do_client_claim(SpaprMachineState *sm, uint64_t virt,
+ uint64_t size, uint64_t align);
+int spapr_h_client(SpaprMachineState *sm, target_ulong client_args);
void close_htab_fd(SpaprMachineState *spapr);
void spapr_setup_hpt_and_vrma(SpaprMachineState *spapr);
void spapr_free_hpt(SpaprMachineState *spapr);
@@ -891,4 +911,7 @@ void spapr_check_pagesize(SpaprMachineState *spapr, hwaddr
pagesize,
#define SPAPR_OV5_XIVE_BOTH 0x80 /* Only to advertise on the platform */
void spapr_set_all_lpcrs(target_ulong value, target_ulong mask);
+
+void spapr_instantiate_rtas(SpaprMachineState *spapr, uint32_t base);
+
#endif /* HW_SPAPR_H */
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index e62c89b3dd40..1c97534a0aea 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -896,6 +896,51 @@ out:
return ret;
}
+/*
+ * Below is a compiled version of RTAS blob and OF client interface entry
point.
+ *
+ * gcc -nostdlib -mbig -o spapr-rtas.img spapr-rtas.S
+ * objcopy -O binary -j .text spapr-rtas.img spapr-rtas.bin
+ *
+ * .globl _start
+ * _start:
+ * mr 4,3
+ * lis 3,KVMPPC_H_RTAS@h
+ * ori 3,3,KVMPPC_H_RTAS@l
+ * sc 1
+ * blr
+ * mr 4,3
+ * lis 3,KVMPPC_H_CLIENT@h
+ * ori 3,3,KVMPPC_H_CLIENT@l
+ * sc 1
+ * blr
+ */
+static struct {
+ uint8_t rtas[20], client[20];
+} QEMU_PACKED rtas_client_blob = {
+ .rtas = {
+ 0x7c, 0x64, 0x1b, 0x78,
+ 0x3c, 0x60, 0x00, 0x00,
+ 0x60, 0x63, 0xf0, 0x00,
+ 0x44, 0x00, 0x00, 0x22,
+ 0x4e, 0x80, 0x00, 0x20
+ },
+ .client = {
+ 0x7c, 0x64, 0x1b, 0x78,
+ 0x3c, 0x60, 0x00, 0x00,
+ 0x60, 0x63, 0xf0, 0x05,
+ 0x44, 0x00, 0x00, 0x22,
+ 0x4e, 0x80, 0x00, 0x20
+ }
+};
+
+void spapr_instantiate_rtas(SpaprMachineState *spapr, uint32_t base)
+{
+ spapr->rtas_base = base;
+ cpu_physical_memory_write(base, rtas_client_blob.rtas,
+ sizeof(rtas_client_blob.rtas));
+}
+
static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt)
{
MachineState *ms = MACHINE(spapr);
@@ -980,6 +1025,13 @@ static void spapr_dt_rtas(SpaprMachineState *spapr, void
*fdt)
_FDT(fdt_setprop(fdt, rtas, "ibm,lrdr-capacity",
lrdr_capacity, sizeof(lrdr_capacity)));
+ _FDT(fdt_setprop_cell(fdt, rtas, "linux,rtas-base", spapr->rtas_base));
+ _FDT(fdt_setprop_cell(fdt, rtas, "linux,rtas-entry", spapr->rtas_base));
+ _FDT(fdt_setprop_cell(fdt, rtas, "rtas-size",
+ sizeof(rtas_client_blob.rtas)));
+ _FDT(fdt_add_mem_rsv(fdt, spapr->rtas_base,
+ sizeof(rtas_client_blob.rtas)));
+
spapr_dt_rtas_tokens(fdt, rtas);
}
@@ -1057,7 +1109,7 @@ static void spapr_dt_chosen(SpaprMachineState *spapr,
void *fdt)
}
if (spapr->kernel_size) {
- uint64_t kprop[2] = { cpu_to_be64(KERNEL_LOAD_ADDR),
+ uint64_t kprop[2] = { cpu_to_be64(spapr->kernel_addr),
cpu_to_be64(spapr->kernel_size) };
_FDT(fdt_setprop(fdt, chosen, "qemu,boot-kernel",
@@ -1104,6 +1156,9 @@ static void spapr_dt_chosen(SpaprMachineState *spapr,
void *fdt)
_FDT(fdt_setprop_cell(fdt, chosen, "linux,pci-probe-only", 0));
}
+ if (!spapr->bios_enabled) {
+ _FDT(fdt_setprop_cell(fdt, chosen, "cpu", 0));
+ }
spapr_dt_ov5_platform_support(spapr, fdt, chosen);
g_free(stdout_path);
@@ -1133,6 +1188,28 @@ static void spapr_dt_hypervisor(SpaprMachineState
*spapr, void *fdt)
}
}
+static void spapr_fdt_add_phandles(void *fdt, int parent, uint32_t *phandle)
+{
+ int proplen = 0, node;
+ const void *prop;
+ char tmp[256] = "BAAD";
+
+ fdt_get_path(fdt, parent, tmp, sizeof(tmp));
+ prop = fdt_getprop_namelen(fdt, parent, "phandle", 7, &proplen);
+ if (!prop) {
+ _FDT(fdt_setprop_cell(fdt, parent, "phandle", *phandle));
+ while (1) {
+ ++*phandle;
+ if (fdt_node_offset_by_phandle(fdt, *phandle) < 0) {
+ break;
+ }
+ }
+ }
+ fdt_for_each_subnode(node, fdt, parent) {
+ spapr_fdt_add_phandles(fdt, node, phandle);
+ }
+}
+
void *spapr_build_fdt(SpaprMachineState *spapr, bool reset, size_t space)
{
MachineState *machine = MACHINE(spapr);
@@ -1245,7 +1322,8 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool
reset, size_t space)
/* Build memory reserve map */
if (reset) {
if (spapr->kernel_size) {
- _FDT((fdt_add_mem_rsv(fdt, KERNEL_LOAD_ADDR, spapr->kernel_size)));
+ _FDT((fdt_add_mem_rsv(fdt, spapr->kernel_addr,
+ spapr->kernel_size)));
}
if (spapr->initrd_size) {
_FDT((fdt_add_mem_rsv(fdt, spapr->initrd_base,
@@ -1268,12 +1346,19 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool
reset, size_t space)
}
}
+ if (!spapr->bios_enabled) {
+ uint32_t phandle = 1;
+
+ spapr_fdt_add_phandles(fdt, fdt_path_offset(fdt, "/"), &phandle);
+ }
+
return fdt;
}
static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
{
- return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
+ SpaprMachineState *spapr = opaque;
+ return (addr & 0x0fffffff) + spapr->kernel_addr;
}
static void emulate_spapr_hypercall(PPCVirtualHypervisor *vhyp,
@@ -1660,6 +1745,60 @@ static void spapr_machine_reset(MachineState *machine)
*/
fdt_addr = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FDT_MAX_SIZE;
+ /* Set up the entry state */
+ if (!spapr->bios_enabled) {
+ if (spapr->claimed) {
+ g_array_unref(spapr->claimed);
+ }
+ spapr->claimed = g_array_new(false, false, sizeof(spapr_of_claimed));
+ spapr->claimed_base = 0x10000; /* Avoid using the first system page */
+
+ spapr_cpu_set_entry_state(first_ppc_cpu, spapr->kernel_addr, fdt_addr);
+
+ if (spapr_do_client_claim(spapr, spapr->kernel_addr,
+ spapr->kernel_size, 0) == -1) {
+ error_report("Memory for kernel is in use");
+ exit(1);
+ }
+ if (spapr_do_client_claim(spapr, spapr->initrd_base,
+ spapr->initrd_size, 0) == -1) {
+ error_report("Memory for initramdisk is in use");
+ exit(1);
+ }
+ first_ppc_cpu->env.gpr[1] = spapr_do_client_claim(spapr, 0, 0x40000,
+ 0x10000);
+ if (first_ppc_cpu->env.gpr[1] == -1) {
+ error_report("Memory for stack is in use");
+ exit(1);
+ }
+
+ first_ppc_cpu->env.gpr[5] =
+ spapr_do_client_claim(spapr, 0, sizeof(rtas_client_blob.client),
+ sizeof(rtas_client_blob.client));
+ if (first_ppc_cpu->env.gpr[5] == -1) {
+ error_report("Memory for OF client is in use");
+ exit(1);
+ }
+ cpu_physical_memory_write(first_ppc_cpu->env.gpr[5],
+ rtas_client_blob.client,
+ sizeof(rtas_client_blob.client));
+
+ /* Allocate space for RTAS here so spapr_build_fdt() below picks it */
+ spapr->rtas_base =
+ spapr_do_client_claim(spapr, 0, sizeof(rtas_client_blob.rtas),
+ 0x100);
+ if (spapr->rtas_base == -1) {
+ error_report("Memory for RTAS is in use");
+ exit(1);
+ }
+ cpu_physical_memory_write(spapr->rtas_base,
+ rtas_client_blob.rtas,
+ sizeof(rtas_client_blob.rtas));
+ } else {
+ spapr_cpu_set_entry_state(first_ppc_cpu, SPAPR_ENTRY_POINT, fdt_addr);
+ first_ppc_cpu->env.gpr[5] = 0; /* 0 = kexec !0 = prom_init */
+ }
+
fdt = spapr_build_fdt(spapr, true, FDT_MAX_SIZE);
rc = fdt_pack(fdt);
@@ -1675,10 +1814,14 @@ static void spapr_machine_reset(MachineState *machine)
spapr->fdt_initial_size = spapr->fdt_size;
spapr->fdt_blob = fdt;
- /* Set up the entry state */
- spapr_cpu_set_entry_state(first_ppc_cpu, SPAPR_ENTRY_POINT, fdt_addr);
- first_ppc_cpu->env.gpr[5] = 0;
-
+ if (!spapr->bios_enabled) {
+ /*
+ * Claim FDT space so initramdisk/zImage are not unpacked over it.
+ * In practice Linux claim additional memory for FDT and fetches it
+ * using client interface's "getprop" call.
+ */
+ spapr_do_client_claim(spapr, fdt_addr, fdt_totalsize(fdt), 0);
+ }
spapr->cas_reboot = false;
}
@@ -2897,12 +3040,12 @@ static void spapr_machine_init(MachineState *machine)
uint64_t lowaddr = 0;
spapr->kernel_size = load_elf(kernel_filename, NULL,
- translate_kernel_address, NULL,
+ translate_kernel_address, spapr,
NULL, &lowaddr, NULL, 1,
PPC_ELF_MACHINE, 0, 0);
if (spapr->kernel_size == ELF_LOAD_WRONG_ENDIAN) {
spapr->kernel_size = load_elf(kernel_filename, NULL,
- translate_kernel_address, NULL, NULL,
+ translate_kernel_address, spapr,
NULL,
&lowaddr, NULL, 0, PPC_ELF_MACHINE,
0, 0);
spapr->kernel_le = spapr->kernel_size > 0;
@@ -2918,7 +3061,7 @@ static void spapr_machine_init(MachineState *machine)
/* Try to locate the initrd in the gap between the kernel
* and the firmware. Add a bit of space just in case
*/
- spapr->initrd_base = (KERNEL_LOAD_ADDR + spapr->kernel_size
+ spapr->initrd_base = (spapr->kernel_addr + spapr->kernel_size
+ 0x1ffff) & ~0xffff;
spapr->initrd_size = load_image_targphys(initrd_filename,
spapr->initrd_base,
@@ -2932,20 +3075,22 @@ static void spapr_machine_init(MachineState *machine)
}
}
- if (bios_name == NULL) {
- bios_name = FW_FILE_NAME;
+ if (spapr->bios_enabled) {
+ if (bios_name == NULL) {
+ bios_name = FW_FILE_NAME;
+ }
+ filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
+ if (!filename) {
+ error_report("Could not find LPAR firmware '%s'", bios_name);
+ exit(1);
+ }
+ fw_size = load_image_targphys(filename, 0, FW_MAX_SIZE);
+ if (fw_size <= 0) {
+ error_report("Could not load LPAR firmware '%s'", filename);
+ exit(1);
+ }
+ g_free(filename);
}
- filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
- if (!filename) {
- error_report("Could not find LPAR firmware '%s'", bios_name);
- exit(1);
- }
- fw_size = load_image_targphys(filename, 0, FW_MAX_SIZE);
- if (fw_size <= 0) {
- error_report("Could not load LPAR firmware '%s'", filename);
- exit(1);
- }
- g_free(filename);
/* FIXME: Should register things through the MachineState's qdev
* interface, this is a legacy from the sPAPREnvironment structure
@@ -3162,6 +3307,32 @@ static void spapr_set_vsmt(Object *obj, Visitor *v,
const char *name,
visit_type_uint32(v, name, (uint32_t *)opaque, errp);
}
+static void spapr_get_kernel_addr(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
+{
+ visit_type_uint64(v, name, (uint64_t *)opaque, errp);
+}
+
+static void spapr_set_kernel_addr(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
+{
+ visit_type_uint64(v, name, (uint64_t *)opaque, errp);
+}
+
+static bool spapr_get_bios_enabled(Object *obj, Error **errp)
+{
+ SpaprMachineState *spapr = SPAPR_MACHINE(obj);
+
+ return spapr->bios_enabled;
+}
+
+static void spapr_set_bios_enabled(Object *obj, bool value, Error **errp)
+{
+ SpaprMachineState *spapr = SPAPR_MACHINE(obj);
+
+ spapr->bios_enabled = value;
+}
+
static char *spapr_get_ic_mode(Object *obj, Error **errp)
{
SpaprMachineState *spapr = SPAPR_MACHINE(obj);
@@ -3267,6 +3438,20 @@ static void spapr_instance_init(Object *obj)
object_property_add_bool(obj, "vfio-no-msix-emulation",
spapr_get_msix_emulation, NULL, NULL);
+ object_property_add(obj, "kernel-addr", "uint64", spapr_get_kernel_addr,
+ spapr_set_kernel_addr, NULL, &spapr->kernel_addr,
+ &error_abort);
+ object_property_set_description(obj, "kernel-addr",
+ stringify(KERNEL_LOAD_ADDR)
+ " for -kernel is the default",
+ NULL);
+ spapr->kernel_addr = KERNEL_LOAD_ADDR;
+ object_property_add_bool(obj, "bios", spapr_get_bios_enabled,
+ spapr_set_bios_enabled, NULL);
+ object_property_set_description(obj, "bios", "Conrols whether to load
bios",
+ NULL);
+ spapr->bios_enabled = true;
+
/* The machine class defines the default interrupt controller mode */
spapr->irq = smc->irq;
object_property_add_str(obj, "ic-mode", spapr_get_ic_mode,
diff --git a/hw/ppc/spapr_client.c b/hw/ppc/spapr_client.c
new file mode 100644
index 000000000000..a318eaae3c40
--- /dev/null
+++ b/hw/ppc/spapr_client.c
@@ -0,0 +1,464 @@
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "qapi/error.h"
+#include "exec/memory.h"
+#include "hw/ppc/spapr.h"
+#include "hw/ppc/spapr_vio.h"
+#include "trace.h"
+
+struct prom_args {
+ __be32 service;
+ __be32 nargs;
+ __be32 nret;
+ __be32 args[10];
+};
+
+#define CLI_PH_MASK 0x0FFFFFFF
+#define CLI_INST_PREFIX 0x20000000
+
+#define readstr(pa, buf) cpu_physical_memory_read((pa), (buf), sizeof(buf))
+#define readuint32(pa) ({ \
+ uint32_t __tmp__; \
+ cpu_physical_memory_read((pa), &__tmp__, sizeof(__tmp__)); \
+ be32_to_cpu(__tmp__); })
+
+static bool _cmpservice(const char *s, size_t len,
+ unsigned nargs, unsigned nret,
+ const char *s1, size_t len1,
+ unsigned nargscheck, unsigned nretcheck)
+{
+ if (strncmp(s, s1, MAX(len, len1))) {
+ return false;
+ }
+ if (nargscheck == 0 && nretcheck == 0) {
+ return true;
+ }
+ if (nargs != nargscheck || nret != nretcheck) {
+ trace_spapr_client_error_param(s, nargscheck, nretcheck, nargs, nret);
+ return false;
+ }
+
+ return true;
+}
+
+static uint32_t client_finddevice(const void *fdt, uint32_t nodeaddr)
+{
+ char node[256];
+ int ret;
+
+ readstr(nodeaddr, node);
+ ret = fdt_path_offset(fdt, node);
+ if (ret >= 0) {
+ ret = fdt_get_phandle(fdt, ret);
+ }
+
+ return (uint32_t) ret;
+}
+
+static uint32_t client_getprop(const void *fdt, uint32_t nodeph, uint32_t
pname,
+ uint32_t valaddr, uint32_t vallen)
+{
+ char propname[64];
+ uint32_t ret = 0;
+ int proplen = 0;
+ const void *prop;
+
+ readstr(pname, propname);
+
+ prop = fdt_getprop_namelen(fdt, fdt_node_offset_by_phandle(fdt, nodeph),
+ propname, strlen(propname), &proplen);
+ if (prop) {
+ int cb = MIN(proplen, vallen);
+
+ cpu_physical_memory_write(valaddr, prop, cb);
+ ret = cb;
+ } else if (strncmp(propname, "stdout", 6) == 0 && vallen == sizeof(ret)) {
+ ret = cpu_to_be32(1);
+ cpu_physical_memory_write(valaddr, &ret, MIN(vallen, sizeof(ret)));
+ } else {
+ ret = -1;
+ }
+ trace_spapr_client_getprop(nodeph, propname, ret);
+
+ return ret;
+}
+
+static uint32_t client_setprop(SpaprMachineState *sm,
+ uint32_t nodeph, uint32_t pname,
+ uint32_t valaddr, uint32_t vallen)
+{
+ char propname[64];
+ uint32_t ret = -1;
+ int proplen = 0;
+ const void *prop;
+
+ readstr(pname, propname);
+ if (vallen == sizeof(uint32_t) &&
+ ((strncmp(propname, "linux,rtas-base", 15) == 0) ||
+ (strncmp(propname, "linux,rtas-entry", 16) == 0))) {
+
+ sm->rtas_base = readuint32(valaddr);
+ prop = fdt_getprop_namelen(sm->fdt_blob,
+ fdt_node_offset_by_phandle(sm->fdt_blob,
+ nodeph),
+ propname, strlen(propname), &proplen);
+ if (proplen == vallen) {
+ *(uint32_t *) prop = cpu_to_be32(sm->rtas_base);
+ ret = proplen;
+ }
+ }
+ trace_spapr_client_setprop(nodeph, propname, ret);
+
+ return ret;
+}
+
+static uint32_t client_getproplen(const void *fdt, uint32_t nodeph,
+ uint32_t pname)
+{
+ char propname[64];
+ uint32_t ret = 0;
+ int proplen = 0;
+ const void *prop;
+
+ readstr(pname, propname);
+
+ prop = fdt_getprop_namelen(fdt, fdt_node_offset_by_phandle(fdt, nodeph),
+ propname, strlen(propname), &proplen);
+ if (prop) {
+ ret = proplen;
+ } else if (strncmp(propname, "stdout", 6) == 0) {
+ ret = 4;
+ } else {
+ ret = -1;
+ }
+
+ return ret;
+}
+
+static uint32_t client_peer(const void *fdt, uint32_t phandle)
+{
+ int ret;
+
+ if (phandle == 0) {
+ ret = fdt_path_offset(fdt, "/");
+ } else {
+ ret = fdt_next_subnode(fdt, fdt_node_offset_by_phandle(fdt, phandle));
+ }
+
+ if (ret < 0) {
+ ret = 0;
+ } else {
+ ret = fdt_get_phandle(fdt, ret);
+ }
+
+ return ret;
+}
+
+static uint32_t client_child(const void *fdt, uint32_t phandle)
+{
+ int ret = fdt_first_subnode(fdt, fdt_node_offset_by_phandle(fdt, phandle));
+
+ if (ret < 0) {
+ ret = 0;
+ } else {
+ ret = fdt_get_phandle(fdt, ret);
+ }
+
+ return ret;
+}
+
+static uint32_t client_parent(const void *fdt, uint32_t phandle)
+{
+ int ret = fdt_parent_offset(fdt, fdt_node_offset_by_phandle(fdt, phandle));
+
+ if (ret < 0) {
+ ret = 0;
+ } else {
+ ret = fdt_get_phandle(fdt, ret);
+ }
+
+ return ret;
+}
+
+static uint32_t client_open(uint32_t phandle)
+{
+ uint32_t ret = (phandle & CLI_PH_MASK) | CLI_INST_PREFIX;
+
+ return ret;
+}
+
+static uint32_t client_instance_to_path(SpaprMachineState *sm,
+ uint32_t instance, uint32_t buf,
+ uint32_t len)
+{
+ uint32_t ph = instance & CLI_PH_MASK;
+ char *stdout_path = spapr_vio_stdout_path(sm->vio_bus);
+ int stdout_ph = fdt_path_offset(sm->fdt_blob, stdout_path);
+
+ if (ph == stdout_ph) {
+ len = MIN(len, strlen(stdout_path));
+ cpu_physical_memory_write(buf, stdout_path, len);
+ } else {
+ len = 0;
+ }
+ g_free(stdout_path);
+
+ return len;
+}
+
+static uint32_t client_package_to_path(const void *fdt, uint32_t phandle,
+ uint32_t buf, uint32_t len)
+{
+ char tmp[256];
+
+ if (0 == fdt_get_path(fdt, fdt_node_offset_by_phandle(fdt, phandle), tmp,
+ sizeof(tmp))) {
+ tmp[sizeof(tmp) - 1] = 0;
+ cpu_physical_memory_write(buf, tmp, MIN(len, strlen(tmp)));
+ }
+ return len;
+}
+
+static uint32_t client_write(uint32_t instance, uint32_t buf, uint32_t len)
+{
+ char tmp[len + 1]; /* TODO: do a loop as len might be enourmous*/
+
+ readstr(buf, tmp);
+ tmp[len] = 0;
+ printf("%s", tmp);
+
+ return len;
+}
+
+static bool client_claim_avail(SpaprMachineState *sm, uint64_t virt,
+ uint64_t size)
+{
+ int i;
+ spapr_of_claimed *c;
+
+ for (i = 0; i < sm->claimed->len; ++i) {
+ c = &g_array_index(sm->claimed, spapr_of_claimed, i);
+ if ((c->start <= virt && virt < c->start + c->size) ||
+ (virt <= c->start && c->start < virt + size)) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+uint64_t spapr_do_client_claim(SpaprMachineState *sm, uint64_t virt,
+ uint64_t size, uint64_t align)
+{
+ uint32_t ret;
+ spapr_of_claimed newclaim;
+
+ if (align == 0) {
+ if (!client_claim_avail(sm, virt, size)) {
+ return -1;
+ }
+ ret = virt;
+ } else {
+ align = pow2ceil(align);
+ sm->claimed_base = (sm->claimed_base + align - 1) & ~(align - 1);
+ while (1) {
+ if (sm->claimed_base >= sm->rma_size) {
+ perror("Out of memory");
+ return -1;
+ }
+ if (client_claim_avail(sm, sm->claimed_base, size)) {
+ break;
+ }
+ sm->claimed_base += size;
+ }
+ ret = sm->claimed_base;
+ }
+
+ sm->claimed_base = MAX(sm->claimed_base, ret) + size;
+
+ newclaim.start = virt;
+ newclaim.size = size;
+ g_array_append_val(sm->claimed, newclaim);
+ trace_spapr_client_claim(virt, size, align, ret);
+
+ return ret;
+}
+
+static uint32_t client_claim(SpaprMachineState *sm, uint32_t virt,
+ uint32_t size, uint32_t align)
+{
+ return spapr_do_client_claim(sm, virt, size, align);
+}
+
+static uint32_t client_nextprop(const void *fdt, uint32_t phandle,
+ uint32_t prevaddr, uint32_t nameaddr)
+{
+ int namelen = 0;
+ int offset = fdt_node_offset_by_phandle(fdt, phandle);
+ char prev[256];
+ const struct fdt_property *prop;
+ const char *tmp;
+
+ readstr(prevaddr, prev);
+ for (offset = fdt_first_property_offset(fdt, offset);
+ (offset >= 0);
+ (offset = fdt_next_property_offset(fdt, offset))) {
+
+ prop = fdt_get_property_by_offset(fdt, offset, &namelen);
+ if (!prop) {
+ return 0;
+ }
+
+ tmp = fdt_get_string(fdt, fdt32_ld(&prop->nameoff), &namelen);
+ if (prev[0] == 0 ||
+ strncmp(prev, tmp, MAX(namelen, strlen(prev))) == 0) {
+
+ if (prev[0]) {
+ offset = fdt_next_property_offset(fdt, offset);
+ if (offset < 0) {
+ return 0;
+ }
+ }
+ prop = fdt_get_property_by_offset(fdt, offset, &namelen);
+ if (!prop) {
+ return 0;
+ }
+
+ tmp = fdt_get_string(fdt, fdt32_ld(&prop->nameoff), &namelen);
+ cpu_physical_memory_write(nameaddr, tmp, namelen + 1);
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+static uint32_t client_call_method(SpaprMachineState *sm, uint32_t methodaddr,
+ uint32_t param1, uint32_t param2,
+ uint32_t *ret2)
+{
+ uint32_t ret = 0;
+ char method[256];
+
+ readstr(methodaddr, method);
+ if (strncmp(method, "ibm,client-architecture-support", 31) == 0) {
+
+#define FDT_MAX_SIZE 0x100000
+ ret = do_client_architecture_support(POWERPC_CPU(first_cpu), sm,
param2,
+ 0, FDT_MAX_SIZE);
+ *ret2 = 0;
+ } else if (strncmp(method, "instantiate-rtas", 16) == 0) {
+ uint32_t rtasbase = param2;
+
+ spapr_instantiate_rtas(sm, rtasbase);
+ *ret2 = rtasbase;
+ } else {
+ trace_spapr_client_error_unknown_method(method);
+ return -1;
+ }
+
+ trace_spapr_client_method(method, param1, param2, ret);
+
+ return ret;
+}
+
+static void client_quiesce(SpaprMachineState *sm)
+{
+}
+
+int spapr_h_client(SpaprMachineState *sm, target_ulong client_args)
+{
+ struct prom_args args = { 0 };
+ char service[64];
+ unsigned nargs, nret;
+ int i, servicelen;
+
+ cpu_physical_memory_read(client_args, &args, sizeof(args));
+ nargs = be32_to_cpu(args.nargs);
+ nret = be32_to_cpu(args.nret);
+ readstr(be32_to_cpu(args.service), service);
+ servicelen = strlen(service);
+
+#define cmpservice(s, a, r) \
+ _cmpservice(service, servicelen, nargs, nret, (s), sizeof(s), (a), (r))
+
+ if (cmpservice("finddevice", 1, 1)) {
+ args.args[nargs] = client_finddevice(sm->fdt_blob,
+ be32_to_cpu(args.args[0]));
+ } else if (cmpservice("getprop", 4, 1)) {
+ args.args[nargs] = client_getprop(sm->fdt_blob,
+ be32_to_cpu(args.args[0]),
+ be32_to_cpu(args.args[1]),
+ be32_to_cpu(args.args[2]),
+ be32_to_cpu(args.args[3]));
+ } else if (cmpservice("getproplen", 2, 1)) {
+ args.args[nargs] = client_getproplen(sm->fdt_blob,
+ be32_to_cpu(args.args[0]),
+ be32_to_cpu(args.args[1]));
+ } else if (cmpservice("setprop", 4, 1)) {
+ args.args[nargs] = client_setprop(sm,
+ be32_to_cpu(args.args[0]),
+ be32_to_cpu(args.args[1]),
+ be32_to_cpu(args.args[2]),
+ be32_to_cpu(args.args[3]));
+ } else if (cmpservice("instance-to-path", 3, 1)) {
+ args.args[nargs] = client_instance_to_path(sm,
+ be32_to_cpu(args.args[0]),
+ be32_to_cpu(args.args[1]),
+ be32_to_cpu(args.args[2]));
+ } else if (cmpservice("package-to-path", 3, 1)) {
+ args.args[nargs] = client_package_to_path(sm->fdt_blob,
+ be32_to_cpu(args.args[0]),
+ be32_to_cpu(args.args[1]),
+ be32_to_cpu(args.args[2]));
+ } else if (cmpservice("write", 3, 1)) {
+ args.args[nargs] = client_write(be32_to_cpu(args.args[0]),
+ be32_to_cpu(args.args[1]),
+ be32_to_cpu(args.args[2]));
+ } else if (cmpservice("peer", 1, 1)) {
+ args.args[nargs] = client_peer(sm->fdt_blob,
+ be32_to_cpu(args.args[0]));
+ } else if (cmpservice("child", 1, 1)) {
+ args.args[nargs] = client_child(sm->fdt_blob,
+ be32_to_cpu(args.args[0]));
+ } else if (cmpservice("parent", 1, 1)) {
+ args.args[nargs] = client_parent(sm->fdt_blob,
+ be32_to_cpu(args.args[0]));
+ } else if (cmpservice("open", 1, 1)) {
+ args.args[nargs] = client_open(be32_to_cpu(args.args[0]));
+ } else if (cmpservice("call-method", 3, 2)) {
+ uint32_t ret2 = 0;
+
+ args.args[nargs] = client_call_method(sm,
+ be32_to_cpu(args.args[0]),
+ be32_to_cpu(args.args[1]),
+ be32_to_cpu(args.args[2]),
+ &ret2);
+ args.args[nargs + 1] = ret2;
+ } else if (cmpservice("claim", 3, 1)) {
+ args.args[nargs] = client_claim(sm,
+ be32_to_cpu(args.args[0]),
+ be32_to_cpu(args.args[1]),
+ be32_to_cpu(args.args[2]));
+ } else if (cmpservice("nextprop", 3, 1)) {
+ args.args[nargs] = client_nextprop(sm->fdt_blob,
+ be32_to_cpu(args.args[0]),
+ be32_to_cpu(args.args[1]),
+ be32_to_cpu(args.args[2]));
+ } else if (cmpservice("quiesce", 0, 0)) {
+ client_quiesce(sm);
+ } else if (cmpservice("exit", 0, 0)) {
+ error_report("Stopped as the VM requested \"exit\"");
+ vm_stop(RUN_STATE_PAUSED);
+ } else {
+ trace_spapr_client_error_unknown_service(service, nargs, nret);
+ args.args[nargs] = -1;
+ }
+
+ for (i = 0; i < nret; ++i) {
+ args.args[nargs + i] = be32_to_cpu(args.args[nargs + i]);
+ }
+ cpu_physical_memory_write(client_args, &args, sizeof(args));
+
+ return H_SUCCESS;
+}
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index f1799b1b707d..76f93ec37959 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1660,15 +1660,12 @@ static bool spapr_hotplugged_dev_before_cas(void)
return false;
}
-static target_ulong h_client_architecture_support(PowerPCCPU *cpu,
- SpaprMachineState *spapr,
- target_ulong opcode,
- target_ulong *args)
+target_ulong do_client_architecture_support(PowerPCCPU *cpu,
+ SpaprMachineState *spapr,
+ target_ulong addr,
+ target_ulong fdt_buf,
+ target_ulong fdt_bufsize)
{
- /* Working address in data buffer */
- target_ulong addr = ppc64_phys_to_real(args[0]);
- target_ulong fdt_buf = args[1];
- target_ulong fdt_bufsize = args[2];
target_ulong ov_table;
uint32_t cas_pvr;
SpaprOptionVector *ov1_guest, *ov5_guest, *ov5_cas_old;
@@ -1833,13 +1830,15 @@ static target_ulong
h_client_architecture_support(PowerPCCPU *cpu,
fdt_bufsize -= sizeof(hdr);
- fdt = spapr_build_fdt(spapr, false, fdt_bufsize);
+ fdt = spapr_build_fdt(spapr, !spapr->bios_enabled, fdt_bufsize);
_FDT((fdt_pack(fdt)));
- cpu_physical_memory_write(fdt_buf, &hdr, sizeof(hdr));
- cpu_physical_memory_write(fdt_buf + sizeof(hdr), fdt,
- fdt_totalsize(fdt));
- trace_spapr_cas_continue(fdt_totalsize(fdt) + sizeof(hdr));
+ if (spapr->bios_enabled) {
+ cpu_physical_memory_write(fdt_buf, &hdr, sizeof(hdr));
+ cpu_physical_memory_write(fdt_buf + sizeof(hdr), fdt,
+ fdt_totalsize(fdt));
+ trace_spapr_cas_continue(fdt_totalsize(fdt) + sizeof(hdr));
+ }
g_free(spapr->fdt_blob);
spapr->fdt_size = fdt_totalsize(fdt);
@@ -1854,6 +1853,20 @@ static target_ulong
h_client_architecture_support(PowerPCCPU *cpu,
return H_SUCCESS;
}
+static target_ulong h_client_architecture_support(PowerPCCPU *cpu,
+ SpaprMachineState *spapr,
+ target_ulong opcode,
+ target_ulong *args)
+{
+ /* Working address in data buffer */
+ target_ulong addr = ppc64_phys_to_real(args[0]);
+ target_ulong fdt_buf = args[1];
+ target_ulong fdt_bufsize = args[2];
+
+ return do_client_architecture_support(cpu, spapr, addr, fdt_buf,
+ fdt_bufsize);
+}
+
static target_ulong h_home_node_associativity(PowerPCCPU *cpu,
SpaprMachineState *spapr,
target_ulong opcode,
@@ -1998,6 +2011,14 @@ static target_ulong h_update_dt(PowerPCCPU *cpu,
SpaprMachineState *spapr,
return H_SUCCESS;
}
+static target_ulong h_client(PowerPCCPU *cpu, SpaprMachineState *spapr,
+ target_ulong opcode, target_ulong *args)
+{
+ target_ulong client_args = ppc64_phys_to_real(args[0]);
+
+ return spapr_h_client(spapr, client_args);
+}
+
static spapr_hcall_fn papr_hypercall_table[(MAX_HCALL_OPCODE / 4) + 1];
static spapr_hcall_fn kvmppc_hypercall_table[KVMPPC_HCALL_MAX -
KVMPPC_HCALL_BASE + 1];
static spapr_hcall_fn svm_hypercall_table[(SVM_HCALL_MAX - SVM_HCALL_BASE) / 4
+ 1];
@@ -2121,6 +2142,8 @@ static void hypercall_register_types(void)
spapr_register_hypercall(KVMPPC_H_UPDATE_DT, h_update_dt);
+ spapr_register_hypercall(KVMPPC_H_CLIENT, h_client);
+
/* Virtual Processor Home Node */
spapr_register_hypercall(H_HOME_NODE_ASSOCIATIVITY,
h_home_node_associativity);
diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events
index 9ea620f23c85..92bce3e44693 100644
--- a/hw/ppc/trace-events
+++ b/hw/ppc/trace-events
@@ -21,6 +21,15 @@ spapr_update_dt(unsigned cb) "New blob %u bytes"
spapr_update_dt_failed_size(unsigned cbold, unsigned cbnew, unsigned magic)
"Old blob %u bytes, new blob %u bytes, magic 0x%x"
spapr_update_dt_failed_check(unsigned cbold, unsigned cbnew, unsigned magic)
"Old blob %u bytes, new blob %u bytes, magic 0x%x"
+# spapr_client.c
+spapr_client_error_param(const char *method, int nargscheck, int nretcheck,
int nargs, int nret) "%s takes/returns %d/%d, not %d/%d"
+spapr_client_error_unknown_service(const char *service, int nargs, int nret)
"%s args=%d rets=%d"
+spapr_client_error_unknown_method(const char *method) "%s"
+spapr_client_claim(uint32_t virt, uint32_t size, uint32_t align, uint32_t ret)
"virt=0x%x size=0x%x align=0x%x => 0x%x"
+spapr_client_method(const char *method, uint32_t param1, uint32_t param2,
uint32_t ret) "%s(0x%x, 0x%x) => 0x%x"
+spapr_client_getprop(uint32_t ph, const char *prop, uint32_t ret)
"phandle=0x%x \"%s\" => 0x%x"
+spapr_client_setprop(uint32_t ph, const char *prop, uint32_t ret)
"phandle=0x%x \"%s\" => 0x%x"
+
# spapr_hcall_tpm.c
spapr_h_tpm_comm(const char *device_path, uint64_t operation)
"tpm_device_path=%s operation=0x%"PRIu64
spapr_tpm_execute(uint64_t data_in, uint64_t data_in_sz, uint64_t data_out,
uint64_t data_out_sz) "data_in=0x%"PRIx64", data_in_sz=%"PRIu64",
data_out=0x%"PRIx64", data_out_sz=%"PRIu64
--
2.17.1
- [PATCH qemu v2] spapr: Kill SLOF,
Alexey Kardashevskiy <=
- Re: [PATCH qemu v2] spapr: Kill SLOF, David Gibson, 2020/01/05
- Re: [PATCH qemu v2] spapr: Kill SLOF, Alexey Kardashevskiy, 2020/01/06
- Re: [PATCH qemu v2] spapr: Kill SLOF, David Gibson, 2020/01/06
- Re: [PATCH qemu v2] spapr: Kill SLOF, Alexey Kardashevskiy, 2020/01/06
- Re: [PATCH qemu v2] spapr: Kill SLOF, Cédric Le Goater, 2020/01/06
- Re: [PATCH qemu v2] spapr: Kill SLOF, Peter Maydell, 2020/01/06
- Re: [PATCH qemu v2] spapr: Kill SLOF, Philippe Mathieu-Daudé, 2020/01/06
- Re: [PATCH qemu v2] spapr: Kill SLOF, Alexey Kardashevskiy, 2020/01/06
- Re: [PATCH qemu v2] spapr: Kill SLOF, David Gibson, 2020/01/07
- Re: [PATCH qemu v2] spapr: Kill SLOF, Alexey Kardashevskiy, 2020/01/07