From: Thomas Huth <thuth@redhat.com>
To: Janosch Frank <frankja@linux.ibm.com>, qemu-devel@nongnu.org
Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
david@redhat.com
Subject: Re: [PATCH v2 5/9] pc-bios: s390x: Use PSW masks where possible
Date: Thu, 21 May 2020 07:50:35 +0200 [thread overview]
Message-ID: <f4e7b4fa-b2f4-13ee-2a20-3e7ce1a26c54@redhat.com> (raw)
In-Reply-To: <20200514123729.156283-6-frankja@linux.ibm.com>
On 14/05/2020 14.37, Janosch Frank wrote:
> Let's move some of the PSW mask defines into s390-arch.h and use them
> in jump2ipl.c
>
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> Reviewed-by: David Hildenbrand <david@redhat.com>
> ---
> pc-bios/s390-ccw/jump2ipl.c | 10 ++++------
> pc-bios/s390-ccw/s390-arch.h | 2 ++
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c
> index 4eba2510b0..767012bf0c 100644
> --- a/pc-bios/s390-ccw/jump2ipl.c
> +++ b/pc-bios/s390-ccw/jump2ipl.c
> @@ -8,12 +8,10 @@
>
> #include "libc.h"
> #include "s390-ccw.h"
> +#include "s390-arch.h"
>
> #define KERN_IMAGE_START 0x010000UL
> -#define PSW_MASK_64 0x0000000100000000ULL
> -#define PSW_MASK_32 0x0000000080000000ULL
> -#define PSW_MASK_SHORTPSW 0x0008000000000000ULL
> -#define RESET_PSW_MASK (PSW_MASK_SHORTPSW | PSW_MASK_32 | PSW_MASK_64)
> +#define RESET_PSW_MASK (PSW_MASK_SHORTPSW | PSW_MASK_64)
>
> typedef struct ResetInfo {
> uint64_t ipl_psw;
> @@ -54,7 +52,7 @@ void jump_to_IPL_code(uint64_t address)
>
> current->ipl_psw = (uint64_t) &jump_to_IPL_2;
> current->ipl_psw |= RESET_PSW_MASK;
> - current->ipl_continue = address & 0x7fffffff;
> + current->ipl_continue = address & PSW_MASK_SHORT_ADDR;
>
> debug_print_int("set IPL addr to", current->ipl_continue);
>
> @@ -86,7 +84,7 @@ void jump_to_low_kernel(void)
>
> /* Trying to get PSW at zero address */
> if (*((uint64_t *)0) & RESET_PSW_MASK) {
> - jump_to_IPL_code((*((uint64_t *)0)) & 0x7fffffff);
> + jump_to_IPL_code((*((uint64_t *)0)) & PSW_MASK_SHORT_ADDR);
> }
>
> /* No other option left, so use the Linux kernel start address */
> diff --git a/pc-bios/s390-ccw/s390-arch.h b/pc-bios/s390-ccw/s390-arch.h
> index 73852029d4..6da44d4436 100644
> --- a/pc-bios/s390-ccw/s390-arch.h
> +++ b/pc-bios/s390-ccw/s390-arch.h
> @@ -26,9 +26,11 @@ _Static_assert(sizeof(struct PSWLegacy) == 8, "PSWLegacy size incorrect");
>
> /* s390 psw bit masks */
> #define PSW_MASK_IOINT 0x0200000000000000ULL
> +#define PSW_MASK_SHORTPSW 0x0008000000000000ULL
> #define PSW_MASK_WAIT 0x0002000000000000ULL
> #define PSW_MASK_EAMODE 0x0000000100000000ULL
> #define PSW_MASK_BAMODE 0x0000000080000000ULL
> +#define PSW_MASK_SHORT_ADDR 0x000000007fffffffULL
Please also mention that new define in the patch description.
Thomas
next prev parent reply other threads:[~2020-05-21 5:51 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 12:37 [PATCH v2 0/9] pc-bios: s390x: Cleanup part 1 Janosch Frank
2020-05-14 12:37 ` [PATCH v2 1/9] pc-bios: s390x: cio.c cleanup and compile fix Janosch Frank
2020-05-18 11:52 ` David Hildenbrand
2020-05-18 12:02 ` Janosch Frank
2020-05-20 19:37 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 2/9] pc-bios: s390x: Consolidate timing functions into time.h Janosch Frank
2020-05-18 12:01 ` David Hildenbrand
2020-05-18 12:09 ` Janosch Frank
2020-05-18 12:45 ` David Hildenbrand
2020-05-20 19:53 ` Thomas Huth
2020-05-25 12:20 ` Janosch Frank
2020-05-14 12:37 ` [PATCH v2 3/9] pc-bios: s390x: Get rid of magic offsets into the lowcore Janosch Frank
2020-05-18 12:46 ` David Hildenbrand
2020-05-20 19:57 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 4/9] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant Janosch Frank
2020-05-21 5:44 ` Thomas Huth
2020-05-21 5:47 ` Thomas Huth
2020-05-25 12:03 ` Janosch Frank
2020-05-14 12:37 ` [PATCH v2 5/9] pc-bios: s390x: Use PSW masks where possible Janosch Frank
2020-05-21 5:50 ` Thomas Huth [this message]
2020-05-25 12:08 ` Janosch Frank
2020-05-14 12:37 ` [PATCH v2 6/9] pc-bios: s390x: Move panic() into header and add infinite loop Janosch Frank
2020-05-21 5:53 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 7/9] pc-bios: s390x: Use ebcdic2ascii table Janosch Frank
2020-05-21 5:56 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 8/9] pc-bios: s390x: Replace 0x00 with 0x0 or 0 Janosch Frank
2020-05-18 12:47 ` David Hildenbrand
2020-05-21 6:01 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 9/9] pc-bios: s390x: Make u32 ptr check explicit Janosch Frank
2020-05-21 6:03 ` Thomas Huth
2020-05-14 18:43 ` [PATCH v2 0/9] pc-bios: s390x: Cleanup part 1 no-reply
2020-05-20 11:52 ` 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=f4e7b4fa-b2f4-13ee-2a20-3e7ce1a26c54@redhat.com \
--to=thuth@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.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 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).