From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:53698 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726755AbgGQO62 (ORCPT ); Fri, 17 Jul 2020 10:58:28 -0400 From: Janosch Frank Subject: [kvm-unit-tests PATCH 1/3] s390x: Add custom pgm cleanup function Date: Fri, 17 Jul 2020 10:58:11 -0400 Message-Id: <20200717145813.62573-2-frankja@linux.ibm.com> In-Reply-To: <20200717145813.62573-1-frankja@linux.ibm.com> References: <20200717145813.62573-1-frankja@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-s390-owner@vger.kernel.org List-ID: To: kvm@vger.kernel.org Cc: thuth@redhat.com, linux-s390@vger.kernel.org, david@redhat.com, borntraeger@de.ibm.com, cohuck@redhat.com, imbrenda@linux.ibm.com Sometimes we need to do cleanup which we don't necessarily want to add to interrupt.c, so lets add a way to register a cleanup function. Signed-off-by: Janosch Frank --- lib/s390x/asm/interrupt.h | 1 + lib/s390x/interrupt.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h index 4cfade9..b2a7c83 100644 --- a/lib/s390x/asm/interrupt.h +++ b/lib/s390x/asm/interrupt.h @@ -15,6 +15,7 @@ #define EXT_IRQ_EXTERNAL_CALL 0x1202 #define EXT_IRQ_SERVICE_SIG 0x2401 +void register_pgm_int_func(void (*f)(void)); void handle_pgm_int(void); void handle_ext_int(void); void handle_mcck_int(void); diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c index 243b9c2..36ba720 100644 --- a/lib/s390x/interrupt.c +++ b/lib/s390x/interrupt.c @@ -16,6 +16,7 @@ static bool pgm_int_expected; static bool ext_int_expected; +static void (*pgm_int_func)(void); static struct lowcore *lc; void expect_pgm_int(void) @@ -51,8 +52,16 @@ void check_pgm_int_code(uint16_t code) lc->pgm_int_code); } +void register_pgm_int_func(void (*f)(void)) +{ + pgm_int_func = f; +} + static void fixup_pgm_int(void) { + if (pgm_int_func) + return (*pgm_int_func)(); + switch (lc->pgm_int_code) { case PGM_INT_CODE_PRIVILEGED_OPERATION: /* Normal operation is in supervisor state, so this exception -- 2.25.1