From patchwork Wed Mar 25 14:41:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1261426 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=vI8ipzUt; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48nW7p3Wm6z9sP7 for ; Thu, 26 Mar 2020 01:43:18 +1100 (AEDT) Received: from localhost ([::1]:37328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7FU-0003kg-Cw for incoming@patchwork.ozlabs.org; Wed, 25 Mar 2020 10:43:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37029) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7Ex-0003hP-Ux for qemu-devel@nongnu.org; Wed, 25 Mar 2020 10:42:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7Ew-0005XO-Pk for qemu-devel@nongnu.org; Wed, 25 Mar 2020 10:42:43 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:46537) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7Eu-0005UW-AJ; Wed, 25 Mar 2020 10:42:40 -0400 Received: by mail-pf1-x442.google.com with SMTP id q3so1111159pff.13; Wed, 25 Mar 2020 07:42:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gu6pywT46+NIJtDkxdkhjr7/9oPHNs5B3YjgwAQz2ZQ=; b=vI8ipzUtsfog2UdLfSd5QT65v3aV84AxI7Gea2Vamm2LvotNHN9DSH4miIblyhYjKl Hg0SkNw6L5O8mdhEmdz78AhtSK+utjj0OMqOi4H4HB1JV7bceji2NUTJEqd2hcQxxI6J oO/3EdSCOGLCk8XSJWmEG4q/b+f4Lot8x+oeq8NVeeGYhLsS7h95prQA2+hKr3Z+Qzn0 r53Pt6H5fnLUSrAY3xRm8ksHD4zILH8NyETW/ReMALKM5KPfdMRLJSRDfFMNFK+xi2hI 5WwRXnrxoafQmDVMdUzp8MW/TNtuENTX20Goj1ygVbpKx8LgakBBt8gzqudLypzOK2rg ZzbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gu6pywT46+NIJtDkxdkhjr7/9oPHNs5B3YjgwAQz2ZQ=; b=BFrILBE5EXW9swC1NwSuti0pGdKEBhqTXdEYjphTZlMhG9dSO5KfDzJfD2f/rl/FVz 8ETujjfy0kVGbgC1rELwevKGl08BICZF5TDWYVRwc62BS0TVnl0XHYTAQQfPT//7ImHp YFqi8NsjpkUwckfQiNUE7ibClGKGfY611HtZon5Qq+xD4f0c/LlArDaq2aip6WoneBQ1 /tdyOIHzy+7OoRJEKj5leowb7lNiRAva3qNZNSuCR4Cv2uj3QhGFICIdrLpgD8LFHLzU YWFeisF4C0fOXjUnhQjSH1yFf8/tyG7piNDEZXZ1ntThSt/5QahDVN6DHuqifZwiPAHB WRqQ== X-Gm-Message-State: ANhLgQ1T7yuikrD2zJ2/AZCpqEIKSaC1SqEAQDzfFmQJInMVgHRx6BqH zZyzFRijlq6FjwR4q0B+z6eQLTYA X-Google-Smtp-Source: ADFU+vum9tWbJL7v6l867URB0a+AVony1Jv78gtbKJrzMFbsfUflKX8VJYHQTQLPZJtO1kp/gsbgBQ== X-Received: by 2002:a63:e56:: with SMTP id 22mr3429177pgo.173.1585147359098; Wed, 25 Mar 2020 07:42:39 -0700 (PDT) Received: from bobo.ibm.com (14-202-190-183.tpgi.com.au. [14.202.190.183]) by smtp.gmail.com with ESMTPSA id 93sm4609599pjo.43.2020.03.25.07.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 07:42:38 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Subject: [PATCH 1/5] ppc/spapr: tweak change system reset helper Date: Thu, 26 Mar 2020 00:41:43 +1000 Message-Id: <20200325144147.221875-2-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200325144147.221875-1-npiggin@gmail.com> References: <20200325144147.221875-1-npiggin@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Kardashevskiy , Mahesh Salgaonkar , qemu-devel@nongnu.org, Nicholas Piggin , Greg Kurz , =?utf-8?b?Q8OpZHJp?= =?utf-8?q?c_Le_Goater?= , Ganesh Goudar , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Rather than have the helper take an optional vector address override, instead have its caller modify env->nip itself. This is more consistent when adding pnv nmi support, and also with mce injection added later. Signed-off-by: Nicholas Piggin Reviewed-by: Cédric Le Goater --- hw/ppc/spapr.c | 9 ++++++--- target/ppc/cpu.h | 2 +- target/ppc/excp_helper.c | 5 +---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 9a2bd501aa..785c41d205 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3385,13 +3385,13 @@ static void spapr_machine_finalizefn(Object *obj) void spapr_do_system_reset_on_cpu(CPUState *cs, run_on_cpu_data arg) { SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); + PowerPCCPU *cpu = POWERPC_CPU(cs); + CPUPPCState *env = &cpu->env; cpu_synchronize_state(cs); /* If FWNMI is inactive, addr will be -1, which will deliver to 0x100 */ if (spapr->fwnmi_system_reset_addr != -1) { uint64_t rtas_addr, addr; - PowerPCCPU *cpu = POWERPC_CPU(cs); - CPUPPCState *env = &cpu->env; /* get rtas addr from fdt */ rtas_addr = spapr_get_rtas_addr(); @@ -3405,7 +3405,10 @@ void spapr_do_system_reset_on_cpu(CPUState *cs, run_on_cpu_data arg) stq_be_phys(&address_space_memory, addr + sizeof(uint64_t), 0); env->gpr[3] = addr; } - ppc_cpu_do_system_reset(cs, spapr->fwnmi_system_reset_addr); + ppc_cpu_do_system_reset(cs); + if (spapr->fwnmi_system_reset_addr != -1) { + env->nip = spapr->fwnmi_system_reset_addr; + } } static void spapr_nmi(NMIState *n, int cpu_index, Error **errp) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 88d9449555..f4a5304d43 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1220,7 +1220,7 @@ int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, void *opaque); #ifndef CONFIG_USER_ONLY -void ppc_cpu_do_system_reset(CPUState *cs, target_ulong vector); +void ppc_cpu_do_system_reset(CPUState *cs); void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector); extern const VMStateDescription vmstate_ppc_cpu; #endif diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 08bc885ca6..7f2b5899d3 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -961,15 +961,12 @@ static void ppc_hw_interrupt(CPUPPCState *env) } } -void ppc_cpu_do_system_reset(CPUState *cs, target_ulong vector) +void ppc_cpu_do_system_reset(CPUState *cs) { PowerPCCPU *cpu = POWERPC_CPU(cs); CPUPPCState *env = &cpu->env; powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_RESET); - if (vector != -1) { - env->nip = vector; - } } void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector)