From nobody Sun Sep 14 22:31:44 2025 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; dkim=fail; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582804690; cv=none; d=zohomail.com; s=zohoarc; b=XFoCib/v14/kqndqZzLcv0ClKUtqVfTL1OiFg3UNSjybK3vXasArkllDZxmR0YpsqLvV6OFACaNozec4oFoxH1VYMlrNequc7TA2bcv8vpvT7tRAcQ8c4GnwuV4rf2LN1YToPQxamjgua4lu9lA1YiM0CcmRK/smtQxx0Oh/jyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582804690; h=Content-Type: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=Bwcm6KMu5WlnA5wdfgUC+xkYru81JSdUvWZH5P60CxE=; b=f1ZaWmCSM3hIjbwxLRMprPCHe8XTKhAGAakqizqajzzni9ONArA3mIxdm+uzxYg1yhMeGTSP9l2zBy2q3YrtqcPvxySL75w1Anq6B7E6/k+Q8rG+SF/4ZO4PxXQ7qyM8ggsyESg6CUdGm/A1OBYAGzLseWnNooWmR5R+Zzzvkqg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 158280469066274.96104176665244; Thu, 27 Feb 2020 03:58:10 -0800 (PST) Received: from localhost ([::1]:58088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7Hnt-0004Nc-JF for importer@patchew.org; Thu, 27 Feb 2020 06:58:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51118) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7Hkp-00089I-6Z for qemu-devel@nongnu.org; Thu, 27 Feb 2020 06:55:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7Hko-0001ID-5E for qemu-devel@nongnu.org; Thu, 27 Feb 2020 06:54:59 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:43531 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j7Hko-0001G8-1M for qemu-devel@nongnu.org; Thu, 27 Feb 2020 06:54:58 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-113-b8nGggV_PpG4iReJeHbNIg-1; Thu, 27 Feb 2020 06:54:53 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E16CF800D48; Thu, 27 Feb 2020 11:54:51 +0000 (UTC) Received: from localhost (ovpn-117-2.ams2.redhat.com [10.36.117.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E75B101D487; Thu, 27 Feb 2020 11:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582804497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bwcm6KMu5WlnA5wdfgUC+xkYru81JSdUvWZH5P60CxE=; b=Wg2Tnz77gcpkAsuf89cRkWUucicGelA98sXXXP6DGQjkJ0Ry8cifFAdMFHSMq8ZYRl4ilv 5ME9PjJJ1cmyD+q7PExA253S368FfV4pg6ClUraVCqd/WoFSvA89/duCG1A7gi4K0sgrMu CjDQ33nUOzUrVzDCB/rkmfmkC/4PmvU= X-MC-Unique: b8nGggV_PpG4iReJeHbNIg-1 From: Cornelia Huck To: Peter Maydell Subject: [PULL 4/7] s390/sclp: improve special wait psw logic Date: Thu, 27 Feb 2020 12:54:28 +0100 Message-Id: <20200227115431.32364-5-cohuck@redhat.com> In-Reply-To: <20200227115431.32364-1-cohuck@redhat.com> References: <20200227115431.32364-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Janosch Frank , David Hildenbrand , Cornelia Huck , qemu-devel@nongnu.org, qemu-stable@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Christian Borntraeger There is a special quiesce PSW that we check for "shutdown". Otherwise disa= bled wait is detected as "crashed". Architecturally we must only check PSW bits 116-127. Fix this. Cc: qemu-stable@nongnu.org Signed-off-by: Christian Borntraeger Message-Id: <1582204582-22995-1-git-send-email-borntraeger@de.ibm.com> Reviewed-by: David Hildenbrand Acked-by: Janosch Frank Signed-off-by: Cornelia Huck --- target/s390x/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index b810ad431e44..ed726849114f 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -89,7 +89,7 @@ hwaddr s390_cpu_get_phys_addr_debug(CPUState *cs, vaddr v= addr) static inline bool is_special_wait_psw(uint64_t psw_addr) { /* signal quiesce */ - return psw_addr =3D=3D 0xfffUL; + return (psw_addr & 0xfffUL) =3D=3D 0xfffUL; } =20 void s390_handle_wait(S390CPU *cpu) --=20 2.21.1