From: Janosch Frank <frankja@linux.ibm.com>
To: Thomas Huth <thuth@redhat.com>, qemu-devel@nongnu.org
Cc: pmorel@linux.ibm.com, david@redhat.com, cohuck@redhat.com,
borntraeger@de.ibm.com, qemu-s390x@nongnu.org,
mihajlov@linux.ibm.com
Subject: Re: [PATCH v4 3/6] s390x: Move initial reset
Date: Thu, 28 Nov 2019 08:22:11 +0100 [thread overview]
Message-ID: <f6fa8125-716f-24e0-46a0-c39d0832e21f@linux.ibm.com> (raw)
In-Reply-To: <a49ea81f-7275-3d4b-a1e5-5f8c666ea127@redhat.com>
[-- Attachment #1.1: Type: text/plain, Size: 4059 bytes --]
On 11/28/19 8:00 AM, Thomas Huth wrote:
> On 27/11/2019 18.50, Janosch Frank wrote:
>> Let's move the intial reset into the reset handler and cleanup
>> afterwards.
>>
>> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
>> Reviewed-by: David Hildenbrand <david@redhat.com>
>> ---
>> target/s390x/cpu-qom.h | 2 +-
>> target/s390x/cpu.c | 44 ++++++++++++++++--------------------------
>> target/s390x/cpu.h | 2 +-
>> target/s390x/sigp.c | 2 +-
>> 4 files changed, 20 insertions(+), 30 deletions(-)
>>
>> diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h
>> index f3b71bac67..6f0a12042e 100644
>> --- a/target/s390x/cpu-qom.h
>> +++ b/target/s390x/cpu-qom.h
>> @@ -36,6 +36,7 @@ typedef struct S390CPUDef S390CPUDef;
>>
>> typedef enum cpu_reset_type {
>> S390_CPU_RESET_NORMAL,
>> + S390_CPU_RESET_INITIAL,
>> } cpu_reset_type;
>>
>> /**
>> @@ -62,7 +63,6 @@ typedef struct S390CPUClass {
>> void (*parent_reset)(CPUState *cpu);
>> void (*load_normal)(CPUState *cpu);
>> void (*reset)(CPUState *cpu, cpu_reset_type type);
>> - void (*initial_cpu_reset)(CPUState *cpu);
>> } S390CPUClass;
>>
>> typedef struct S390CPU S390CPU;
>> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
>> index 67d6fbfa44..55e2d1fe7b 100644
>> --- a/target/s390x/cpu.c
>> +++ b/target/s390x/cpu.c
>> @@ -94,6 +94,23 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
>> s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
>>
>> switch (type) {
>> + case S390_CPU_RESET_INITIAL:
>> + /* initial reset does not clear everything! */
>> + memset(&env->start_initial_reset_fields, 0,
>> + offsetof(CPUS390XState, end_reset_fields) -
>> + offsetof(CPUS390XState, start_initial_reset_fields));
>> +
>> + /* architectured initial value for Breaking-Event-Address register */
>> + env->gbea = 1;
>> +
>> + /* architectured initial values for CR 0 and 14 */
>> + env->cregs[0] = CR0_RESET;
>> + env->cregs[14] = CR14_RESET;
>> +
>> + /* tininess for underflow is detected before rounding */
>> + set_float_detect_tininess(float_tininess_before_rounding,
>> + &env->fpu_status);
>> + /* fall through */
>> case S390_CPU_RESET_NORMAL:
>> env->pfault_token = -1UL;
>> env->bpbc = false;
>> @@ -101,32 +118,6 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
>> default:
>> g_assert_not_reached();
>> }
>> -}
>> -
>> -/* S390CPUClass::initial_reset() */
>> -static void s390_cpu_initial_reset(CPUState *s)
>> -{
>> - S390CPU *cpu = S390_CPU(s);
>> - CPUS390XState *env = &cpu->env;
>> -
>> - s390_cpu_reset(s, S390_CPU_RESET_NORMAL);
>> - /* initial reset does not clear everything! */
>> - memset(&env->start_initial_reset_fields, 0,
>> - offsetof(CPUS390XState, end_reset_fields) -
>> - offsetof(CPUS390XState, start_initial_reset_fields));
>> -
>> - /* architectured initial values for CR 0 and 14 */
>> - env->cregs[0] = CR0_RESET;
>> - env->cregs[14] = CR14_RESET;
>> -
>> - /* architectured initial value for Breaking-Event-Address register */
>> - env->gbea = 1;
>> -
>> - env->pfault_token = -1UL;
>> -
>> - /* tininess for underflow is detected before rounding */
>> - set_float_detect_tininess(float_tininess_before_rounding,
>> - &env->fpu_status);
>>
>> /* Reset state inside the kernel that we cannot access yet from QEMU. */
>> if (kvm_enabled()) {
>
> You're doing the if (kvm_enabled()) now also for S390_CPU_RESET_NORMAL
> ... is that OK? It's doing an KVM_S390_INITIAL_RESET ioctl(), so that
> sounds suspicious to me. Don't you have to add a check for type !=
> S390_CPU_RESET_NORMAL here?
>
> Thomas
Yes, I need to fence the NORMAL case again.
>
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-11-28 7:23 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 17:50 [PATCH v4 0/6] s390x: Cleanup Janosch Frank
2019-11-27 17:50 ` [PATCH v4 1/6] s390x: Don't do a normal reset on the initial cpu Janosch Frank
2019-11-27 17:50 ` [PATCH v4 2/6] s390x: Move reset normal to shared reset handler Janosch Frank
2019-11-28 6:32 ` Thomas Huth
2019-11-28 17:27 ` Cornelia Huck
2019-11-27 17:50 ` [PATCH v4 3/6] s390x: Move initial reset Janosch Frank
2019-11-28 7:00 ` Thomas Huth
2019-11-28 7:22 ` Janosch Frank [this message]
2019-11-28 8:37 ` [PATCH v5] " Janosch Frank
2019-11-28 9:13 ` Thomas Huth
2019-11-27 17:50 ` [PATCH v4 4/6] s390x: Move clear reset Janosch Frank
2019-11-27 18:15 ` David Hildenbrand
2019-11-27 18:28 ` Janosch Frank
2019-11-28 7:09 ` Thomas Huth
2019-11-28 8:35 ` Janosch Frank
2019-11-28 8:38 ` David Hildenbrand
2019-11-27 17:50 ` [PATCH v4 5/6] s390x: Beautify diag308 handling Janosch Frank
2019-11-27 17:50 ` [PATCH v4 6/6] s390x: kvm: Make kvm_sclp_service_call void Janosch Frank
2019-11-27 18:07 ` David Hildenbrand
2019-11-27 18:17 ` David Hildenbrand
2019-11-27 18:25 ` Janosch Frank
2019-11-27 18:38 ` Janosch Frank
2019-11-28 17:34 ` Cornelia Huck
2019-11-29 8:16 ` Janosch Frank
2019-11-29 9:01 ` Cornelia Huck
2019-11-29 9:17 ` [PATCH v5] " Janosch Frank
2019-11-29 9:18 ` David Hildenbrand
2019-11-28 7:48 ` [PATCH v4 6/6] " Thomas Huth
2019-11-29 10:03 ` [PATCH v4 0/6] s390x: Cleanup Cornelia Huck
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=f6fa8125-716f-24e0-46a0-c39d0832e21f@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=mihajlov@linux.ibm.com \
--cc=pmorel@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/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).