From nobody Fri Nov 14 18:16:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1760538270; cv=none; d=zohomail.com; s=zohoarc; b=USbm9Km7soRlp3w9kr6Ma6fhUAmk72/UP5rtnRt7JuwfvkVykitr1vJ42fbo4RkODZ9HN3FcQja5rmF6gIyZu93vR1fEg0HmT8Z5MG2FKNZJoy72PWUzROaiAYoW+Bcw6OL3xWQWKm/e1IYx2KUcUoayJG2+oZODzQQjmbg6cw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760538270; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VsSOpe6pgGj5wbRdO8x5We83G5GYrOJq7kqoOz19YGc=; b=TzRj9DXDQPO2ZuCerJ6k4xb6Sz3qqI0idgxsZ4pHtesjt8RyFG8CCJu0jqKa0gLd0JU3uGBGkm8pNGXQH70nYB4X+hg/+CyTWkOjf7m5mx7a+hja9bxFckEZ9wqG6J/vMjar8gG7bh9B7m4hWBI3gGqHM2HBTPtY5SARV0o5K34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760538270651178.12039827782996; Wed, 15 Oct 2025 07:24:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v92OM-0001zb-UM; Wed, 15 Oct 2025 10:22:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v92O9-0001xm-7A; Wed, 15 Oct 2025 10:22:01 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v92O4-0003Ev-FC; Wed, 15 Oct 2025 10:21:59 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59FDhAHm001248; Wed, 15 Oct 2025 14:21:47 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49rfp7yw6q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Oct 2025 14:21:46 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59FBpAQ3018336; Wed, 15 Oct 2025 14:21:45 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 49s3rfacre-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Oct 2025 14:21:45 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59FELiTt31064478 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Oct 2025 14:21:44 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2A58620108; Wed, 15 Oct 2025 14:21:44 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B7CF620104; Wed, 15 Oct 2025 14:21:43 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.87.134.59]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 15 Oct 2025 14:21:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=VsSOpe6pgGj5wbRdO 8x5We83G5GYrOJq7kqoOz19YGc=; b=baOmqteaFwYw5MmSxsmzcMJQoBF1ukZHi evc4GP+Bq+shy5srbWq7AAq6viFCOaFBRbp2rV6TczvtoVIZdNlXrdxO/jz16TQ/ WnKCwo6vPsbYi8HGmlKpEQp+kIOcJRB/VfKZllI54ESspiSbRgNP5JW6farETKHb 5+gwYKvV4TjW4UG28vkKjNdcOlK+YuVpBzBdb5hKJsnG2r9p2xqo9BF9zxk4GctO Tsfr9Ki7jmUb1JeoF0tQnHj1xKBbUSPvV26VDYjCOsMUgxzEclvcG+btWL46iDLB GQuZQFDuaYyVJhU1XvIhw+49U7Dft9q8fWaflY7A3a7QC4KNTlDyw== From: Ilya Leoshkevich To: Thomas Huth , Richard Henderson , David Hildenbrand Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich , qemu-stable@nongnu.org Subject: [PATCH v2 1/3] target/s390x: Fix missing interrupts for small CKC values Date: Wed, 15 Oct 2025 16:21:04 +0200 Message-ID: <20251015142141.3238-2-iii@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015142141.3238-1-iii@linux.ibm.com> References: <20251015142141.3238-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: WZIF_vRkyjKvXbj-k-HbpnLf5wlZV31z X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDEyMDA4NCBTYWx0ZWRfX16mfZcpgFvl0 9Yqg2879skdQ9IL+KIxNpjyG7NLQizgg5BnKAbuxV6ipSsNoDOGBXjvSpXi/vXnqruYC5Gg5aOX 7KWsbuCIYWVkQFtrPgfcQ7EESZFkMtqESXu1ux3r0ic+FoqyTIc49vHvE85rr8BKkc/Zgi54eNo U33anJySCjHd6fVMNtjGMTCu9SV65kKwQpPbLe3WPmOVPcVOURrAYCwECcKJ9c2UXb2Ox3+6uX4 7HCiuPYLvEkIAWXz2iCKOV/6UClkvO+1rlhVb2e/46qN3eUcXmVcqMKkI2LGwsUUTSfy1f8E/In 4UPaljYbwgZQn7zfuTZG8dvzqCpVQyUWueOqK3kxr6nXwfMw7Slta1yM32Vyy2sX3t9MZAof/8h b2XLaQj3wmn1vDmIKw1Auq2R7azpgg== X-Proofpoint-GUID: WZIF_vRkyjKvXbj-k-HbpnLf5wlZV31z X-Authority-Analysis: v=2.4 cv=af5sXBot c=1 sm=1 tr=0 ts=68efadfa cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=69wJf7TsAAAA:8 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=DMoVdRysFPNM0ZNGwSsA:9 a=Fg1AiH1G6rFz08G2ETeA:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-15_05,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 priorityscore=1501 spamscore=0 adultscore=0 suspectscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510120084 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; Received-SPF: pass client-ip=148.163.156.1; envelope-from=iii@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1760538275089158500 Content-Type: text/plain; charset="utf-8" Suppose TOD clock value is 0x1111111111111111 and clock-comparator value is 0, in which case clock-comparator interruption should occur immediately. With the current code, tod2time(env->ckc - td->base.low) ends up being a very large number, so this interruption never happens. Fix by firing the timer immediately if env->ckc < td->base.low. Cc: qemu-stable@nongnu.org Reviewed-by: Thomas Huth Signed-off-by: Ilya Leoshkevich --- target/s390x/tcg/misc_helper.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 6d9d601d29a..215b5b9d933 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -199,11 +199,15 @@ static void update_ckc_timer(CPUS390XState *env) return; } =20 - /* difference between origins */ - time =3D env->ckc - td->base.low; + if (env->ckc < td->base.low) { + time =3D 0; + } else { + /* difference between origins */ + time =3D env->ckc - td->base.low; =20 - /* nanoseconds */ - time =3D tod2time(time); + /* nanoseconds */ + time =3D tod2time(time); + } =20 timer_mod(env->tod_timer, time); } --=20 2.51.0 From nobody Fri Nov 14 18:16:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1760538269; cv=none; d=zohomail.com; s=zohoarc; b=SIjTh7MvoGWvBFQEpvqG/NyWgIWdLRnsV/pYVd2YHOPBP9+O5z2oXql+4FnhbWbrt7CvZpY9xY9UiDAi8X3CivQMgbJnDrufMW0nX8KcBF/gLRdhcVubZlB5moZfz7zq7zf2nU2AklLJqT3ds/Jn7tKDHAsdLcvYVBUIfB16Ljg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760538269; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ikakZFOkBJy10rrPAeZilU3KdsWmkhTBix+X1U34fy8=; b=eDHDAxu1YzjTEH0R/7BR1XvkzLjh7O+ba0cI7J7285hLuvX9EQbZlNCZlbOLiR6YKGnoK6+/S9qMzrTxVhi+FAQ02/LurrLeqqgMhBhpFAlduyjkjWlQlY8KWevna6POhHzRJs4v+l76BfkcQkzMTxY7kst//sL4tZjsC/owN5g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760538269632793.7883173273605; Wed, 15 Oct 2025 07:24:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v92OR-00023h-S7; Wed, 15 Oct 2025 10:22:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v92O9-0001xn-9T; Wed, 15 Oct 2025 10:22:01 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v92O2-0003FR-Np; Wed, 15 Oct 2025 10:22:00 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59FDhCed001388; Wed, 15 Oct 2025 14:21:48 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49rfp7yw6r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Oct 2025 14:21:47 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59FB0XN1016996; Wed, 15 Oct 2025 14:21:46 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49r32k0pq9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Oct 2025 14:21:46 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59FELijM24052186 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Oct 2025 14:21:44 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ACB9920107; Wed, 15 Oct 2025 14:21:44 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3B08C20104; Wed, 15 Oct 2025 14:21:44 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.87.134.59]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 15 Oct 2025 14:21:44 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=ikakZFOkBJy10rrPA eZilU3KdsWmkhTBix+X1U34fy8=; b=rVTiIUcLX1iXgK9Tq9lu5IopJWrkFBlZs Bx9rdnvyp/nxHGPVN53PV5F+t60dw1V24qVSG0t15bwso7DkO21TPz2phfetG+n+ kLps+MOqXTOetGD3iETy6MfpaQM29hRfMxpg1M8aM8Ob6B7YQ+uEYvrODUxFwdOC g0lJ5Zf5AQLJScopISr/Y0cgLd6jfyfIlRgqK3wAsjncR/7glbWyyb2gY1+4jYVa N9pyO1wij76/RRmrae9psTAQ/JWrPmi1DFmLR6MI/PP0O0MTaxF1B25SWvm1Ph8R nRj1cDWzF16v2cyhdxQmZQ5OR3bTZseAO19gQOb0fvAtdm3vWA2GQ== From: Ilya Leoshkevich To: Thomas Huth , Richard Henderson , David Hildenbrand Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich , qemu-stable@nongnu.org Subject: [PATCH v2 2/3] target/s390x: Fix missing clock-comparator interrupts after reset Date: Wed, 15 Oct 2025 16:21:05 +0200 Message-ID: <20251015142141.3238-3-iii@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015142141.3238-1-iii@linux.ibm.com> References: <20251015142141.3238-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 2_J1_GlimJC3egFq0biASorBo2lTvqKR X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDEyMDA4NCBTYWx0ZWRfX9pjkXg7it3nf 91Ro0ZKMmHowhoG+Jh+abcxwzg5208cySvDbiKOVbuh24zr0XzDVtURN15+Y1JIHHSZBfATu01P MN3NEGZUlVWi8Jt+L+TIBwhg+ziOViGLDvlTUH7Scs9BNh5DJWrwzBR4f/TQM5JqZu/ZJ4MBWa2 /dTed3gu/RVP1iWeg006IfFqrBcJCbn6BnBm71iy3jSrO/Z1xxYXgjYzSrIwgdxWX36/7KaNIFk 2Fv6xggsp82NvHBWC0ThZ4Fhv1Cl/EmbF8+OFFx4g3iI+sQ34LN1aFd2BcjE97Q4t8ZbT3j0nzu 7WAxwBtzYOU+XVXPRE+tXb8ZkFX86P8S26YUUQC/vP71i2/ehm5pHalvgHHwEPnRQycpRopzApt B8URTcPJxytFwc1Ya8TkT993fB/tWQ== X-Proofpoint-GUID: 2_J1_GlimJC3egFq0biASorBo2lTvqKR X-Authority-Analysis: v=2.4 cv=af5sXBot c=1 sm=1 tr=0 ts=68efadfc cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=4iyXZ4RDbAuoQZjARrEA:9 a=Fg1AiH1G6rFz08G2ETeA:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-15_05,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 spamscore=0 adultscore=0 suspectscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510120084 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; Received-SPF: pass client-ip=148.163.156.1; envelope-from=iii@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1760538277042158500 Content-Type: text/plain; charset="utf-8" After reset, CKC value is set to 0, so if clock-comparator interrupts are enabled, one should occur very shortly thereafter. Currently the code does not set tod_timer, so this does not happen. Fix by adding a tcg_s390_tod_updated() call. Initialize TOD clock before CPUs in order to ensure that the respective object exists during the CPU reset. Cc: qemu-stable@nongnu.org Signed-off-by: Ilya Leoshkevich --- hw/s390x/s390-virtio-ccw.c | 6 +++--- target/s390x/cpu.c | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index ad2c48188a8..9f37a96ae5a 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -286,6 +286,9 @@ static void ccw_init(MachineState *machine) /* init memory + setup max page size. Required for the CPU model */ s390_memory_init(machine); =20 + /* init the TOD clock */ + s390_init_tod(); + /* init CPUs (incl. CPU model) early so s390_has_feature() works */ s390_init_cpus(machine); =20 @@ -332,9 +335,6 @@ static void ccw_init(MachineState *machine) s390_create_sclpconsole(ms->sclp, "sclplmconsole", serial_hd(1)); } =20 - /* init the TOD clock */ - s390_init_tod(); - /* init SCLP event Control-Program Identification */ if (s390mc->use_cpi) { s390_create_sclpcpi(ms->sclp); diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index f05ce317da1..cc2de6ce08e 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -40,6 +40,7 @@ #include "system/reset.h" #endif #include "hw/s390x/cpu-topology.h" +#include "tcg/tcg_s390x.h" =20 #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; @@ -215,6 +216,13 @@ static void s390_cpu_reset_hold(Object *obj, ResetType= type) break; } } + +#ifndef CONFIG_USER_ONLY + if (tcg_enabled()) { + /* Rearm the CKC timer if necessary */ + tcg_s390_tod_updated(CPU(cpu), RUN_ON_CPU_NULL); + } +#endif } =20 static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) --=20 2.51.0 From nobody Fri Nov 14 18:16:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1760538288; cv=none; d=zohomail.com; s=zohoarc; b=aeHqWfXin4KPziUdLhK+c5jd42pZ8XsOBZbvvcKZR7ew0Ah1KDhcuaQxsE3RgdqfItzvdsKae0C5G9C1l/zHw/BFmwQr89oYqH5zYbLmYPScPucRZKqugMOjTQt9oowiQYn2HPqYLQLz53JWWEY0FOhBPsQzy3vyrrPCJFknoVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760538288; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nl58wB/743+XYbyH/PRwPwx7180GhCodSAoKZ+9SPCM=; b=W2PnUiKDmT+5Pz8Bruyfy1vFAMxNo89VVkqHctksZ6oEk+dCzNSGqg2192tqTYEIlMFJ9scozUyLOBAUj+jzjf8sVEcI+2imQ+4MVnObG6YytEWStLCn3ebazXlJk+DEke/8Qk6fenxU2I/wrsGBPrwwHyrgDP71eO7XFfujO8s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760538288031630.661867956765; Wed, 15 Oct 2025 07:24:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v92OQ-00022s-RG; Wed, 15 Oct 2025 10:22:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v92OB-0001yO-RU; Wed, 15 Oct 2025 10:22:04 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v92O5-0003Ey-4Q; Wed, 15 Oct 2025 10:22:01 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59FDhIoV012462; Wed, 15 Oct 2025 14:21:48 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49qcnrcgj6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Oct 2025 14:21:47 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59FBq6So018348; Wed, 15 Oct 2025 14:21:46 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 49s3rfacrf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Oct 2025 14:21:46 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59FELj3t24052190 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Oct 2025 14:21:45 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3A7EF20107; Wed, 15 Oct 2025 14:21:45 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BDE7720104; Wed, 15 Oct 2025 14:21:44 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.87.134.59]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 15 Oct 2025 14:21:44 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=nl58wB/743+XYbyH/ PRwPwx7180GhCodSAoKZ+9SPCM=; b=G0Cf3uB9k8eWwram6AoPCeo2I43m6jApn N3hplGX34rQkyEa36s51kHn0wlIciN3K5nwE8N6b7kWd4sXxQITjUhx4x8ALwNnQ 9/yQmBfIgsIZQdC61WWwrc1CF+ENgfZ2xV6pRpW7PlxUUURQU/4CDO0+hLkv10MH zro5+YC0BwT1u+CKzTvatgoKUgoW7B4RgJuB1fCDW0BWC6vznE6Etvp7/QYnwPXd yCH0QjHFzFcjiWWXrLSt6kcYCl9WcIUAILfo/O4kD+MOMzvjEBu3Y2DQx7ecO8xz By0OXqt+pns632x82hJYtiCtCuQRDtEqQf56W90JqDURK2DDyoOaQ== From: Ilya Leoshkevich To: Thomas Huth , Richard Henderson , David Hildenbrand Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich , qemu-stable@nongnu.org Subject: [PATCH v2 3/3] tests/tcg/s390x: Test SET CLOCK COMPARATOR Date: Wed, 15 Oct 2025 16:21:06 +0200 Message-ID: <20251015142141.3238-4-iii@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251015142141.3238-1-iii@linux.ibm.com> References: <20251015142141.3238-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=M5ZA6iws c=1 sm=1 tr=0 ts=68efadfb cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=o2U2niT9lMQTt7bDKj0A:9 a=Fg1AiH1G6rFz08G2ETeA:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-GUID: Nbn5RUrsbMwOUv7SpwDBNgGRVodRQKAv X-Proofpoint-ORIG-GUID: Nbn5RUrsbMwOUv7SpwDBNgGRVodRQKAv X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDEwMDE0MCBTYWx0ZWRfX39X0ggSbt5Pt VFSU/zCML/iXt/8b+tJpxRURGjshb8qimEuw38EX1f8N1NFipSDjgb1mNk5y25GyilKJ+Kggbly DctgA8xLez4XAoIK903MK3ItynomV6vxDZwIHfk4XLqODga07qdcu1Ts/2UIbS4RLZlpjVF5kqZ Jf5TJqwMjKmvwLK0WBqORXtmVjv5rkVENRhTRgfCUG8bgM1cooM88X8L+0Wj+OtAACXrDOHqQwN DMjzDuLwoTF/pCJtO37dNLykurhcfU9KakIU+msPbBtwFvhPpOUIYRWU7dtqSypu2ZlEqxpZHFn bZM8R6E0E9JJDb1vTBwWBU/rX37Puwha12pOIs0UqgVZZ+u/zUHCyNcgTn0kWUB/ebTIwC3Sw+S 4wiSnB+PdYK4/YXGuI2CiJTAjIM4tg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-15_05,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 spamscore=0 clxscore=1011 impostorscore=0 phishscore=0 adultscore=0 suspectscore=0 priorityscore=1501 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510100140 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; Received-SPF: pass client-ip=148.163.158.5; envelope-from=iii@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1760538289763154100 Content-Type: text/plain; charset="utf-8" Add a small test to prevent regressions. Cc: qemu-stable@nongnu.org Signed-off-by: Ilya Leoshkevich Reviewed-by: Thomas Huth --- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/sckc.S | 55 +++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 tests/tcg/s390x/sckc.S diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Make= file.softmmu-target index 8cd4667c63b..a4425d3184a 100644 --- a/tests/tcg/s390x/Makefile.softmmu-target +++ b/tests/tcg/s390x/Makefile.softmmu-target @@ -28,6 +28,7 @@ ASM_TESTS =3D = \ mc = \ per = \ precise-smc-softmmu = \ + sckc = \ ssm-early = \ stosm-early = \ stpq = \ diff --git a/tests/tcg/s390x/sckc.S b/tests/tcg/s390x/sckc.S new file mode 100644 index 00000000000..66e8733f45c --- /dev/null +++ b/tests/tcg/s390x/sckc.S @@ -0,0 +1,55 @@ +/* + * Test clock comparator. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + .org 0x130 +ext_old_psw: + .org 0x1b0 +ext_new_psw: + .quad 0x180000000, _ext /* 64-bit mode */ + .org 0x200 /* lowcore padding */ + + .globl _start +_start: + lpswe start31_psw +_start31: + stctg %c0,%c0,c0 + oi c0+6,8 /* set clock-comparator subclass ma= sk */ + lctlg %c0,%c0,c0 + jg . + +_ext: + stg %r0,ext_saved_r0 + + lg %r0,ext_counter + aghi %r0,1 + stg %r0,ext_counter + + cgfi %r0,0x1000 + jnz 0f + lpswe success_psw +0: + + stck clock + lg %r0,clock + agfi %r0,0x40000 /* 64us * 0x1000 =3D~ 0.25s */ + stg %r0,clock + sckc clock + + lg %r0,ext_saved_r0 + lpswe ext_old_psw + + .align 8 +start31_psw: + .quad 0x100000080000000,_start31 /* EX, 31-bit mode */ +success_psw: + .quad 0x2000000000000,0xfff /* see is_special_wait_psw() */ +c0: + .skip 8 +clock: + .quad 0 +ext_counter: + .quad 0 +ext_saved_r0: + .skip 8 --=20 2.51.0