From: Janosch Frank <frankja@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
david@redhat.com
Subject: [PATCH 3/8] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant
Date: Tue, 24 Mar 2020 11:08:42 -0400 [thread overview]
Message-ID: <20200324150847.10476-4-frankja@linux.ibm.com> (raw)
In-Reply-To: <20200324150847.10476-1-frankja@linux.ibm.com>
ZMODE has a lot of ambiguity with the ESAME architecture mode, but is
actually 64 bit addressing.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
---
pc-bios/s390-ccw/dasd-ipl.c | 3 +--
pc-bios/s390-ccw/s390-arch.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pc-bios/s390-ccw/dasd-ipl.c b/pc-bios/s390-ccw/dasd-ipl.c
index 0fc879bb8e8faac7..b932531e6f838405 100644
--- a/pc-bios/s390-ccw/dasd-ipl.c
+++ b/pc-bios/s390-ccw/dasd-ipl.c
@@ -229,7 +229,6 @@ void dasd_ipl(SubChannelId schid, uint16_t cutype)
run_ipl2(schid, cutype, ipl2_addr);
/* Transfer control to the guest operating system */
- pswl->mask |= PSW_MASK_EAMODE; /* Force z-mode */
- pswl->addr |= PSW_MASK_BAMODE; /* ... */
+ pswl->mask |= PSW_MASK_64; /* Force 64 bit addressing */
jump_to_low_kernel();
}
diff --git a/pc-bios/s390-ccw/s390-arch.h b/pc-bios/s390-ccw/s390-arch.h
index 5f36361c0223d434..73852029d4e92cd9 100644
--- a/pc-bios/s390-ccw/s390-arch.h
+++ b/pc-bios/s390-ccw/s390-arch.h
@@ -29,7 +29,7 @@ _Static_assert(sizeof(struct PSWLegacy) == 8, "PSWLegacy size incorrect");
#define PSW_MASK_WAIT 0x0002000000000000ULL
#define PSW_MASK_EAMODE 0x0000000100000000ULL
#define PSW_MASK_BAMODE 0x0000000080000000ULL
-#define PSW_MASK_ZMODE (PSW_MASK_EAMODE | PSW_MASK_BAMODE)
+#define PSW_MASK_64 (PSW_MASK_EAMODE | PSW_MASK_BAMODE)
/* Low core mapping */
typedef struct LowCore {
--
2.25.1
next prev parent reply other threads:[~2020-03-24 15:11 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 15:08 [PATCH 0/8] pc-bios: s390x: Cleanup part 1 Janosch Frank
2020-03-24 15:08 ` [PATCH 1/8] pc-bios: s390x: Consolidate timing functions into time.h Janosch Frank
2020-03-27 10:21 ` David Hildenbrand
2020-03-24 15:08 ` [PATCH 2/8] pc-bios: s390x: Get rid of magic offsets into the lowcore Janosch Frank
2020-03-27 10:25 ` David Hildenbrand
2020-03-27 10:33 ` Janosch Frank
2020-03-24 15:08 ` Janosch Frank [this message]
2020-04-30 15:29 ` [PATCH 3/8] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant David Hildenbrand
2020-03-24 15:08 ` [PATCH 4/8] pc-bios: s390x: Use PSW masks where possible Janosch Frank
2020-04-30 15:34 ` David Hildenbrand
2020-03-24 15:08 ` [PATCH 5/8] pc-bios: s390x: Move panic() into header and add infinite loop Janosch Frank
2020-04-07 7:25 ` Cornelia Huck
2020-05-14 11:27 ` Janosch Frank
2020-05-14 11:49 ` Cornelia Huck
2020-04-30 15:42 ` David Hildenbrand
2020-05-04 6:46 ` Janosch Frank
2020-05-04 7:37 ` David Hildenbrand
2020-03-24 15:08 ` [PATCH 6/8] pc-bios: s390x: Use ebcdic2ascii table Janosch Frank
2020-04-30 15:35 ` David Hildenbrand
2020-03-24 15:08 ` [PATCH 7/8] pc-bios: s390x: Replace 0x00 with 0x0 or 0 Janosch Frank
2020-04-30 15:36 ` David Hildenbrand
2020-05-14 11:32 ` Janosch Frank
2020-03-24 15:08 ` [PATCH 8/8] pc-bios: s390x: Make u32 ptr check explicit Janosch Frank
2020-04-30 15:37 ` David Hildenbrand
2020-03-24 17:02 ` [PATCH 0/8] pc-bios: s390x: Cleanup part 1 no-reply
2020-04-29 12:11 ` Janosch Frank
2020-04-30 14:50 ` David Hildenbrand
2020-05-14 10:59 ` Cornelia Huck
2020-05-14 11:20 ` Janosch Frank
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=20200324150847.10476-4-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.