diff mbox series

[kvm-unit-tests,v4,5/7] s390x: lib: add teid union and clear teid from lowcore

Message ID 20210526134245.138906-6-imbrenda@linux.ibm.com (mailing list archive)
State New, archived
Headers show
Series s390: Add support for large pages | expand

Commit Message

Claudio Imbrenda May 26, 2021, 1:42 p.m. UTC
Add a union to represent Translation-Exception Identification (TEID).

Clear the TEID in expect_pgm_int clear_pgm_int.

Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
 lib/s390x/asm/interrupt.h | 22 ++++++++++++++++++++++
 lib/s390x/interrupt.c     |  2 ++
 2 files changed, 24 insertions(+)

Comments

Janosch Frank May 27, 2021, 2:52 p.m. UTC | #1
On 5/26/21 3:42 PM, Claudio Imbrenda wrote:
> Add a union to represent Translation-Exception Identification (TEID).
> 
> Clear the TEID in expect_pgm_int clear_pgm_int.
> 
> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>

> ---
>  lib/s390x/asm/interrupt.h | 22 ++++++++++++++++++++++
>  lib/s390x/interrupt.c     |  2 ++
>  2 files changed, 24 insertions(+)
> 
> diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h
> index bf0eb40d..b40def65 100644
> --- a/lib/s390x/asm/interrupt.h
> +++ b/lib/s390x/asm/interrupt.h
> @@ -13,6 +13,28 @@
>  #define EXT_IRQ_EXTERNAL_CALL	0x1202
>  #define EXT_IRQ_SERVICE_SIG	0x2401
>  
> +#define TEID_ASCE_PRIMARY	0
> +#define TEID_ASCE_AR		1
> +#define TEID_ASCE_SECONDARY	2
> +#define TEID_ASCE_HOME		3
> +
> +union teid {
> +	unsigned long val;
> +	struct {
> +		unsigned long addr:52;
> +		unsigned long fetch:1;
> +		unsigned long store:1;
> +		unsigned long reserved:6;
> +		unsigned long acc_list_prot:1;
> +		/* depending on the exception and the installed facilities,
> +		 * the m field can indicate severel different things,

several

> +		 * including whether the exception was triggered by a MVPG
> +		 * instruction, or whether the addr field is meaningful */

Could you please convert the comment style to this?

/*
 * Text
 */

> +		unsigned long m:1;
> +		unsigned long asce_id:2;
> +	};
> +};
> +
>  void register_pgm_cleanup_func(void (*f)(void));
>  void handle_pgm_int(struct stack_frame_int *stack);
>  void handle_ext_int(struct stack_frame_int *stack);
> diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c
> index ce0003de..b627942f 100644
> --- a/lib/s390x/interrupt.c
> +++ b/lib/s390x/interrupt.c
> @@ -22,6 +22,7 @@ void expect_pgm_int(void)
>  {
>  	pgm_int_expected = true;
>  	lc->pgm_int_code = 0;
> +	lc->trans_exc_id = 0;
>  	mb();
>  }
>  
> @@ -39,6 +40,7 @@ uint16_t clear_pgm_int(void)
>  	mb();
>  	code = lc->pgm_int_code;
>  	lc->pgm_int_code = 0;
> +	lc->trans_exc_id = 0;
>  	pgm_int_expected = false;
>  	return code;
>  }
>
Claudio Imbrenda May 27, 2021, 3:05 p.m. UTC | #2
On Thu, 27 May 2021 16:52:48 +0200
Janosch Frank <frankja@linux.ibm.com> wrote:

> On 5/26/21 3:42 PM, Claudio Imbrenda wrote:
> > Add a union to represent Translation-Exception Identification
> > (TEID).
> > 
> > Clear the TEID in expect_pgm_int clear_pgm_int.
> > 
> > Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>  
> 
> Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
> 
> > ---
> >  lib/s390x/asm/interrupt.h | 22 ++++++++++++++++++++++
> >  lib/s390x/interrupt.c     |  2 ++
> >  2 files changed, 24 insertions(+)
> > 
> > diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h
> > index bf0eb40d..b40def65 100644
> > --- a/lib/s390x/asm/interrupt.h
> > +++ b/lib/s390x/asm/interrupt.h
> > @@ -13,6 +13,28 @@
> >  #define EXT_IRQ_EXTERNAL_CALL	0x1202
> >  #define EXT_IRQ_SERVICE_SIG	0x2401
> >  
> > +#define TEID_ASCE_PRIMARY	0
> > +#define TEID_ASCE_AR		1
> > +#define TEID_ASCE_SECONDARY	2
> > +#define TEID_ASCE_HOME		3
> > +
> > +union teid {
> > +	unsigned long val;
> > +	struct {
> > +		unsigned long addr:52;
> > +		unsigned long fetch:1;
> > +		unsigned long store:1;
> > +		unsigned long reserved:6;
> > +		unsigned long acc_list_prot:1;
> > +		/* depending on the exception and the installed
> > facilities,
> > +		 * the m field can indicate severel different
> > things,  
> 
> several

fixed

> > +		 * including whether the exception was triggered
> > by a MVPG
> > +		 * instruction, or whether the addr field is
> > meaningful */  
> 
> Could you please convert the comment style to this?
> 
> /*
>  * Text
>  */

and fixed

> > +		unsigned long m:1;
> > +		unsigned long asce_id:2;
> > +	};
> > +};
> > +
> >  void register_pgm_cleanup_func(void (*f)(void));
> >  void handle_pgm_int(struct stack_frame_int *stack);
> >  void handle_ext_int(struct stack_frame_int *stack);
> > diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c
> > index ce0003de..b627942f 100644
> > --- a/lib/s390x/interrupt.c
> > +++ b/lib/s390x/interrupt.c
> > @@ -22,6 +22,7 @@ void expect_pgm_int(void)
> >  {
> >  	pgm_int_expected = true;
> >  	lc->pgm_int_code = 0;
> > +	lc->trans_exc_id = 0;
> >  	mb();
> >  }
> >  
> > @@ -39,6 +40,7 @@ uint16_t clear_pgm_int(void)
> >  	mb();
> >  	code = lc->pgm_int_code;
> >  	lc->pgm_int_code = 0;
> > +	lc->trans_exc_id = 0;
> >  	pgm_int_expected = false;
> >  	return code;
> >  }
> >   
>
diff mbox series

Patch

diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h
index bf0eb40d..b40def65 100644
--- a/lib/s390x/asm/interrupt.h
+++ b/lib/s390x/asm/interrupt.h
@@ -13,6 +13,28 @@ 
 #define EXT_IRQ_EXTERNAL_CALL	0x1202
 #define EXT_IRQ_SERVICE_SIG	0x2401
 
+#define TEID_ASCE_PRIMARY	0
+#define TEID_ASCE_AR		1
+#define TEID_ASCE_SECONDARY	2
+#define TEID_ASCE_HOME		3
+
+union teid {
+	unsigned long val;
+	struct {
+		unsigned long addr:52;
+		unsigned long fetch:1;
+		unsigned long store:1;
+		unsigned long reserved:6;
+		unsigned long acc_list_prot:1;
+		/* depending on the exception and the installed facilities,
+		 * the m field can indicate severel different things,
+		 * including whether the exception was triggered by a MVPG
+		 * instruction, or whether the addr field is meaningful */
+		unsigned long m:1;
+		unsigned long asce_id:2;
+	};
+};
+
 void register_pgm_cleanup_func(void (*f)(void));
 void handle_pgm_int(struct stack_frame_int *stack);
 void handle_ext_int(struct stack_frame_int *stack);
diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c
index ce0003de..b627942f 100644
--- a/lib/s390x/interrupt.c
+++ b/lib/s390x/interrupt.c
@@ -22,6 +22,7 @@  void expect_pgm_int(void)
 {
 	pgm_int_expected = true;
 	lc->pgm_int_code = 0;
+	lc->trans_exc_id = 0;
 	mb();
 }
 
@@ -39,6 +40,7 @@  uint16_t clear_pgm_int(void)
 	mb();
 	code = lc->pgm_int_code;
 	lc->pgm_int_code = 0;
+	lc->trans_exc_id = 0;
 	pgm_int_expected = false;
 	return code;
 }