| From 35891c9334058c02f3ee83eee1a986802387c18b Mon Sep 17 00:00:00 2001 |
| From: Thomas Huth <thuth@redhat.com> |
| Date: Thu, 10 Dec 2020 08:32:39 -0500 |
| Subject: [PATCH 3/5] pc-bios: s390x: Use PSW masks where possible and |
| introduce PSW_MASK_SHORT_ADDR |
| |
| RH-Author: Thomas Huth <thuth@redhat.com> |
| Message-id: <20201210083241.173509-3-thuth@redhat.com> |
| Patchwork-id: 100371 |
| O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 2/4] pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR |
| Bugzilla: 1903135 |
| RH-Acked-by: Cornelia Huck <cohuck@redhat.com> |
| RH-Acked-by: Jens Freimann <jfreimann@redhat.com> |
| RH-Acked-by: David Hildenbrand <david@redhat.com> |
| |
| From: Janosch Frank <frankja@linux.ibm.com> |
| |
| Let's move some of the PSW mask defines into s390-arch.h and use them |
| in jump2ipl.c. Also let's introduce a new constant for the address |
| mask of 8 byte (short) PSWs. |
| |
| Signed-off-by: Janosch Frank <frankja@linux.ibm.com> |
| Reviewed-by: David Hildenbrand <david@redhat.com> |
| Reviewed-by: Thomas Huth <thuth@redhat.com> |
| Message-Id: <20200624075226.92728-8-frankja@linux.ibm.com> |
| Signed-off-by: Thomas Huth <thuth@redhat.com> |
| (cherry picked from commit fe75c657b8ee962da79f5d3518b139e26dc69c24) |
| Signed-off-by: Danilo C. L. de Paula <ddepaula@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 4eba2510b04..767012bf0c9 100644 |
| |
| |
| @@ -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 73852029d4e..6da44d4436c 100644 |
| |
| |
| @@ -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 |
| #define PSW_MASK_64 (PSW_MASK_EAMODE | PSW_MASK_BAMODE) |
| |
| /* Low core mapping */ |
| -- |
| 2.27.0 |
| |