From: Thomas Huth <thuth@redhat.com>
To: Pierre Morel <pmorel@linux.ibm.com>, kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, frankja@linux.ibm.com,
david@redhat.com, cohuck@redhat.com
Subject: Re: [kvm-unit-tests PATCH v9 01/12] s390x: Use PSW bits definitions in cstart
Date: Tue, 16 Jun 2020 15:13:32 +0200 [thread overview]
Message-ID: <f160d328-694a-4476-4863-c49a1d0e5349@redhat.com> (raw)
In-Reply-To: <1592213521-19390-2-git-send-email-pmorel@linux.ibm.com>
On 15/06/2020 11.31, Pierre Morel wrote:
> This patch defines the PSW bits EA/BA used to initialize the PSW masks
> for exceptions.
>
> Since some PSW mask definitions exist already in arch_def.h we add these
> definitions there.
> We move all PSW definitions together and protect assembler code against
> C syntax.
>
> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
> Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
> ---
> lib/s390x/asm/arch_def.h | 15 +++++++++++----
> s390x/cstart64.S | 15 ++++++++-------
> 2 files changed, 19 insertions(+), 11 deletions(-)
>
> diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
> index 1b3bb0c..b5d7aca 100644
> --- a/lib/s390x/asm/arch_def.h
> +++ b/lib/s390x/asm/arch_def.h
> @@ -10,15 +10,21 @@
> #ifndef _ASM_S390X_ARCH_DEF_H_
> #define _ASM_S390X_ARCH_DEF_H_
>
> +#define PSW_MASK_EXT 0x0100000000000000UL
> +#define PSW_MASK_DAT 0x0400000000000000UL
> +#define PSW_MASK_SHORT_PSW 0x0008000000000000UL
> +#define PSW_MASK_PSTATE 0x0001000000000000UL
> +#define PSW_MASK_BA 0x0000000080000000UL
> +#define PSW_MASK_EA 0x0000000100000000UL
> +
> +#define PSW_MASK_ON_EXCEPTION (PSW_MASK_EA | PSW_MASK_BA)
> +
> +#ifndef __ASSEMBLER__
> struct psw {
> uint64_t mask;
> uint64_t addr;
> };
>
> -#define PSW_MASK_EXT 0x0100000000000000UL
> -#define PSW_MASK_DAT 0x0400000000000000UL
> -#define PSW_MASK_PSTATE 0x0001000000000000UL
> -
> #define CR0_EXTM_SCLP 0x0000000000000200UL
> #define CR0_EXTM_EXTC 0x0000000000002000UL
> #define CR0_EXTM_EMGC 0x0000000000004000UL
> @@ -297,4 +303,5 @@ static inline uint32_t get_prefix(void)
> return current_prefix;
> }
>
> +#endif /* __ASSEMBLER */
> #endif
> diff --git a/s390x/cstart64.S b/s390x/cstart64.S
> index e084f13..d386f35 100644
> --- a/s390x/cstart64.S
> +++ b/s390x/cstart64.S
> @@ -12,6 +12,7 @@
> */
> #include <asm/asm-offsets.h>
> #include <asm/sigp.h>
> +#include <asm/arch_def.h>
>
> .section .init
>
> @@ -198,19 +199,19 @@ svc_int:
>
> .align 8
> reset_psw:
> - .quad 0x0008000180000000
> + .quad PSW_MASK_ON_EXCEPTION | PSW_MASK_SHORT_PSW
> initial_psw:
> - .quad 0x0000000180000000, clear_bss_start
> + .quad PSW_MASK_ON_EXCEPTION, clear_bss_start
> pgm_int_psw:
> - .quad 0x0000000180000000, pgm_int
> + .quad PSW_MASK_ON_EXCEPTION, pgm_int
> ext_int_psw:
> - .quad 0x0000000180000000, ext_int
> + .quad PSW_MASK_ON_EXCEPTION, ext_int
> mcck_int_psw:
> - .quad 0x0000000180000000, mcck_int
> + .quad PSW_MASK_ON_EXCEPTION, mcck_int
> io_int_psw:
> - .quad 0x0000000180000000, io_int
> + .quad PSW_MASK_ON_EXCEPTION, io_int
> svc_int_psw:
> - .quad 0x0000000180000000, svc_int
> + .quad PSW_MASK_ON_EXCEPTION, svc_int
> initial_cr0:
> /* enable AFP-register control, so FP regs (+BFP instr) can be used */
> .quad 0x0000000000040000
>
I'm afraid, by when I compile this on RHEL7, the toolchain complains:
s390x/cstart64.S: Assembler messages:
s390x/cstart64.S:239: Error: found 'L', expected: ')'
s390x/cstart64.S:239: Error: junk at end of line, first unrecognized
character is `L'
s390x/cstart64.S:241: Error: found 'L', expected: ')'
s390x/cstart64.S:241: Error: junk at end of line, first unrecognized
character is `L'
s390x/cstart64.S:243: Error: found 'L', expected: ')'
s390x/cstart64.S:243: Error: junk at end of line, first unrecognized
character is `L'
s390x/cstart64.S:245: Error: found 'L', expected: ')'
s390x/cstart64.S:245: Error: junk at end of line, first unrecognized
character is `L'
s390x/cstart64.S:247: Error: found 'L', expected: ')'
s390x/cstart64.S:247: Error: junk at end of line, first unrecognized
character is `L'
s390x/cstart64.S:249: Error: found 'L', expected: ')'
s390x/cstart64.S:249: Error: junk at end of line, first unrecognized
character is `L'
s390x/cstart64.S:251: Error: found 'L', expected: ')'
s390x/cstart64.S:251: Error: junk at end of line, first unrecognized
character is `L'
s390x/cstart64.S:254: Error: junk at end of line, first unrecognized
character is `L'
Shall we skip the update to the assembler file for now?
Thomas
next prev parent reply other threads:[~2020-06-16 13:13 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 9:31 [kvm-unit-tests PATCH v9 00/12] s390x: Testing the Channel Subsystem I/O Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 01/12] s390x: Use PSW bits definitions in cstart Pierre Morel
2020-06-16 9:31 ` Thomas Huth
2020-06-16 9:39 ` Pierre Morel
2020-06-16 13:13 ` Thomas Huth [this message]
2020-06-16 13:58 ` Pierre Morel
2020-06-16 14:01 ` Pierre Morel
2020-06-16 15:14 ` Thomas Huth
2020-06-16 16:08 ` Pierre Morel
2020-06-16 16:11 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 02/12] s390x: Move control register bit definitions and add AFP to them Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 03/12] s390x: saving regs for interrupts Pierre Morel
2020-06-17 8:13 ` Cornelia Huck
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 04/12] s390x: interrupt registration Pierre Morel
2020-06-17 8:20 ` Cornelia Huck
2020-06-17 11:01 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 05/12] s390x: export the clock get_clock_ms() utility Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 06/12] s390x: clock and delays caluculations Pierre Morel
2020-06-16 9:35 ` Thomas Huth
2020-06-16 9:40 ` Pierre Morel
2020-06-17 8:27 ` Cornelia Huck
2020-06-17 11:04 ` Pierre Morel
2020-06-22 9:09 ` Janosch Frank
2020-06-30 16:13 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 07/12] s390x: define function to wait for interrupt Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 08/12] s390x: retrieve decimal and hexadecimal kernel parameters Pierre Morel
2020-06-16 9:47 ` Thomas Huth
2020-06-16 13:43 ` Pierre Morel
2020-06-17 8:37 ` Cornelia Huck
2020-06-17 11:05 ` Pierre Morel
2020-06-22 9:33 ` Janosch Frank
2020-06-22 10:57 ` Andrew Jones
2020-07-02 12:53 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 09/12] s390x: Library resources for CSS tests Pierre Morel
2020-06-16 10:31 ` Thomas Huth
2020-06-16 13:42 ` Pierre Morel
2020-06-17 8:42 ` Cornelia Huck
2020-06-17 11:08 ` Pierre Morel
2020-06-22 9:35 ` Janosch Frank
2020-06-24 12:26 ` Thomas Huth
2020-06-30 16:30 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 10/12] s390x: css: stsch, enumeration test Pierre Morel
2020-06-16 11:37 ` Thomas Huth
2020-06-16 13:42 ` Pierre Morel
2020-06-17 8:48 ` Cornelia Huck
2020-06-17 11:14 ` Pierre Morel
2020-06-15 9:32 ` [kvm-unit-tests PATCH v9 11/12] s390x: css: msch, enable test Pierre Morel
2020-06-16 11:43 ` Thomas Huth
2020-06-16 13:43 ` Pierre Morel
2020-06-17 8:54 ` Cornelia Huck
2020-06-17 11:25 ` Pierre Morel
2020-06-15 9:32 ` [kvm-unit-tests PATCH v9 12/12] s390x: css: ssch/tsch with sense and interrupt Pierre Morel
2020-06-17 9:54 ` Cornelia Huck
2020-06-17 11:55 ` Pierre Morel
2020-06-19 6:57 ` Cornelia Huck
2020-07-02 12:56 ` Pierre Morel
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=f160d328-694a-4476-4863-c49a1d0e5349@redhat.com \
--to=thuth@redhat.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pmorel@linux.ibm.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).