From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxGX7-0001Qg-Td for qemu-devel@nongnu.org; Thu, 20 Oct 2016 12:49:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bxGX4-0003VC-QQ for qemu-devel@nongnu.org; Thu, 20 Oct 2016 12:49:33 -0400 Received: from 9.mo7.mail-out.ovh.net ([46.105.60.248]:44692) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bxGX4-0003Ur-KY for qemu-devel@nongnu.org; Thu, 20 Oct 2016 12:49:30 -0400 Received: from player694.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id 1AF64DC17 for ; Thu, 20 Oct 2016 18:49:29 +0200 (CEST) Date: Thu, 20 Oct 2016 18:49:22 +0200 From: Greg Kurz Message-ID: <20161020184922.518a2e44@bahia> In-Reply-To: <20161020065912.16132-4-npiggin@gmail.com> References: <20161020065912.16132-1-npiggin@gmail.com> <20161020065912.16132-4-npiggin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 3/3] ppc/spapr: implement H_SIGNAL_SYS_RESET List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nicholas Piggin Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson On Thu, 20 Oct 2016 17:59:12 +1100 Nicholas Piggin wrote: > The H_SIGNAL_SYS_RESET hcall allows a guest CPU to raise a system > reset exception on other CPUs in the same guest. > Actually on all CPUs or all-but-self CPUs or a specific CPU (including self). > Signed-off-by: Nicholas Piggin > --- > hw/ppc/spapr_hcall.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > include/hw/ppc/spapr.h | 8 +++++++- > 2 files changed, 49 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c > index c5e7e8c..5ae84f0 100644 > --- a/hw/ppc/spapr_hcall.c > +++ b/hw/ppc/spapr_hcall.c > @@ -880,6 +880,47 @@ static target_ulong h_set_mode(PowerPCCPU *cpu, sPAPRMachineState *spapr, > return ret; > } > > +static void do_sys_reset(CPUState *cs, void *arg) > +{ > + cpu_synchronize_state(cs); > + ppc_cpu_do_system_reset(cs); > +} > + We already have the following function in hw/ppc/spapr.c, which serves the same purpose: static void ppc_cpu_do_nmi_on_cpu(CPUState *cs, void *arg) { cpu_synchronize_state(cs); ppc_cpu_do_system_reset(cs); } What about using it ? > +static target_ulong h_signal_sys_reset(PowerPCCPU *cpu, > + sPAPRMachineState *spapr, > + target_ulong opcode, target_ulong *args) > +{ > + target_long target = args[0]; > + CPUState *cs; > + > + if (target < H_SIGNAL_SYS_RESET_ALLBUTSELF) { > + return H_PARAMETER; > + } > + > + CPU_FOREACH(cs) { > + PowerPCCPU *c = POWERPC_CPU(cs); > + > + if (cpu->cpu_dt_id == target) { > + run_on_cpu(cs, do_sys_reset, NULL); > + return H_SUCCESS; > + } > + > + if (target == H_SIGNAL_SYS_RESET_ALLBUTSELF) { > + if (c == cpu) { > + continue; > + } > + } > + > + run_on_cpu(cs, do_sys_reset, NULL); > + } > + > + if (target >= 0) { > + return H_PARAMETER; > + } > + > + return H_SUCCESS; > +} > + > /* > * Return the offset to the requested option vector @vector in the > * option vector table @table. > @@ -1113,6 +1154,7 @@ static void hypercall_register_types(void) > /* hcall-splpar */ > spapr_register_hypercall(H_REGISTER_VPA, h_register_vpa); > spapr_register_hypercall(H_CEDE, h_cede); > + spapr_register_hypercall(H_SIGNAL_SYS_RESET, h_signal_sys_reset); > > /* processor register resource access h-calls */ > spapr_register_hypercall(H_SET_SPRG0, h_set_sprg0); > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index aeaba3e..a28538b 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -339,7 +339,13 @@ struct sPAPRMachineState { > #define H_XIRR_X 0x2FC > #define H_RANDOM 0x300 > #define H_SET_MODE 0x31C > -#define MAX_HCALL_OPCODE H_SET_MODE > +#define H_SIGNAL_SYS_RESET 0x380 > +#define MAX_HCALL_OPCODE H_SIGNAL_SYS_RESET > + > +/* Parameters to H_SIGNAL_SYS_RESET */ > +#define H_SIGNAL_SYS_RESET_ALL -1 > +#define H_SIGNAL_SYS_RESET_ALLBUTSELF -2 > + I'd rather move these to hw/ppc/spapr_hcall.c just above h_signal_sys_reset(), the same way it is done for h_bulk_remove(). > > /* The hcalls above are standardized in PAPR and implemented by pHyp > * as well.