{"id":2228870,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2228870/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427124738.966578-56-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260427124738.966578-56-peter.maydell@linaro.org>","date":"2026-04-27T12:47:29","name":"[PULL,55/63] target/arm: migrate check_hcr_el2_trap to use syndrome helper","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"f447c5afc1b31b900a0c903061195b9411eaa158","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/1.1/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427124738.966578-56-peter.maydell@linaro.org/mbox/","series":[{"id":501642,"url":"http://patchwork.ozlabs.org/api/1.1/series/501642/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501642","date":"2026-04-27T12:46:34","name":"[PULL,01/63] docs/system: add FEAT_AA32 and FEAT_AA64 to emulation list","version":1,"mbox":"http://patchwork.ozlabs.org/series/501642/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2228870/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2228870/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=B5hpmisN;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g43XS72sNz1yHv\n\tfor ; Mon, 27 Apr 2026 22:58:32 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wHLVx-00033l-PI; Mon, 27 Apr 2026 08:56:42 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wHLO7-0008D7-PF\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 08:48:36 -0400","from mail-wr1-x433.google.com ([2a00:1450:4864:20::433])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1wHLO4-0005lR-RN\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 08:48:35 -0400","by mail-wr1-x433.google.com with SMTP id\n ffacd0b85a97d-43d75312379so7328435f8f.1\n for ; Mon, 27 Apr 2026 05:48:30 -0700 (PDT)","from lanath.. (wildly.archaic.org.uk. [81.2.115.145])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-488ffc5e3f4sm448974115e9.2.2026.04.27.05.48.28\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 27 Apr 2026 05:48:29 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1777294110; x=1777898910; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:from:to:cc:subject:date:message-id\n :reply-to; bh=cYSIl2V+H9S0t8iglEzTUuxj5zc2Wid6B1AfAuxMEuE=;\n b=B5hpmisNxSdEiJCKDoCPcCxD0MIRVZLcGLERk6DZpiC9ydE/XceE04ZrUAI0bUV/kz\n 8u+at+BjhveoYVgAV2ippfPbuqqO/9AlZWglRd7jI15OtuHTCr0HWmAhFGZ3FOXq6aoO\n DmDg0fc2XvhZz0qoh/5pMTuXLRRBYd6i84ISYp0XsffBF7W9Fx0XqW/4AeYY6xCWOwfb\n MkBbz2eplbyHHustImTaHQ2b28x73Xnma0SRZoVsx3nZO1xA6Xk06IP1NfRSMahP+a3p\n ygWQbcGkFSrq1+6o3fVRlGj6uyGIKAipJfWpdHIsPoseM39zriWJ7yn06jA34BcgMow6\n c9gg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777294110; x=1777898910;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=cYSIl2V+H9S0t8iglEzTUuxj5zc2Wid6B1AfAuxMEuE=;\n b=q4sXIQ87oiYlP/K+ZGK28Iy+qFQKFkpIYixM6LA0n2rrLhyRpsIe91+3aC0FKZG32g\n KFXsRGNW9+hUjS2EKEjKsmMdtCpfn/u0lYDLT11+5Mo0jyvtmFpDk+MrMEdd5w4raag1\n dEn7T6sWlkagu2oTrLu3X3WgCvmdTEi4kVWslau27jaHs8GkDrx2E0ZnwWlOxTNxeRxt\n M+hLZ1MDwx1PZ4lia7K3i8b7zbVnA2zabv9IxFXipH4TKcthMg8JhH3vhjvXJmXhBNzT\n GrXp/zFKnXAk5QBnnt/OiHVFTXcXM9n0qPOCqChbVHJzgiaKBfxvyJ1/EQKs+wfRk0RJ\n 0aAg==","X-Gm-Message-State":"AOJu0YzS9yYX7r+VTGCQ7J8V632qiS6r32X9onpsGPrA0jLNANz5zvva\n 1wm7YE/vRcOytA7D7SKPvMZDMW/K425FY9jUnSvad5E4weMcozBWwL9jhMbgVueGpb9fRify6+B\n 50XvV","X-Gm-Gg":"AeBDievSybw2t/g0x6w44/zjLEAxX7rQSrBDg7XSlcsAdXl8VhlIskZJUohPLRGYgYy\n sfluGyZQPFtJldl+H4LFUYD+SqRXSRpRP4racXqxuBjDDnDARH51ZWLoOi44fPxdbMRSxLs6kbp\n wOnifK5n+9X4FuDzdSeKhI3e5ouhyB+sLKdguqeA8nvSfXA1RW/qnQ7adKTc4kdhGwbWz7Cv3hK\n ovKuQNiEarda3gfpIr4MtHN3Qq4SCdv24OaeZ9TcCQZFsgva9IFoua7JndGpXp5aitqdkrGUamH\n prBxaLz1M5VoldphpoYsLAKGinLd0H4ZoplbOMP5t1OcSJkRBP2dVd0/vtbrBh6dpb42K0YjzpM\n dfVhAMP57C/wS8rSlKABqOZA6CdFSPfP8TWjWn9I5LVfw8XCnMGpQx1ffM9yHPvKwubEn+x81tf\n zrQ1C3/PxcZTHPdID+UEf1ozdgWZl1AYAHqiE8YF6wr5AC8z18yIX0mSdmgtsYeQp8fKtg/Ramp\n Li4tJjsL4fepM9K6FggxdC4O/hm9u9RCmNqbuN/ALLwx6s59xI/","X-Received":"by 2002:a05:600c:c112:b0:486:fe83:861c with SMTP id\n 5b1f17b1804b1-488fb896910mr494899525e9.7.1777294109579;\n Mon, 27 Apr 2026 05:48:29 -0700 (PDT)","From":"Peter Maydell ","To":"qemu-devel@nongnu.org","Subject":"[PULL 55/63] target/arm: migrate check_hcr_el2_trap to use syndrome\n helper","Date":"Mon, 27 Apr 2026 13:47:29 +0100","Message-ID":"<20260427124738.966578-56-peter.maydell@linaro.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260427124738.966578-1-peter.maydell@linaro.org>","References":"<20260427124738.966578-1-peter.maydell@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::433;\n envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x433.google.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Alex Bennée \n\nIt shares the same COPROC_ISS encoding as the other CP traps although\nnot all the fields are used.\n\nReviewed-by: Richard Henderson \nSigned-off-by: Alex Bennée \nMessage-id: 20260422125250.1303100-16-alex.bennee@linaro.org\nSigned-off-by: Peter Maydell \n---\n target/arm/syndrome.h | 16 ++++++++++++++++\n target/arm/tcg/vfp_helper.c | 5 +----\n 2 files changed, 17 insertions(+), 4 deletions(-)","diff":"diff --git a/target/arm/syndrome.h b/target/arm/syndrome.h\nindex 841fd3292b..53137394e2 100644\n--- a/target/arm/syndrome.h\n+++ b/target/arm/syndrome.h\n@@ -251,6 +251,22 @@ FIELD(COPROC_ISS, OP2, 17, 3)\n FIELD(COPROC_ISS, COND, 20, 4)\n FIELD(COPROC_ISS, CV, 24, 1)\n \n+static inline uint32_t syn_cp10_rt_trap(int cv, int cond, int opc1,\n+ int crn, int rt, int isread)\n+{\n+ uint32_t res = syn_set_ec(0, EC_FPIDTRAP);\n+ res = FIELD_DP32(res, SYNDROME, IL, 1);\n+\n+ res = FIELD_DP32(res, COPROC_ISS, CV, cv);\n+ res = FIELD_DP32(res, COPROC_ISS, COND, cond);\n+ res = FIELD_DP32(res, COPROC_ISS, OP1, opc1);\n+ res = FIELD_DP32(res, COPROC_ISS, CRN, crn);\n+ res = FIELD_DP32(res, COPROC_ISS, RT, rt);\n+ res = FIELD_DP32(res, COPROC_ISS, ISREAD, isread);\n+\n+ return res;\n+}\n+\n static inline uint32_t syn_cp14_rt_trap(int cv, int cond, int opc1, int opc2,\n int crn, int crm, int rt, int isread,\n bool is_16bit)\ndiff --git a/target/arm/tcg/vfp_helper.c b/target/arm/tcg/vfp_helper.c\nindex 45f2eb0930..e692bc568b 100644\n--- a/target/arm/tcg/vfp_helper.c\n+++ b/target/arm/tcg/vfp_helper.c\n@@ -1359,10 +1359,7 @@ void HELPER(check_hcr_el2_trap)(CPUARMState *env, uint32_t rt, uint32_t reg)\n g_assert_not_reached();\n }\n \n- syndrome = ((EC_FPIDTRAP << ARM_EL_EC_SHIFT)\n- | ARM_EL_IL\n- | (1 << 24) | (0xe << 20) | (7 << 14)\n- | (reg << 10) | (rt << 5) | 1);\n+ syndrome = syn_cp10_rt_trap(1, 0xe, 7, reg, rt, 1);\n \n raise_exception(env, EXCP_HYP_TRAP, syndrome, 2);\n }\n","prefixes":["PULL","55/63"]}