On 24.03.20 16:08, Janosch Frank wrote:
> 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 {
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb