From nobody Mon Feb 9 09:09:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1575381002; cv=none; d=zohomail.com; s=zohoarc; b=V374V7p0QUmJYtUoOSdoRXzLSw2VWtdy1EVkP50oJkS4ScHSv/EyvDZizzGIvs//7pZiTpf1ktPlsiYmtxkHif0Z30adUF2aTCtCBIPFLcqRIu1wypsi5m03UmTwnEB4k62eloVWr99SD3pGuF88l7RonSK0UlJSiet8moE0FZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575381002; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lvyc5C2dzxgB+HHXjw7EsHq1+RhGB89SE/+tqdx68vE=; b=JMIZ8o9ZP07BvkRUJqdwn4XYK6KSjtl2bvYXh0QOfRUERBvrZVEyjvKpHXnvubdyZHgBV+FwirU6TjKiZIp67OSI/aB9i5VrrYzfwpUaVamB3YnTx7/P3CdOXaYw2TSHci2Xz0QrAmuUvdzGahtFlJEZJd+eDVcGdA/83Pv4Apo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575381002663307.0868464717138; Tue, 3 Dec 2019 05:50:02 -0800 (PST) Received: from localhost ([::1]:53896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ic8Yx-0008Mz-6c for importer@patchew.org; Tue, 03 Dec 2019 08:50:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43487) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ic8EI-000623-Ri for qemu-devel@nongnu.org; Tue, 03 Dec 2019 08:28:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ic8EF-0001EV-Hj for qemu-devel@nongnu.org; Tue, 03 Dec 2019 08:28:36 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:50468) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ic8EE-0001BF-KQ for qemu-devel@nongnu.org; Tue, 03 Dec 2019 08:28:35 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xB3DMxkR025130 for ; Tue, 3 Dec 2019 08:28:32 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2wm6spbwv4-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 03 Dec 2019 08:28:32 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 3 Dec 2019 13:28:30 -0000 Received: from b06avi18878370.portsmouth.uk.ibm.com (9.149.26.194) 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) Tue, 3 Dec 2019 13:28:27 -0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xB3DSPxT45023634 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 3 Dec 2019 13:28:25 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C7ED3A4057; Tue, 3 Dec 2019 13:28:25 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8EA71A4051; Tue, 3 Dec 2019 13:28:24 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.18.156]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 3 Dec 2019 13:28:24 +0000 (GMT) From: Janosch Frank To: qemu-devel@nongnu.org Subject: [PATCH v3 4/4] pc-bios/s390x: Fix reset psw mask Date: Tue, 3 Dec 2019 08:28:13 -0500 X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191203132813.2734-1-frankja@linux.ibm.com> References: <20191203132813.2734-1-frankja@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19120313-0020-0000-0000-00000393164E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19120313-0021-0000-0000-000021EA3794 Message-Id: <20191203132813.2734-5-frankja@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-12-03_03:2019-12-02,2019-12-03 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 suspectscore=1 clxscore=1015 malwarescore=0 adultscore=0 impostorscore=0 phishscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912030105 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, mihajlov@linux.ibm.com, cohuck@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We need to set the short psw indication bit in the reset psw, as it is a short psw. fixes: 9629823290 ("pc-bios/s390-ccw: do a subsystem reset before running t= he guest") Signed-off-by: Janosch Frank Acked-by: Christian Borntraeger --- pc-bios/s390-ccw/jump2ipl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c index 266f1502b9..da13c43cc0 100644 --- a/pc-bios/s390-ccw/jump2ipl.c +++ b/pc-bios/s390-ccw/jump2ipl.c @@ -12,11 +12,11 @@ #define KERN_IMAGE_START 0x010000UL #define PSW_MASK_64 0x0000000100000000ULL #define PSW_MASK_32 0x0000000080000000ULL -#define IPL_PSW_MASK (PSW_MASK_32 | PSW_MASK_64) +#define PSW_MASK_SHORTPSW 0x0008000000000000ULL +#define RESET_PSW_MASK (PSW_MASK_SHORTPSW | PSW_MASK_32 | PSW_MASK_64) =20 typedef struct ResetInfo { - uint32_t ipl_mask; - uint32_t ipl_addr; + uint64_t ipl_psw; uint32_t ipl_continue; } ResetInfo; =20 @@ -50,7 +50,9 @@ void jump_to_IPL_code(uint64_t address) ResetInfo *current =3D 0; =20 save =3D *current; - current->ipl_addr =3D (uint32_t) (uint64_t) &jump_to_IPL_2; + + current->ipl_psw =3D (uint64_t) &jump_to_IPL_2; + current->ipl_psw |=3D RESET_PSW_MASK; current->ipl_continue =3D address & 0x7fffffff; =20 debug_print_int("set IPL addr to", current->ipl_continue); @@ -82,7 +84,7 @@ void jump_to_low_kernel(void) } =20 /* Trying to get PSW at zero address */ - if (*((uint64_t *)0) & IPL_PSW_MASK) { + if (*((uint64_t *)0) & RESET_PSW_MASK) { jump_to_IPL_code((*((uint64_t *)0)) & 0x7fffffff); } =20 --=20 2.20.1