From nobody Fri Nov 14 19:44:01 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761632067; cv=none; d=zohomail.com; s=zohoarc; b=mOtwJhTbXZflwCz1FVhsMAdUpvVyA6ENvuMDhHmz8CUWmIHTsiYmszTgcWWo2RwUVEHkIeVdMqzdtzsopSDx6/R/P/22XqGpIEmUdB0pPR4ud4eIWqpIvYyVJtrQhWPIi/uqAmvJP9NShU9XZVfpnKjOsUoGSpL9OaNl46sgLT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761632067; 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=MCrpbvmA6dW8jE5sx5kPv1Y+FBzb2FgKrxpHf13tOXw=; b=aVd+phCVjcArpFSmR2auWbXrH85peK5LK6FbgI5na9DQk8T0mxtwphGVpJDO12qufdkL/tSF8wXPJVWdtecTtQyJC2PeM3Tdx+YFDtEJSALeXqNEJux7mHdBavicU1TrvuPQiTDzi1U5xHTrnpMv32fFFqkM08tCjb6o5bkeyYA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176163206712971.37517737921257; Mon, 27 Oct 2025 23:14:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDcyG-0004VE-1o; Tue, 28 Oct 2025 02:14:16 -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 1vDcyE-0004Ts-Hp for qemu-devel@nongnu.org; Tue, 28 Oct 2025 02:14:14 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDcy7-0006pf-QQ for qemu-devel@nongnu.org; Tue, 28 Oct 2025 02:14:14 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3ecdf2b1751so3809057f8f.0 for ; Mon, 27 Oct 2025 23:14:07 -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-429952b7b2dsm17994140f8f.2.2025.10.27.23.14.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Oct 2025 23:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761632046; x=1762236846; 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=MCrpbvmA6dW8jE5sx5kPv1Y+FBzb2FgKrxpHf13tOXw=; b=Y+33lXMpbNpFNrSrZHN1IqeirHKnmGaU2denmU2mPKBCqpukM05L6J2GHznlhqTaYy N7ZWYOmo7qWhWa7oKMicWjevnQ3z/++4L8ojYWp/jgOhcfjvmWuBEXWCPIeot05Tl/FP wL12AARHSise0qa1Khk8aGMZyGpYhWOS2hID+MhOs+VMx0z/iGe+1O5ErT/10DB5KFBj sXKtf8OY3zmA8Q+Gm4RMOX+DWvnmVQN45lAsY3yl9rXo6rp67Cp9LjSaUckSKrqE+5vK JEsm2CGrMr8X03k/v1cUIb/RAnTx41wXw443I+NgCrEVLuB/yAGB+6gxcEdZOZpdBYKs HwTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761632046; x=1762236846; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MCrpbvmA6dW8jE5sx5kPv1Y+FBzb2FgKrxpHf13tOXw=; b=uHPZUtVub5uYMSjb4gLJ8xpMIEnG2fnRKGjUgNBhOPGAHzVBfwwxKOMSshZ7sOT7gZ k6iFJqmTWkGsysBxkVcW6hHy86bZc4Tvro2bgFvY12wiqHIRSIcl5NAKm7eccBB3ZCz2 F9pOSV0FF0hB/8XL1i6ADFdNuwkOzx7lEr9p8vakMAV8MDS7G+Xp4cgxN92aw6I0meM9 S2pAAe1V8d0Yvw4o6uXVpbV2MaJlMjGXGhYdVo9ZIbfR6HhKQe0m5eQJEWEz1066DMyU oVeGPR6GQJcsg2bfpXbzT9oo6kQSfOn+rtfTz6M5mYofCxjo/q+CbJuK803LxiEpjNrz hwkw== X-Gm-Message-State: AOJu0Yz/AQuGvVdGwBWjmLYzMepQ7hMIL//+smHcllWDvyacMxUGlF5Y 81XF3777sRuCbGxCfOY2xUv5XIEFwZoYdhQ28nMCsb0DXJoIIbOJZ3qmujLeFXKIHxd6ckrP/PX 3aQzsceA= X-Gm-Gg: ASbGncsFRHfoOaFJsltcM6yE0nc6f7bv/swgqyHlO+zGjYWVRoXfVncJKcpxKTRlfJd Yq6tB3r8GmczPt3MMx1OdCCANgU4K2d2LEmzx8dttcw2nmT0oN5k+4KlCvfbWdYpqYwJs3Zrdte Of9VghpxeIE8CohcdPnJzSqePr+R4B/ZiGrMH82l8W8DHFsBPI2rLJDy1EfrPTxA8Ys7hYu9XYe dB2TArbsmJUrEA/xptWrYcPsoxEmC8d8aupYsXd6OFBpNDf5qXXDwLx1OCYzCu35viGK15P8j5s JdEJ0aYTw60dZssrAIwoVwljNXNbtYNDdIk7QHW3mXTiO7ve5+NGkz2YItIjFiOC0rbZF+5kg3F L6MzCEDvWN5CqMiNYSjOxRki7UfWORH8cllDJj/bA/l/15XV0/ljDMtS6ggSIFQRMGFigr7d3w4 oAtD2Uc1HsF0FX5hPenctQboifKySbURjXkFx6xy5ofBb93nKHGNh8W8U= X-Google-Smtp-Source: AGHT+IGHyiy6BhdqPtoG0hs3zNXL9bksnPzkDfSLoNnXKjqYnZLURUXFTffL1IvUqjVbu9YaEaFi9w== X-Received: by 2002:a05:6000:40d9:b0:428:55c3:ced4 with SMTP id ffacd0b85a97d-429a7e59e2amr1668859f8f.18.1761632045766; Mon, 27 Oct 2025 23:14:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mads Ynddal , Cameron Esfahani , qemu-arm@nongnu.org, Roman Bolshakov , Akihiko Odaki , Phil Dennis-Jordan , Mohamed Mediouni , Peter Collingbourne , Peter Maydell , Alexander Graf , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 44/59] accel/hvf: Have PSCI CPU_SUSPEND halt the vCPU Date: Tue, 28 Oct 2025 06:42:20 +0100 Message-ID: <20251028054238.14949-45-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028054238.14949-1-philmd@linaro.org> References: <20251028054238.14949-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761632070969158500 Return EXCP_HLT to the main loop. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 5fc9b217a11..f9d983fa123 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -301,8 +301,6 @@ void hvf_arm_init_debug(void) #define TMR_CTL_IMASK (1 << 1) #define TMR_CTL_ISTATUS (1 << 2) =20 -static int hvf_wfi(CPUState *cpu); - static uint32_t chosen_ipa_bit_size; =20 typedef struct HVFVTimer { @@ -1008,7 +1006,7 @@ static void hvf_psci_cpu_off(ARMCPU *arm_cpu) * Returns 0 on success * -1 when the PSCI call is unknown, */ -static bool hvf_handle_psci_call(CPUState *cpu) +static bool hvf_handle_psci_call(CPUState *cpu, int *excp_ret) { ARMCPU *arm_cpu =3D ARM_CPU(cpu); CPUARMState *env =3D &arm_cpu->env; @@ -1091,9 +1089,8 @@ static bool hvf_handle_psci_call(CPUState *cpu) ret =3D QEMU_PSCI_RET_INVALID_PARAMS; break; } - /* Powerdown is not supported, we always go into WFI */ env->xregs[0] =3D 0; - hvf_wfi(cpu); + *excp_ret =3D EXCP_HLT; break; case QEMU_PSCI_0_1_FN_MIGRATE: case QEMU_PSCI_0_2_FN_MIGRATE: @@ -1910,7 +1907,7 @@ static int hvf_handle_exception(CPUState *cpu, hv_vcp= u_exit_exception_t *excp) cpu_synchronize_state(cpu); if (arm_is_psci_call(arm_cpu, EXCP_HVC)) { /* Do NOT advance $pc for HVC */ - if (!hvf_handle_psci_call(cpu)) { + if (!hvf_handle_psci_call(cpu, &ret)) { trace_hvf_unknown_hvc(env->pc, env->xregs[0]); /* SMCCC 1.3 section 5.2 says every unknown SMCCC call ret= urns -1 */ env->xregs[0] =3D -1; @@ -1926,7 +1923,7 @@ static int hvf_handle_exception(CPUState *cpu, hv_vcp= u_exit_exception_t *excp) /* Secure Monitor Call exception, we need to advance $pc */ advance_pc =3D true; =20 - if (!hvf_handle_psci_call(cpu)) { + if (!hvf_handle_psci_call(cpu, &ret)) { trace_hvf_unknown_smc(env->xregs[0]); /* SMCCC 1.3 section 5.2 says every unknown SMCCC call ret= urns -1 */ env->xregs[0] =3D -1; --=20 2.51.0