[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/28] Implement assorted pSeries hcalls and RTAS me
From: |
qemu |
Subject: |
[Qemu-devel] [PATCH 18/28] Implement assorted pSeries hcalls and RTAS methods |
Date: |
Tue, 15 Feb 2011 15:56:29 +1100 |
From: David Gibson <address@hidden(none)>
This patch adds several small utility hypercalls and RTAS methods to
the pSeries platform emulation. Specifically:
* 'display-character' rtas call
This just prints a character to the console, it's occasionally used
for early debug of the OS. The support includes a hack to make this
RTAS call respond on the normal token value present on real hardware,
since some early debugging tools just assume this value without
checking the device tree.
* 'get-time-of-day' rtas call
This one just takes the host real time, converts to the PAPR described
format and returns it to the guest.
* 'power-off' rtas call
This one shuts down the emulated system.
* H_DABR hypercall
On pSeries, the DABR debug register is usually a hypervisor resource
and virtualized through this hypercall. If the hypercall is not
present, Linux will under some circumstances attempt to manipulate the
DABR directly which will fail on this emulated machine.
This stub implementation is enough to stop that behaviour, although it
doesn't actually implement the requested DABR operations as yet.
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Paul Mackerras <address@hidden>
---
hw/spapr.c | 2 +-
hw/spapr_hcall.c | 10 ++++++++
hw/spapr_rtas.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 80 insertions(+), 1 deletions(-)
diff --git a/hw/spapr.c b/hw/spapr.c
index f41451b..23f493a 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -61,7 +61,7 @@ static void *spapr_create_fdt(int *fdt_size, ram_addr_t
ramsize,
uint32_t start_prop = cpu_to_be32(initrd_base);
uint32_t end_prop = cpu_to_be32(initrd_base + initrd_size);
uint32_t pft_size_prop[] = {0, cpu_to_be32(hash_shift)};
- char hypertas_prop[] = "hcall-pft\0hcall-term";
+ char hypertas_prop[] = "hcall-pft\0hcall-term\0hcall-dabr";
int i;
char *modelname;
int ret;
diff --git a/hw/spapr_hcall.c b/hw/spapr_hcall.c
index 7b8e17c..0ff83c9 100644
--- a/hw/spapr_hcall.c
+++ b/hw/spapr_hcall.c
@@ -241,6 +241,13 @@ static target_ulong h_protect(CPUState *env,
sPAPREnvironment *spapr,
return H_SUCCESS;
}
+static target_ulong h_set_dabr(CPUState *env, sPAPREnvironment *spapr,
+ target_ulong opcode, target_ulong *args)
+{
+ /* FIXME: actually implement this */
+ return H_HARDWARE;
+}
+
static target_ulong h_rtas(sPAPREnvironment *spapr, target_ulong rtas_r3)
{
uint32_t token = ldl_phys(rtas_r3);
@@ -301,5 +308,8 @@ static void hypercall_init(void)
spapr_register_hypercall(H_ENTER, h_enter);
spapr_register_hypercall(H_REMOVE, h_remove);
spapr_register_hypercall(H_PROTECT, h_protect);
+
+ /* hcall-dabr */
+ spapr_register_hypercall(H_SET_DABR, h_set_dabr);
}
device_init(hypercall_init);
diff --git a/hw/spapr_rtas.c b/hw/spapr_rtas.c
index c606018..354f4df 100644
--- a/hw/spapr_rtas.c
+++ b/hw/spapr_rtas.c
@@ -12,6 +12,58 @@
#define TOKEN_BASE 0x2000
#define TOKEN_MAX 0x100
+static void rtas_display_character(sPAPREnvironment *spapr,
+ uint32_t token, uint32_t nargs,
+ target_ulong args,
+ uint32_t nret, target_ulong rets)
+{
+ uint8_t c = rtas_ld(args, 0);
+ VIOsPAPRDevice *sdev = spapr_vio_find_by_reg(spapr->vio_bus, 0);
+
+ if (!sdev) {
+ rtas_st(rets, 0, -1);
+ } else {
+ vty_putchars(sdev, &c, sizeof(c));
+ rtas_st(rets, 0, 0);
+ }
+}
+
+static void rtas_get_time_of_day(sPAPREnvironment *spapr,
+ uint32_t token, uint32_t nargs,
+ target_ulong args,
+ uint32_t nret, target_ulong rets)
+{
+ struct tm tm;
+
+ if (nret != 8) {
+ rtas_st(rets, 0, -3);
+ return;
+ }
+
+ qemu_get_timedate(&tm, 0);
+
+ rtas_st(rets, 0, 0); /* Success */
+ rtas_st(rets, 1, tm.tm_year + 1900);
+ rtas_st(rets, 2, tm.tm_mon + 1);
+ rtas_st(rets, 3, tm.tm_mday);
+ rtas_st(rets, 4, tm.tm_hour);
+ rtas_st(rets, 5, tm.tm_min);
+ rtas_st(rets, 6, tm.tm_sec);
+ rtas_st(rets, 7, 0); /* we don't do nanoseconds */
+}
+
+static void rtas_power_off(sPAPREnvironment *spapr,
+ uint32_t token, uint32_t nargs, target_ulong args,
+ uint32_t nret, target_ulong rets)
+{
+ if (nargs != 2 || nret != 1) {
+ rtas_st(rets, 0, -3);
+ return;
+ }
+ qemu_system_shutdown_request();
+ rtas_st(rets, 0, 0);
+}
+
static struct rtas_call {
const char *name;
spapr_rtas_fn fn;
@@ -33,6 +85,15 @@ target_ulong spapr_rtas_call(sPAPREnvironment *spapr,
}
}
+ /* HACK: Some Linux early debug code uses RTAS display-character,
+ * but assumes the token value is 0xa (which it is on some real
+ * machines) without looking it up in the device tree. This
+ * special case makes this work */
+ if (token == 0xa) {
+ rtas_display_character(spapr, 0xa, nargs, args, nret, rets);
+ return H_SUCCESS;
+ }
+
fprintf(stderr, "Unknown RTAS token 0x%x\n", token);
rtas_st(rets, 0, -3);
return H_PARAMETER;
@@ -102,3 +163,11 @@ int spapr_rtas_device_tree_setup(void *fdt,
target_phys_addr_t rtas_addr,
}
return 0;
}
+
+static void register_core_rtas(void)
+{
+ spapr_rtas_register("display-character", rtas_display_character);
+ spapr_rtas_register("get-time-of-day", rtas_get_time_of_day);
+ spapr_rtas_register("power-off", rtas_power_off);
+}
+device_init(register_core_rtas);
--
1.7.1
- [Qemu-devel] [PATCH 02/28] Clean up PowerPC SLB handling code, (continued)
- [Qemu-devel] [PATCH 02/28] Clean up PowerPC SLB handling code, qemu, 2011/02/14
- [Qemu-devel] [PATCH 04/28] Add a hook to allow hypercalls to be emulated on PowerPC, qemu, 2011/02/14
- [Qemu-devel] [PATCH 05/28] Implement PowerPC slbmfee and slbmfev instructions, qemu, 2011/02/14
- [Qemu-devel] [PATCH 08/28] Clean up slb_lookup() function, qemu, 2011/02/14
- [Qemu-devel] [PATCH 07/28] Correct ppc popcntb logic, implement popcntw and popcntd, qemu, 2011/02/14
- [Qemu-devel] [PATCH 11/28] Better factor the ppc hash translation path, qemu, 2011/02/14
- [Qemu-devel] [PATCH 09/28] Parse SDR1 on mtspr instead of at translate time, qemu, 2011/02/14
- [Qemu-devel] [PATCH 10/28] Use "hash" more consistently in ppc mmu code, qemu, 2011/02/14
- [Qemu-devel] [PATCH 12/28] Support 1T segments on ppc, qemu, 2011/02/14
- [Qemu-devel] [PATCH 13/28] Add POWER7 support for ppc, qemu, 2011/02/14
- [Qemu-devel] [PATCH 18/28] Implement assorted pSeries hcalls and RTAS methods,
qemu <=
- [Qemu-devel] [PATCH 17/28] Implement hcall based RTAS for pSeries machines, qemu, 2011/02/14
- [Qemu-devel] [PATCH 20/28] Add PAPR H_VIO_SIGNAL hypercall and infrastructure for VIO interrupts, qemu, 2011/02/14
- [Qemu-devel] [PATCH 14/28] Start implementing pSeries logical partition machine, qemu, 2011/02/14
- [Qemu-devel] [PATCH 21/28] Add (virtual)_interrupt to PAPR virtual tty device, qemu, 2011/02/14
- [Qemu-devel] [PATCH 19/28] Implement the PAPR (pSeries) virtualized interrupt controller (xics), qemu, 2011/02/14
- [Qemu-devel] [PATCH 15/28] Implement the bus structure for PAPR virtual IO, qemu, 2011/02/14
- [Qemu-devel] [PATCH 26/28] Add a PAPR TCE-bypass mechanism for the pSeries machine, qemu, 2011/02/14
- [Qemu-devel] [PATCH 24/28] Implement PAPR CRQ hypercalls, qemu, 2011/02/14
- [Qemu-devel] [PATCH 23/28] Implement sPAPR Virtual LAN (ibmveth), qemu, 2011/02/14
- [Qemu-devel] [PATCH 16/28] Virtual hash page table handling on pSeries machine, qemu, 2011/02/14