From nobody Sun Jul 26 12:31:23 2026 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=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1781714471; cv=none; d=zohomail.com; s=zohoarc; b=DXfvalxTiRj5Vh2QkLXepcU0tvShcSt/tJ2FsTtFwG7ekKw7sobrBSirWp0OiFGzwPitunWDlJdt5BJqcNUtVLa2Z67iFKPxct6N2c4x11PlRcfsGTUbID2YP+WVLgOLIWikw31OVl178HV67P9c7B4U+xMODT8HOh3OjPBaCm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781714471; h=Content-Type: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=vgvXy1iWKLUT9QylG3B0fsudy4/TYWdaU8xWHb3GIZY=; b=XRzXyYebnmd/NXWNcl7nVXNfLld4g79A4dA2b+AWZQEfxVt+PopsQepD0clme69XN1k1bvOMkBR3urbeVomtdx+9VqFx2VakPBXQUWz2LzApArC2+HjquVEFghNqjZcx68EgVmCZA98L/AalHuWGZkbrmmwz95h7djcTSMPSdCI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781714471899355.12007620465215; Wed, 17 Jun 2026 09:41:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wZtJq-0007HN-Rc; Wed, 17 Jun 2026 12:40:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZtJo-0007GP-SD for qemu-devel@nongnu.org; Wed, 17 Jun 2026 12:40:48 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZtJn-0004Ok-4F for qemu-devel@nongnu.org; Wed, 17 Jun 2026 12:40:48 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65HFpLcF3015146 for ; Wed, 17 Jun 2026 16:40:46 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4euees4bun-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 17 Jun 2026 16:40:45 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-9159c4b210aso199222185a.1 for ; Wed, 17 Jun 2026 09:40:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f26f1cdsm57959594f8f.11.2026.06.17.09.40.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 Jun 2026 09:40:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= vgvXy1iWKLUT9QylG3B0fsudy4/TYWdaU8xWHb3GIZY=; b=Jo2czSgGzguxGLjI RtaSiPZYPhSVBvLHnFJJyVzGYfZl5AogCdFjXZzSO0yJe42Ls+PUdMjc+qhtiQyU QRyC8IzJ7sFV/qyAJadczID/x91n/GhKIzgN41j3YGxMLDqVoO+LPZe4kSohvzw/ 8dOZgZHscOG7vdCALpjqF3b+iKqwsSIepyQkBUw/fI6yan5q1NYZ+J2XFJKo6kyR wtPhyNle7cVCbvVEFUQM0QJNKtKYdgm9NHTxlSEcn32xkEve21lo/uEtAVQs6gBX /aeXLXlqWOn4zUf7+NDMAx6mDgJHTbNwRxhn2FbC77zB9Mq6VFxjs7HM8+A4sFrK vLcDrQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781714445; x=1782319245; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vgvXy1iWKLUT9QylG3B0fsudy4/TYWdaU8xWHb3GIZY=; b=f2kE51v0rxHzZ0ivvIgWH69iVewGJqqJ6ewLplJeMdF0iiDzqmDtbnoUSdN3yj9jKk /ORrstFh3PEEId2avylnxsC3BprV4z2KzTrkD6FAi5Z9DW7+ND4FU3Qyux55ewlBRotz FoFAT3PL0gwnNSDzwpsnTm0gnvVBVCDTj3Z/9kL1TfhHdxRSbhTzNHRNw8PKc8xjxuqt lt5xggAFvcQ0igCKVU8H4EflD96+TzCohYLpyuf7pJlWBtohFj6mPDiRMF2jZDy8RBGv 2zNadtPgmSUxrqYXRoi1NoHDwFVpU9CE/FazpoZz6KivCpEqfLjFqgro41xCo3QldHDt wJkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781714445; x=1782319245; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vgvXy1iWKLUT9QylG3B0fsudy4/TYWdaU8xWHb3GIZY=; b=ddLBzjkjNrkKwjlpn7gKHChW0MIlb1VS47BLQkB6ZnbJMBQRhPq8Fu1lO0QE2L34kQ /sQgZq1Ed9OkkUN2ceXXBaruzesGoBV+w+2mseL/kAjCMOREk4Nco2VUxWEXaVQZSDxL kpQlUD6AbIib/OsC0nn/0YAZ+d5r75s0g07a+PCVBIF3uztt3OthIhgpD7h+97PrK3Bd 9O/y+TnT0mjh0XnGMCSe9y9//MYeGN5cviHXbs9e8GDMSk3IWyYZ0Pzn0Zu81DEGHGON D871CgXRJXr2QWnx/X9IBwdJ902Cd2MbKM41Tx8TSPOwPj1yAydRr5+zAr7HiLvObDcV MQ9g== X-Gm-Message-State: AOJu0YwADHbPFxzEttulS4qRtimq9oMof6MyCwo4X3INlxKo9YE30btF nomTnRyQSMW7RgOUN70LAUfEE4pRwKTDiUYTHOi0ypr1tN8HlaMxxS6/E+43BLjEdQrI9/rf2ac 4oOrVT4ZsS5GGQaV2sP3d2VeuiuNYFlLI2GCRmBFUuc6Bui2lMxZnatsiA7rw3mVuWA== X-Gm-Gg: Acq92OGAnjBHY7nnz5ddQzntbbYCOJc7pwqKrJUuMu/Xbw4KX5u/ES9bKOG/AMLYzcf XaKgG6YCLGWC+zZw/SGMi2raE7oDmX37yx/wPONRqaioDi5rB9HJYsDT2vnLnY0hc1DKZcoJmZB pC3hJcEMC7HDMAIkYdbr7HtwgC7NtPsybxGqHPJSQ0WvVHptO1Fv2mxrytpAmhgFsz83cJYPoY0 dqTH2hjcYZLIcjNzg0gBQlBvmosrdecPgm+2RGEiP7UJMSovlqdpZX9Xfxa+N4tCuCb7MBHPXe6 19JgHgkFWSKoRfwI1Z0dgvdOh7jFgPtfIpnbTKnumMec3O5VtOaVQQllk2h12XLuxEB1UhwiBUJ UR2LHNafNdTUTn+OALuDl6lcdqT7me/e8c++/MNTz9rJsKA1n1zyP57pUKCruLWrcnB+k X-Received: by 2002:a05:620a:29c8:b0:915:e8fc:153a with SMTP id af79cd13be357-91f082fe847mr48606385a.14.1781714445177; Wed, 17 Jun 2026 09:40:45 -0700 (PDT) X-Received: by 2002:a05:620a:29c8:b0:915:e8fc:153a with SMTP id af79cd13be357-91f082fe847mr48601885a.14.1781714444759; Wed, 17 Jun 2026 09:40:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Jason Herne , Halil Pasic , Cornelia Huck , David Hildenbrand , Matthew Rosato , Jared Rossi , Richard Henderson , Zhuoying Cai , Christian Borntraeger , Eric Farman , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 1/3] target/s390x: Factor common s390_ipl_read/write() helpers Date: Wed, 17 Jun 2026 18:40:33 +0200 Message-ID: <20260617164035.70788-2-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260617164035.70788-1-philmd@oss.qualcomm.com> References: <20260617164035.70788-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: 5DCJ14CnABgNVhwxleXJdYOVfwspg5_U X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjE3MDE2MCBTYWx0ZWRfX3gGrU39pFmMD FqzTBFtpOLuqPCcWyDBGV096IwbrCiMa6LS/basSWVW8ee1JmEq4B3J1Lk413UjvuHbPdQmQGau 6HP5lnXJMf+n1GKXWBuLox7Fez/0GJnhK/+JJ4FH8Jko3Jx6kZnQ81T7mj46hTgSwUAqHf7DeTv 3FKRSguuj4G9lO/VjzDZm3hEHRwRdDh7/uEwhV/j/pmMlNlAvJJd79eGz66t0F5sSmKwbpbYeTz b48eFPGXN/XoXHzx7QsUsOHNYIw5Yn179tjy+mock1WmAA42rauf+ul/cDe7OkeJu/N9/CKdh0r 2dXi3vj/YQ1c64HYdxxQabIyKwiVcxEXCeEjrKwbDmy4WlDl3EskEEdTrNjiaWAd7TQht4VkcNE s6z+MnovQp7q+0tIQcDfScafX+5wvYz24C2x2rjajTWEDJr+is7SdT2brXYglyaQjnbPawUSnBj /XeOMXQHwO9bUm/LN8g== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjE3MDE2MCBTYWx0ZWRfX3yV/TQ9iPheZ Zc+eZ1eO9g+zOmaR8MiDFORV0VIivpfUrgeOUCydwbyAN8tq3NPAYSXI0agkhtPk6WZmUF3ErM6 r3irPeGVrrK7ADMB6CIpJUPqeHebBzc= X-Authority-Analysis: v=2.4 cv=KeTidwYD c=1 sm=1 tr=0 ts=6a32ce0d cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=yJueZXV2tivX90BAKnoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: 5DCJ14CnABgNVhwxleXJdYOVfwspg5_U X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-17_02,2026-06-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 bulkscore=0 malwarescore=0 adultscore=0 priorityscore=1501 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606170160 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1781714473957158500 From: Philippe Mathieu-Daud=C3=A9 Prevent duplication factoring common helpers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260616020839.19104-5-philmd@oss.qualcomm.com> Reviewed-by: Jared Rossi --- target/s390x/diag.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/target/s390x/diag.c b/target/s390x/diag.c index da44b0133ed..bc1791067d8 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -73,11 +73,30 @@ static int diag308_parm_check(CPUS390XState *env, uint6= 4_t r1, uint64_t addr, return 0; } =20 +static void s390_ipl_read(CPUS390XState *env, uint64_t addr, + IplParameterBlock *iplb, size_t size) +{ + if (s390_is_pv()) { + s390_cpu_pv_mem_read(env_archcpu(env), 0, iplb, size); + } else { + cpu_physical_memory_read(addr, iplb, size); + } +} + +static void s390_ipl_write(CPUS390XState *env, uint64_t addr, + IplParameterBlock *iplb, size_t size) +{ + if (s390_is_pv()) { + s390_cpu_pv_mem_write(env_archcpu(env), 0, iplb, size); + } else { + cpu_physical_memory_write(addr, iplb, size); + } +} + void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr= _t ra) { bool valid; CPUState *cs =3D env_cpu(env); - S390CPU *cpu =3D env_archcpu(env); uint64_t addr =3D env->regs[r1]; uint64_t subcode =3D env->regs[r3]; IplParameterBlock *iplb; @@ -114,22 +133,12 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1,= uint64_t r3, uintptr_t ra) return; } iplb =3D g_new0(IplParameterBlock, 1); - if (!s390_is_pv()) { - cpu_physical_memory_read(addr, iplb, sizeof(iplb->len)); - } else { - s390_cpu_pv_mem_read(cpu, 0, iplb, sizeof(iplb->len)); - } - + s390_ipl_read(env, addr, iplb, sizeof(iplb->len)); if (!iplb_valid_len(iplb)) { env->regs[r1 + 1] =3D DIAG_308_RC_INVALID; goto out; } - - if (!s390_is_pv()) { - cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len)); - } else { - s390_cpu_pv_mem_read(cpu, 0, iplb, be32_to_cpu(iplb->len)); - } + s390_ipl_read(env, addr, iplb, be32_to_cpu(iplb->len)); =20 valid =3D subcode =3D=3D DIAG308_PV_SET ? iplb_valid_pv(iplb) : ip= lb_valid(iplb); if (!valid) { @@ -164,11 +173,7 @@ out: return; } =20 - if (!s390_is_pv()) { - cpu_physical_memory_write(addr, iplb, be32_to_cpu(iplb->len)); - } else { - s390_cpu_pv_mem_write(cpu, 0, iplb, be32_to_cpu(iplb->len)); - } + s390_ipl_write(env, addr, iplb, be32_to_cpu(iplb->len)); env->regs[r1 + 1] =3D DIAG_308_RC_OK; return; case DIAG308_PV_START: --=20 2.53.0 From nobody Sun Jul 26 12:31:23 2026 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=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1781714502; cv=none; d=zohomail.com; s=zohoarc; b=Xs5iNe/XrGHXFw9CoAcCwtWvDWygsEV3zUQpVI1JlI//Ge5lKbWt2NLhZNzny0PWbQZCDI4TNmCp472+wqTj3JR7LuqkeIPAVOCKFVoA2+jrBWVmA/hzDYF1+vdNQP4B6Ts29dL927M94iXelgvfHKOYWBM64Ftol30zsikSZZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781714502; h=Content-Type: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=FvLfy4VNFVkLqiaXXkc0xOlKpdZetDI+NFSc8TX6LTU=; b=goGK0E0gM6qmO19/FuM5IGAyNX0CgDvUg59A0cJSIG4b2P4jgzahP2nstpc9szT11voH7+EOxKLe+UH0sCeMLng4yff9UYu2ApHFEQt1K3A5160fCLw2aLaj9k9scV7Ol6VEMFNArr9liJPm2MhqXM3NsxJogBgA5SQRfT3XRGQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781714502095329.5921967214598; Wed, 17 Jun 2026 09:41:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wZtK7-0007K0-Jl; Wed, 17 Jun 2026 12:41:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZtJw-0007Hn-KU for qemu-devel@nongnu.org; Wed, 17 Jun 2026 12:40:56 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZtJv-0004Xw-1t for qemu-devel@nongnu.org; Wed, 17 Jun 2026 12:40:56 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65HG5nfl2634356 for ; Wed, 17 Jun 2026 16:40:53 GMT Received: from mail-ua1-f72.google.com (mail-ua1-f72.google.com [209.85.222.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4euxt507v0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 17 Jun 2026 16:40:53 +0000 (GMT) Received: by mail-ua1-f72.google.com with SMTP id a1e0cc1a2514c-963d7e5ac77so2593168241.2 for ; Wed, 17 Jun 2026 09:40:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-461eaa0d275sm11872529f8f.2.2026.06.17.09.40.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 Jun 2026 09:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= FvLfy4VNFVkLqiaXXkc0xOlKpdZetDI+NFSc8TX6LTU=; b=ZSr9ZGAS3eY8KQeP IGxdjFNwN3OlJv7t/n49Bar9W6Yozo5D5B2XU8voTq/ATNtxyxvsycaHopezRPpL SpCQCxRwpN8HMVIRifFwaEcaC+ITeJ3oCjvPYEQCAsMxrYr7M2qsZ1k3CHVtn4Fy FQqjAHTu8IPR2/71k9mTbsX9pXXcNs/HEgJ75MckdtY+sQvc6eE+0GnByWC6Fso5 /kyOOfvxLnsrdahjR6KEjogrlHyfZzLyzUhy22si3xmlDYSjEOfLLDn9FlmdDsB3 LRfPpPAYPHqa3rDYjCDeKMSNwzDfXq022EyKXNY+mW6IX3C2XbUCPovpNO4z5dE1 Wd1XWA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781714453; x=1782319253; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FvLfy4VNFVkLqiaXXkc0xOlKpdZetDI+NFSc8TX6LTU=; b=SGBYHeW41hKQ5cwwrCpouEIW89fTq8o0mySKeyTpURxUMA6Q6DX+wAyQAHRbUzY1x/ KHi8KYHGqcBGMRJF6lfgZIw+GrQYR+8GXpYpzFIPNrkQ1NlqZxzMrQGiF09mUkD5WSHl qTL5yJvMAyiCUhkAtn3hbv3POI6O/BhxR6FF3GH4fq5Rif2IsYwEQZdDJ5UaL0iPOOe8 ZKrknThrVINi4+P1Y44hHoxsCx498g8d0WypHhpoCzrZQheGEOOdn3WpyfLnEQPnj/qe Vvspi6g9WZIWzo02fUXQn93X6QVRLhzVZ5M/qZ2H1yodIk966+a8gOqUOZRy+azPSoU0 PTqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781714453; x=1782319253; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FvLfy4VNFVkLqiaXXkc0xOlKpdZetDI+NFSc8TX6LTU=; b=T4N7c4S+jj6wR0kZVSiyIlajt8LeYvFaqe6Hiivsk0Uj1imfrHFbKWy/6cl5dFBurR uW6YoIY0mvzlMfdCUCmGYXIq/LnqZXjhrFDZ/W0JSD546U+SnCSoMFBE4KRVgna5tZ/z HF+AGsuM0trEKNyq5EW2tNTAJ24V2+nvY7uiiCtX06VurLoSKVLPCBFyXhVS9gxYLplD UdhRFxidwhkjCyGp+1vZ0FYuXWgtZqZjDrKB0oQ+wBeYZXCmrveDmDDrCRuqNwePbMMd tlhtiWAwUmgNp0MMA7AC3wzJ61S/SynU4mDFb+kJS1iCg+tnv/Galbb2QDiNo3dpXSmr aY4Q== X-Gm-Message-State: AOJu0YzX/SJelIwxvXuqFJSTzXhsZ2WZ8WQ5ya6nlLFPykBL9vRsfzSS t+aDes4xTI/4w4q5sE3tKVDr8zvf4a0mMgugUgyMPVkMaS2oAZlLvBrbXiM/pAeeUZ4U23/HSXC 24DPMdZej4ksvERw2WNzi+BC4zDLm9/Cgn7aRkSu7064MOHuG7cpxRcgaoKR9fQy+RA== X-Gm-Gg: AfdE7cl7/pzJYERrIdLlaiFJ2ojfuJa6WXD6f9tx2C8f3IajMrVc+ftyNOYlUoEp2fw WqNe76DBGeBYXMYoXwt1eXX1hrrmyxxHyVLShQnVm4QsSyjTLR7QpffV7y+Z0zKqmxJnEc8iHk7 yfrGMvHi2IELaJ8GKN9BTMsKWwqCabmgAtiOMO4qtL+b6p5J0vXIqdQtUaVm0JiR/nd4rMQTJP6 A/I4RG2IWo/I/b+5yXaOgYKTquUhaVSEuLTtQ8OM4wW3U7Esw8ICloBqyJ5TYmgCyzEtLL5nmRf jlDoGRqILE/O0AEyml6HSldcR+GO5YE/uS13qQEOMvdoLJjZ0ge3XIPEezcJlxkHulUbKjR/TU6 PDUqjopcINwOYWkc6En7M2YBQtm34c7+nfpwnXcRkwtl6j4CZfX6KSsxfr8BOm6MrlmLK X-Received: by 2002:a05:6102:4b03:b0:632:3bb5:95f1 with SMTP id ada2fe7eead31-7246d528766mr2317276137.27.1781714452650; Wed, 17 Jun 2026 09:40:52 -0700 (PDT) X-Received: by 2002:a05:6102:4b03:b0:632:3bb5:95f1 with SMTP id ada2fe7eead31-7246d528766mr2317238137.27.1781714452121; Wed, 17 Jun 2026 09:40:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Jason Herne , Halil Pasic , Cornelia Huck , David Hildenbrand , Matthew Rosato , Jared Rossi , Richard Henderson , Zhuoying Cai , Christian Borntraeger , Eric Farman , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 2/3] target/s390x: Replace legacy cpu_physical_memory_read/write() calls Date: Wed, 17 Jun 2026 18:40:34 +0200 Message-ID: <20260617164035.70788-3-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260617164035.70788-1-philmd@oss.qualcomm.com> References: <20260617164035.70788-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: s4f3i79wnS9jmgHpEiepmAS8-tNaG9Hi X-Proofpoint-Spam-Info: AW1haW4tMjYwNjE3MDE2MCBTYWx0ZWRfX0AJd9ydi5rHd lEraTq+bEjmsWJF1VZrpxjf6A3uIV/SXh2MTSz6XQ+eVFVKIK4u4JNSFo/dzTwXbs0eZmuwU6kd 4UAiDkRE0mPFDUeE8Yg+w+7hYzNy2VA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjE3MDE2MCBTYWx0ZWRfXw8YOz/jF0PRR IxRKrOkJi5UV/eQSmqtWgZefTOLfQZJD2agMpEVhBZvBYRynQFAe4Pkf4C0FqYaoHOZyQe8hz0N NW9WOWYQKwB2CHcau8RrnokUu/1lFjCVmFqge8olB1qqFCRTj63/cbVWEIKCEMNB+TopihbWfx7 gOcRfTU8/J9BHhi+9obTq368BB1Rhjqn2266XDczgRQ7WIJ9yfFgaAxD1HlYxx4ggHwFRAOvfLM D+MRhznLGfcppxTb4G2qphuIlxrTSU7A1ZkxW9y3WsMa/+Y2qC/dtoUafwcyTKgbI6riz3TY7lT HwP7i5htDVeDE8gnvuHSzz9b6rJ/+lVFW7tsEz3N9ze/72F7IVObH2t5/fFnf9leSuo8NCdZEbp 9BJzNgrMF69qTr1vKHE2CQ70jaDMOHfiPYcu9lpA/9cM96PQ9LvD4K2gpJp6ExckgsLN/iOfu2H 5Cx1VOzauuT0JNTKZzg== X-Authority-Analysis: v=2.4 cv=PMw/P/qC c=1 sm=1 tr=0 ts=6a32ce15 cx=c_pps a=ULNsgckmlI/WJG3HAyAuOQ==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=wtMswhJjl9DcAQxfHdQA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=1WsBpfsz9X-RYQiigVTh:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: s4f3i79wnS9jmgHpEiepmAS8-tNaG9Hi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-17_02,2026-06-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 bulkscore=0 malwarescore=0 impostorscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606170160 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1781714503181158500 From: Philippe Mathieu-Daud=C3=A9 cpu_physical_memory_read() and cpu_physical_memory_write() are legacy (see commit b7ecba0f6f6), replace by address_space_read() and address_space_write() respectively, accessing the per-vCPU address space instead of the global &address_space_memory one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260616020839.19104-6-philmd@oss.qualcomm.com> Reviewed-by: Jared Rossi --- target/s390x/diag.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/s390x/diag.c b/target/s390x/diag.c index bc1791067d8..01cc802eaed 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -79,7 +79,8 @@ static void s390_ipl_read(CPUS390XState *env, uint64_t ad= dr, if (s390_is_pv()) { s390_cpu_pv_mem_read(env_archcpu(env), 0, iplb, size); } else { - cpu_physical_memory_read(addr, iplb, size); + address_space_read(cpu_get_address_space(env_cpu(env), 0), addr, + MEMTXATTRS_UNSPECIFIED, iplb, size); } } =20 @@ -89,7 +90,8 @@ static void s390_ipl_write(CPUS390XState *env, uint64_t a= ddr, if (s390_is_pv()) { s390_cpu_pv_mem_write(env_archcpu(env), 0, iplb, size); } else { - cpu_physical_memory_write(addr, iplb, size); + address_space_write(cpu_get_address_space(env_cpu(env), 0), addr, + MEMTXATTRS_UNSPECIFIED, iplb, size); } } =20 --=20 2.53.0 From nobody Sun Jul 26 12:31:23 2026 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=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1781714488; cv=none; d=zohomail.com; s=zohoarc; b=YT0LeNTZJNDGLS6NKKsA+kVmTnYxIbRr0Eo43XoPnR2a1Hl5YACROJdxxCQx8JdJIB47gTZqhRZJ643+LndNH9uPGW6Rsmel99c0zAlVOh2a7/aVNCYvah6nyfCgtSatoTqaa95fqhwGNqLNWANFKZgpZUqWrcsI6zndyHPSSLg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781714488; h=Content-Type: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=XQjhXbGLqdW7rKXKjn6j6dIB3mgq7X0w5oo2Uo85GV8=; b=aizTdNWNdGnVas8HBpmr8NLtL82Vet3zS5A0vj2OpZfnLTXEHpoYJFnD/zwhoh/SqTJYtncrawmH//FIZNzBo9TYLcsTwFdkeYmp+g0T1ztVNY1sO43QNF4lRyfpLUjplCYKh1bR/D01IO2O4lg9f1F6uGFs5AEMsq4F3mGe0ko= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781714488585197.44266147843598; Wed, 17 Jun 2026 09:41:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wZtKF-0007OR-7K; Wed, 17 Jun 2026 12:41:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZtK8-0007LP-Sa for qemu-devel@nongnu.org; Wed, 17 Jun 2026 12:41:09 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZtK1-0004aH-QH for qemu-devel@nongnu.org; Wed, 17 Jun 2026 12:41:03 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65HFpR8o3284167 for ; Wed, 17 Jun 2026 16:41:00 GMT Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eueevme2n-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 17 Jun 2026 16:41:00 +0000 (GMT) Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-6751c50552dso2802254137.2 for ; Wed, 17 Jun 2026 09:41:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2c473bsm59718794f8f.28.2026.06.17.09.40.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 Jun 2026 09:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= XQjhXbGLqdW7rKXKjn6j6dIB3mgq7X0w5oo2Uo85GV8=; b=QvI2TyzJo1O3h1Sq 59p76s6s48QNn6VTqOT0Jcz6zSv1xW86mfUrrfla9bwpyDXq0vdOAZqFTTzY5GoQ 4UFDeNQr/bReWGmDT6+0D8GLxO381/0Sv1Etilvqcx/ZdK/uDZJKpKA1wUlwRNk8 1TrwqpsNS6UWaAGAQn0KoN4TxeT3u7MPdEwmPCb8eo/6ueITCpzzLzneDfJZau9L x9flbyl4DhUa86kMo5KJDfi2Uy5EJNsUgN1aLOgrBvjSt7+6y5LbEQA5xsFxtjoM ULvSqZzHWCYqk/E8+ZhKtrlIqhsX8LYUNZ6UpUXfmfnmEJZeOq0LED7kC3pGK29B rnC4WQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781714460; x=1782319260; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XQjhXbGLqdW7rKXKjn6j6dIB3mgq7X0w5oo2Uo85GV8=; b=cf4O824NoK8Wjw8f1El+GYi+iG3jpI7ck1/L1UfXmI8SPZcD/e1J8XdVgkk910bEyw Fo+V8BW8vG5UOnnF0mDosUCjlQkHeeWUZ1VJrs/2QpL+BweKkOESaMDYyq6kyU3ur5I2 4NQLHegwruccfevkg8etOuu5J2NAQHIXvRFxqMCbhVuCGHS3Rdfqn4xckI3j6W5eJhD6 thogNlD5RnLYbABwD1uxS9hO8dni6YqHmdrgHvFt/tZC2ZwVqWBQDyZZcvKMOEywVpD2 jF/XKpiTL8PHE36GGLdKNbC9YNR3A8fsIREKZYBup9bwWVbzZXm389SO0vLArSzLEoOr kv5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781714460; x=1782319260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XQjhXbGLqdW7rKXKjn6j6dIB3mgq7X0w5oo2Uo85GV8=; b=JD8A2cInS0/iAXIw9TBSmDnMYM+GPBz2lxPLPVkl+1HObvy4XRIA6Llp9pQmeZOtpQ KnVZABbkdFWxiOzx/Gvodutiuhq079B/cvpCP3UGKTgHQSBghtpUz1vGfgCIlUgO3LoS bqzBYu0/q3EXj84bl5b0J0UzJQvOscJi+TdlHBN6EEDsR1R9d8FCQjptpeXQ4Q02L1od Xh/tCZK2t8GoKvgxQP6kdPHPGSgSRVk7tIJtx0Zu9/8hdg14Ot12CpuJEhqSpg+Zu+mG QgwX4EO5i5CqNCRw1DiXBGdHUHTUi+ubMMaKIVcXy/ny4ETVJWEE8VLtK/u/6217pSi3 oIrg== X-Gm-Message-State: AOJu0Yyevpk8DopDrZ34Sf0l0Cuvuhxej85mWmck1DnXsXP7ndPmcYa+ 78s0FjP+YBZy901Ne7Bg1i6Dpt8ieAbbsk6JkUjpEaF/U3CCcbftVhHZxEz5GK328HNRhDUTh7O IjJPqrVjPh+Fa1fiKV4OEzcP96H0EMbxLnKo7WNXi/EWWVZRJ6gg4cmnURHZ8gKmUdg== X-Gm-Gg: AfdE7cnYxNvBotZxBkcOB1w2dgpm/3STgn6Is/Svzs4yWz+lvKCftLYX8hLxo8o0D06 tG8Fs/x2MOM9dfMDNe6FOZmzitcyrnseew8+gNtVigPJA/5CoXHfahTkRlPAXuSRFLivri52rOp 9w8I9f/kZP3S9bc4TGNhWiSfTAhL0VAe64MMzswxxrutwDL6D9O/WM6QxP47zOXGEeDYq/jEnFe Fzn5kcdKUclVm6RvdkoLiw68YoGcSwdDhOvocErXeyyUyYBai3hIzxLb+YWc1Ot09sYrYHgcwHj yvtcEbi21m8zszUPNMwOdJiITkGlNdb8KycH9aKsbrd/6/a2EZ6weJ/TNcMiuoUiJr4lD6FUXme /X8xTiRnwHYph/x3Tuyiy92vbUzwGX+4B7dfVV5N5dy427ZbtWn+oK3pTyt3M+yR1h2m9 X-Received: by 2002:a05:6102:3913:b0:6dd:405b:26d0 with SMTP id ada2fe7eead31-7246d111387mr2970920137.23.1781714460136; Wed, 17 Jun 2026 09:41:00 -0700 (PDT) X-Received: by 2002:a05:6102:3913:b0:6dd:405b:26d0 with SMTP id ada2fe7eead31-7246d111387mr2970892137.23.1781714459726; Wed, 17 Jun 2026 09:40:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Jason Herne , Halil Pasic , Cornelia Huck , David Hildenbrand , Matthew Rosato , Jared Rossi , Richard Henderson , Zhuoying Cai , Christian Borntraeger , Eric Farman , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 3/3] hw/s390x/ipl: Remove TCG dependency in handle_diag_308() Date: Wed, 17 Jun 2026 18:40:35 +0200 Message-ID: <20260617164035.70788-4-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260617164035.70788-1-philmd@oss.qualcomm.com> References: <20260617164035.70788-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjE3MDE2MCBTYWx0ZWRfXwSevMAfCoMnv eeT9BuS2FhU3lwUOk2OQ1/girax7tPNYiRFSHpxJlbCzuvT6SStVSoxCncRqzwfIpSxBAGZBT1N VLvqzo3nReENeu5k0F8dDIgrW8AZ48XHoMiCRReq4FqONum0uG5s9aa64qfvAh8RNe6FCeojt1j 85LiO3g/Ob8ULiBcM472V/tm5zn40kh5sAf3UJ0lheblaPBMEKWsRvnSRHxL61cdDg7vMk160qt wYl7lWqU1BrigrO+RwWJiL6GJvy4UeWgWDvqshN3t7y6DDlKiNSEHeMk/ORZcyQ/Nfls8SsFo3b N8eHaXZYLALcX5WN/MWJbh5JmmdAeupUqn+XQIankk40XFStcT447hIOcofrJvjcbGQ/2+fPt/I 9CIV+9M2KT2TlvmSYozerL1DEzWk8aEJroMtu0kSlRYd4OEj90rLxvKPMd8tIyVPD+MQ/WR9uEB ciNubSab0q4Moacq3QA== X-Authority-Analysis: v=2.4 cv=LM1WhpW9 c=1 sm=1 tr=0 ts=6a32ce1c cx=c_pps a=DUEm7b3gzWu7BqY5nP7+9g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=0p4Q2w12W8ILsTrsKtQA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=-aSRE8QhW-JAV6biHavz:22 X-Proofpoint-GUID: Dl5vGCM2iYgoa9-if3PQpIoaGMAh6yj_ X-Proofpoint-Spam-Info: AW1haW4tMjYwNjE3MDE2MCBTYWx0ZWRfX4bOaRk3uBmbI wMlUtB9JdVWW0HqsgiHJVG/d1PCXdYchLIl1Qyc9ELA9LuYSh3TVSe/mDKHzkmlBKzw5p3Zfm4M z996goPdB5tXKuC7PbWdjtegiB/fQlY= X-Proofpoint-ORIG-GUID: Dl5vGCM2iYgoa9-if3PQpIoaGMAh6yj_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-17_02,2026-06-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 malwarescore=0 priorityscore=1501 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606170160 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: qemu development 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 @qualcomm.com) X-ZM-MESSAGEID: 1781714488919158500 Rather than calling a TCG specific method in s390_ipl_reset_request(), have handle_diag_308() return whether a vCPU reset is pending, and use that in the TCG DIAG helper to return to the main loop. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jared Rossi Reviewed-by: Richard Henderson --- target/s390x/s390x-internal.h | 3 ++- hw/s390x/ipl.c | 5 ----- target/s390x/diag.c | 32 ++++++++++++++++---------------- target/s390x/tcg/misc_helper.c | 5 ++++- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/target/s390x/s390x-internal.h b/target/s390x/s390x-internal.h index e7e4f2b45d4..35d1e34ef4d 100644 --- a/target/s390x/s390x-internal.h +++ b/target/s390x/s390x-internal.h @@ -385,7 +385,8 @@ int mmu_translate_real(CPUS390XState *env, hwaddr raddr= , int rw, =20 /* misc_helper.c */ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3); -void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, +/* Return whether a CPU reset is pending */ +bool handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra); =20 =20 diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 1babcd2b7dd..28d22cdba41 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -17,7 +17,6 @@ #include "qapi/error.h" #include "system/reset.h" #include "system/runstate.h" -#include "system/tcg.h" #include "elf.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" @@ -689,10 +688,6 @@ void s390_ipl_reset_request(CPUState *cs, enum s390_re= set reset_type) } else { qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); } - /* as this is triggered by a CPU, make sure to exit the loop */ - if (tcg_enabled()) { - cpu_loop_exit(cs); - } } =20 void s390_ipl_get_reset_request(CPUState **cs, enum s390_reset *reset_type) diff --git a/target/s390x/diag.c b/target/s390x/diag.c index 01cc802eaed..80f09584789 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -95,7 +95,7 @@ static void s390_ipl_write(CPUS390XState *env, uint64_t a= ddr, } } =20 -void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr= _t ra) +bool handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr= _t ra) { bool valid; CPUState *cs =3D env_cpu(env); @@ -105,34 +105,34 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1,= uint64_t r3, uintptr_t ra) =20 if (env->psw.mask & PSW_MASK_PSTATE) { s390_program_interrupt(env, PGM_PRIVILEGED, ra); - return; + return false; } =20 if (subcode & ~0x0ffffULL) { s390_program_interrupt(env, PGM_SPECIFICATION, ra); - return; + return false; } =20 if (subcode >=3D DIAG308_PV_SET && !s390_has_feat(S390_FEAT_UNPACK)) { s390_program_interrupt(env, PGM_SPECIFICATION, ra); - return; + return false; } =20 switch (subcode) { case DIAG308_RESET_MOD_CLR: s390_ipl_reset_request(cs, S390_RESET_MODIFIED_CLEAR); - break; + return true; case DIAG308_RESET_LOAD_NORM: s390_ipl_reset_request(cs, S390_RESET_LOAD_NORMAL); - break; + return true; case DIAG308_LOAD_CLEAR: /* Well we still lack the clearing bit... */ s390_ipl_reset_request(cs, S390_RESET_REIPL); - break; + return true; case DIAG308_SET: case DIAG308_PV_SET: if (diag308_parm_check(env, r1, addr, ra, false)) { - return; + return false; } iplb =3D g_new0(IplParameterBlock, 1); s390_ipl_read(env, addr, iplb, sizeof(iplb->len)); @@ -159,11 +159,11 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1,= uint64_t r3, uintptr_t ra) env->regs[r1 + 1] =3D DIAG_308_RC_OK; out: g_free(iplb); - return; + return false; case DIAG308_STORE: case DIAG308_PV_STORE: if (diag308_parm_check(env, r1, addr, ra, true)) { - return; + return false; } if (subcode =3D=3D DIAG308_PV_STORE) { iplb =3D s390_ipl_get_iplb_pv(); @@ -172,30 +172,30 @@ out: } if (!iplb) { env->regs[r1 + 1] =3D DIAG_308_RC_NO_CONF; - return; + return false; } =20 s390_ipl_write(env, addr, iplb, be32_to_cpu(iplb->len)); env->regs[r1 + 1] =3D DIAG_308_RC_OK; - return; + return false; case DIAG308_PV_START: iplb =3D s390_ipl_get_iplb_pv(); if (!iplb) { env->regs[r1 + 1] =3D DIAG_308_RC_NO_PV_CONF; - return; + return false; } =20 if (kvm_enabled() && kvm_s390_get_hpage_1m()) { error_report("Protected VMs can currently not be backed with " "huge pages"); env->regs[r1 + 1] =3D DIAG_308_RC_INVAL_FOR_PV; - return; + return false; } =20 s390_ipl_reset_request(cs, S390_RESET_PV); - break; + return true; default: s390_program_interrupt(env, PGM_SPECIFICATION, ra); - break; + return false; } } diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 3d13c8bd8ea..036be93fb32 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -135,7 +135,10 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uin= t32_t r3, uint32_t num) case 0x308: /* ipl */ bql_lock(); - handle_diag_308(env, r1, r3, GETPC()); + if (handle_diag_308(env, r1, r3, GETPC())) { + /* As reset is triggered by the CPU, make sure to exit the loo= p */ + cpu_loop_exit(CPU(env_archcpu(env))); + } bql_unlock(); r =3D 0; break; --=20 2.53.0