From: David Gibson <david@gibson.dropbear.id.au>
To: peter.maydell@linaro.org
Cc: agraf@suse.de, groug@kaod.org, mdroth@linux.vnet.ibm.com,
lvivier@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org,
"Cédric Le Goater" <clg@kaod.org>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PULL 11/24] spapr/rtas: fix reboot of a a SMP TCG guest
Date: Fri, 15 Dec 2017 16:54:22 +1100 [thread overview]
Message-ID: <20171215055435.24204-12-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20171215055435.24204-1-david@gibson.dropbear.id.au>
From: Cédric Le Goater <clg@kaod.org>
Just like for hot unplug CPUs, when a guest is rebooted, the secondary
CPUs can be awaken by the decrementer and start entering SLOF at the
same time the boot CPU is.
To be safe, let's disable on the secondaries all the exceptions which
can cause an exit while the CPU is in power-saving mode.
Based on previous work from Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
hw/ppc/spapr_cpu_core.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 588f9b4571..1ea0e295dd 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -26,6 +26,7 @@ static void spapr_cpu_reset(void *opaque)
PowerPCCPU *cpu = opaque;
CPUState *cs = CPU(cpu);
CPUPPCState *env = &cpu->env;
+ PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
cpu_reset(cs);
@@ -35,6 +36,13 @@ static void spapr_cpu_reset(void *opaque)
cs->halted = 1;
env->spr[SPR_HIOR] = 0;
+
+ /* Disable Power-saving mode Exit Cause exceptions for the CPU.
+ * This can cause issues when rebooting the guest if a secondary
+ * is awaken */
+ if (cs != first_cpu) {
+ env->spr[SPR_LPCR] &= ~pcc->lpcr_pm;
+ }
}
static void spapr_cpu_destroy(PowerPCCPU *cpu)
--
2.14.3
next prev parent reply other threads:[~2017-12-15 5:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-15 5:54 [Qemu-devel] [PULL 00/24] ppc-for-2.12 queue 20171215 David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 01/24] target/ppc: Use tcg_gen_lookup_and_goto_ptr David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 02/24] ppc/xics: remove useless if condition David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 03/24] spapr: Add pseries-2.12 machine type David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 04/24] spapr_cpu_core: instantiate CPUs separately David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 05/24] e500: name openpic and pci host bridge David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 06/24] nvram: add AT24Cx i2c eeprom David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 07/24] pcc: define the Power-saving mode Exit Cause Enable bits in PowerPCCPUClass David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 08/24] openpic: debug w/ info_report() David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 09/24] e500: fix pci host bridge class/type David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 10/24] spapr/rtas: disable the decrementer interrupt when a CPU is unplugged David Gibson
2017-12-15 5:54 ` David Gibson [this message]
2017-12-15 5:54 ` [Qemu-devel] [PULL 12/24] spapr/rtas: do not reset the MSR in stop-self command David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 13/24] ppc/xics: introduce an icp_create() helper David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 14/24] ppc/xics: assign of the CPU 'intc' pointer under the core David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 15/24] spapr: move the IRQ allocation routines under the machine David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 16/24] spapr: introduce a spapr_irq_set_lsi() helper David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 17/24] spapr: introduce a spapr_qirq() helper David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 18/24] spapr: replace numa_get_node() with lookup in pc-dimm list David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 19/24] spapr: fix LSI interrupt specifiers in the device tree David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 20/24] spapr_events: drop bogus cell from "interrupt-ranges" property David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 21/24] target/ppc: introduce the PPC_BIT() macro David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 22/24] spapr: Rename machine init functions for clarity David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 23/24] spapr: Assume msi_nonbroken David Gibson
2017-12-15 5:54 ` [Qemu-devel] [PULL 24/24] spapr: don't initialize PATB entry if max-cpu-compat < power9 David Gibson
2017-12-15 12:38 ` [Qemu-devel] [PULL 00/24] ppc-for-2.12 queue 20171215 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171215055435.24204-12-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=agraf@suse.de \
--cc=clg@kaod.org \
--cc=groug@kaod.org \
--cc=lvivier@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).