From patchwork Fri Nov 16 11:52:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10686121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3BDD613B5 for ; Fri, 16 Nov 2018 11:52:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A5252CD64 for ; Fri, 16 Nov 2018 11:52:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E4CC2CD70; Fri, 16 Nov 2018 11:52:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBC342CD64 for ; Fri, 16 Nov 2018 11:52:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389600AbeKPWEP (ORCPT ); Fri, 16 Nov 2018 17:04:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59330 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389595AbeKPWEP (ORCPT ); Fri, 16 Nov 2018 17:04:15 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3285FECB; Fri, 16 Nov 2018 11:52:13 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F1A965335; Fri, 16 Nov 2018 11:52:09 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= Cc: kvm@vger.kernel.org, David Hildenbrand , Janosch Frank Subject: [kvm-unit-tests PULL 1/1] s390x: Fixup interrupt psws Date: Fri, 16 Nov 2018 12:52:01 +0100 Message-Id: <1542369121-8879-2-git-send-email-thuth@redhat.com> In-Reply-To: <1542369121-8879-1-git-send-email-thuth@redhat.com> References: <1542369121-8879-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 16 Nov 2018 11:52:13 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Janosch Frank Let's use the svc psw instead of the mcck psw for svc interrupts and name it supervisor call. Also we exchange the io int psw for the right one. Signed-off-by: Janosch Frank Reviewed-by: Cornelia Huck Reviewed-by: David Hildenbrand Signed-off-by: Thomas Huth --- lib/s390x/interrupt.c | 2 +- s390x/cstart64.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c index 848d5f2..cf0a794 100644 --- a/lib/s390x/interrupt.c +++ b/lib/s390x/interrupt.c @@ -125,6 +125,6 @@ void handle_io_int(void) void handle_svc_int(void) { - report_abort("Unexpected service call interrupt: at %#lx", + report_abort("Unexpected supervisor call interrupt: at %#lx", lc->svc_old_psw.addr); } diff --git a/s390x/cstart64.S b/s390x/cstart64.S index d6d40b7..dc7ddd6 100644 --- a/s390x/cstart64.S +++ b/s390x/cstart64.S @@ -33,10 +33,10 @@ init_psw_cont: larl %r1, mcck_int_psw mvc GEN_LC_MCCK_NEW_PSW(16), 0(%r1) /* setup io interrupt handler */ - larl %r1, ext_int_psw + larl %r1, io_int_psw mvc GEN_LC_IO_NEW_PSW(16), 0(%r1) /* setup svc interrupt handler */ - larl %r1, mcck_int_psw + larl %r1, svc_int_psw mvc GEN_LC_SVC_NEW_PSW(16), 0(%r1) /* setup cr0, enabling e.g. AFP-register control */ larl %r1, initial_cr0