From patchwork Thu Nov 8 09:27:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janosch Frank X-Patchwork-Id: 10673845 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 7E653109C for ; Thu, 8 Nov 2018 09:27:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DC852D3F0 for ; Thu, 8 Nov 2018 09:27:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5ECA72D3F9; Thu, 8 Nov 2018 09:27:56 +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 4CA392D3F0 for ; Thu, 8 Nov 2018 09:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726721AbeKHTC3 (ORCPT ); Thu, 8 Nov 2018 14:02:29 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:54232 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726667AbeKHTC3 (ORCPT ); Thu, 8 Nov 2018 14:02:29 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wA89O65w133223 for ; Thu, 8 Nov 2018 04:27:53 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2nmhf2au68-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 08 Nov 2018 04:27:53 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Nov 2018 09:27:50 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 8 Nov 2018 09:27:49 -0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wA89RmtN41549964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 8 Nov 2018 09:27:48 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A628442042; Thu, 8 Nov 2018 09:27:48 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5287D42041; Thu, 8 Nov 2018 09:27:48 +0000 (GMT) Received: from frankja-ThinkPad-W541.fritz.box (unknown [9.145.28.214]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 8 Nov 2018 09:27:48 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, david@redhat.com, thuth@redhat.com Subject: [kvm-unit-tests PATCH] s390x: Fixup svc handling Date: Thu, 8 Nov 2018 10:27:04 +0100 X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 x-cbid: 18110809-0020-0000-0000-000002E38A79 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18110809-0021-0000-0000-000021330CB6 Message-Id: <1541669224-29953-1-git-send-email-frankja@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-11-08_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=478 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811080082 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Let's use the svc psw instead of the mccheck psw for svc interrupts and name it supervisor call. Signed-off-by: Janosch Frank Reviewed-by: Cornelia Huck --- lib/s390x/interrupt.c | 2 +- s390x/cstart64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c index 6d0d4a3..4bcfdd6 100644 --- a/lib/s390x/interrupt.c +++ b/lib/s390x/interrupt.c @@ -137,6 +137,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..fdcd0e7 100644 --- a/s390x/cstart64.S +++ b/s390x/cstart64.S @@ -36,7 +36,7 @@ init_psw_cont: larl %r1, ext_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