From: Jens Freimann <jfrei@linux.vnet.ibm.com>
To: Alexander Graf <agraf@suse.de>
Cc: Heinz Graalfs <graalfs@linux.vnet.ibm.com>,
qemu-devel <qemu-devel@nongnu.org>,
Andreas Faerber <afaerber@suse.de>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Cornelia Huck <cornelia.huck@de.ibm.com>,
Einar Lueck <elelueck@linux.vnet.ibm.com>
Subject: Re: [Qemu-devel] [PATCH 2/3] s390: Add CPU reset handler
Date: Fri, 4 Jan 2013 14:55:05 +0100 [thread overview]
Message-ID: <20130104135505.GA8533@linux.vnet.ibm.com> (raw)
In-Reply-To: <085AA70B-8A78-4D0C-98BE-1591D085507D@suse.de>
On Thu, Jan 03, 2013 at 01:50:22PM +0100, Alexander Graf wrote:
>
> On 18.12.2012, at 18:50, Jens Freimann wrote:
>
> > Add a CPU reset handler to have all CPUs in a PoP compliant
> > state.
> >
> > Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
> >
> > ---
> > v2 -> v3:
> > * remove FIXME
> > * separate parent reset from local reset by adding a while line
> > * use defines for register reset values
> >
> > v1 -> v2:
> > * move setting of control registers and psa to s390_cpu_reset
> > and call it from the new s390_machine_cpu_reset_cb()
> > This makes it more similar to how it is done on x86
> > * in s390_cpu_reset() set env->halted state of cpu after
> > the memset. This is needed to keep our s390_cpu_running
> > counter in sync when s390_cpu_reset is called via the
> > qemu_devices_reset path
> > * set env->halted state in s390_cpu_initfn to 1 to avoid
> > decrementing the cpu counter during first reset
> > ---
> > target-s390x/cpu.c | 35 +++++++++++++++++++++++++++++++++--
> > target-s390x/kvm.c | 9 ++++++++-
> > 2 files changed, 41 insertions(+), 3 deletions(-)
> >
> > diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
> > index 619b202..58e412a 100644
> > --- a/target-s390x/cpu.c
> > +++ b/target-s390x/cpu.c
> > @@ -4,6 +4,7 @@
> > * Copyright (c) 2009 Ulrich Hecht
> > * Copyright (c) 2011 Alexander Graf
> > * Copyright (c) 2012 SUSE LINUX Products GmbH
> > + * Copyright (c) 2012 IBM Corp.
> > *
> > * This library is free software; you can redistribute it and/or
> > * modify it under the terms of the GNU Lesser General Public
> > @@ -18,12 +19,19 @@
> > * You should have received a copy of the GNU Lesser General Public
> > * License along with this library; if not, see
> > * <http://www.gnu.org/licenses/lgpl-2.1.html>
> > + * Contributions after 2012-12-11 are licensed under the terms of the
> > + * GNU GPL, version 2 or (at your option) any later version.
> > + *
> > */
> >
> > #include "cpu.h"
> > +#include "hw/hw.h"
> > #include "qemu-common.h"
> > #include "qemu-timer.h"
> >
> > +#define IPL_PSW_MASK 0x0000000180000000ULL
> > +#define CR0_RESET 0xE0UL
> > +#define CR14_RESET 0xC2000000UL;
> >
> > /* CPUClass::reset() */
> > static void s390_cpu_reset(CPUState *s)
> > @@ -37,12 +45,30 @@ static void s390_cpu_reset(CPUState *s)
> > log_cpu_state(env, 0);
> > }
> >
> > + s390_del_running_cpu(env);
> > +
> > scc->parent_reset(s);
> >
> > memset(env, 0, offsetof(CPUS390XState, breakpoints));
> > - /* FIXME: reset vector? */
> > +
> > + /* architectured initial values for CR 0 and 14 */
> > + env->cregs[0] = CR0_RESET;
> > + env->cregs[14] = CR14_RESET;
> > + /* set to z/Architecture mode */
> > + env->psw.mask = IPL_PSW_MASK;
>
> Why would we set psw.mask, but not psw.addr? In fact, why are we setting psw at all here? Shouldn't we just leave it at 0 from the memset and simply override it in the ipl device?
I agree that it's redundand as we set it in the ipl device code and that it would work without setting
the mask here. I put it in here because I consider it part of the CPU reset code since we always want to start
in z/Architecture mode regardless of what code runs after the reset.
Jens
>
> Alex
>
next prev parent reply other threads:[~2013-01-04 13:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-18 17:50 [Qemu-devel] [PATCH 0/3] s390: ipl device, cpu reset handler and cpu model support Jens Freimann
2012-12-18 17:50 ` [Qemu-devel] [PATCH 1/3] s390: Move IPL code into a separate device Jens Freimann
2013-01-03 12:47 ` Alexander Graf
2012-12-18 17:50 ` [Qemu-devel] [PATCH 2/3] s390: Add CPU reset handler Jens Freimann
2013-01-03 12:50 ` Alexander Graf
2013-01-04 13:55 ` Jens Freimann [this message]
2013-01-03 12:55 ` Alexander Graf
2013-01-04 14:09 ` Jens Freimann
2013-01-04 14:11 ` Alexander Graf
2012-12-18 17:50 ` [Qemu-devel] [PATCH 3/3] S390: Enable -cpu help and QMP query-cpu-definitions Jens Freimann
2013-01-03 13:01 ` Alexander Graf
-- strict thread matches above, loose matches on Subject: below --
2012-12-14 16:46 [Qemu-devel] [PATCH 0/3] s390: ipl device, cpu reset handler and cpu model support Jens Freimann
2012-12-14 16:46 ` [Qemu-devel] [PATCH 2/3] s390: Add CPU reset handler Jens Freimann
2012-12-16 15:30 ` Andreas Färber
2012-12-17 8:49 ` Jens Freimann
2012-12-17 14:49 ` Alexander Graf
2012-12-17 15:41 ` Jens Freimann
2012-12-17 17:21 ` Andreas Färber
2012-12-17 17:27 ` Alexander Graf
2012-12-12 13:08 [Qemu-devel] [PATCH 0/3] s390: ipl device, cpu reset handler and cpu model support Jens Freimann
2012-12-12 13:08 ` [Qemu-devel] [PATCH 2/3] s390: Add CPU reset handler Jens Freimann
2012-12-12 13:38 ` Alexander Graf
2012-12-12 15:04 ` Jens Freimann
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=20130104135505.GA8533@linux.vnet.ibm.com \
--to=jfrei@linux.vnet.ibm.com \
--cc=afaerber@suse.de \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=cornelia.huck@de.ibm.com \
--cc=elelueck@linux.vnet.ibm.com \
--cc=graalfs@linux.vnet.ibm.com \
--cc=qemu-devel@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).