From patchwork Thu Jan 23 21:56:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 859401 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:18c8:b0:385:e875:8a9e with SMTP id w8csp494816wrq; Thu, 23 Jan 2025 13:58:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXBN+fQzHluXvuyOUNZmkcp3aTfj25DJQLDD/RSGTWwnagaR92v4t3ZQsSR0fbljRuCsroEMw==@linaro.org X-Google-Smtp-Source: AGHT+IEbhDLuJgPElZbJa6xeLbXAdi7RwiN/YziG6L8MwhxIPpJeRjh8dejm6v65pBXWLDB5r2M1 X-Received: by 2002:a05:620a:2a0e:b0:7b6:d079:748f with SMTP id af79cd13be357-7be6325df6emr5799614685a.54.1737669530425; Thu, 23 Jan 2025 13:58:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737669530; cv=none; d=google.com; s=arc-20240605; b=AoJrDbZZdnDd823fzoBYxNrhWQLMvPdpiTOzVcYqy8jLM7/XbX4wAJ9GsYydNRsiiH 0CN7YCti82a7UUVrEGfXwqdu2IgBCZC3EErX/DrI23hSnDm9pB5KB/oLvXCTbRfb6ZAB 3/Nsdy8Ujar896zB4gXMl3Rlo+oj2cB91hTVHvlz1kBtMC5xNwnhcPIfb6088H1MVMaM w9JVh0dyTffM371jlOLX0r49ehiZBhLfSZjxyFAvP7rizRkBc4aoptgMLZMhYrlYtpyQ U9Bppk83/rotE88k9JofShuHTEf62owNsoCccSU6hbS/fUp8/TkH0//DV6YFJHnzEB/k WenQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pHD1U6D3WvJOsbcmnGXDiHvtbFUdg0u7emrKOSlHmN4=; fh=f6VbfoskI6VsEtYPQBX0qo8ZjRYhBMT+vpdrU6ZtLU4=; b=htC5XdKl0gNo3HL2UqonGNVU1OtukS4nwEoATw4xWnkY7VNTyry6+zehIXKGbIVd2m oKNbJwLTtOJp2YQLpVFTMHbPwXlredoPvQj8EPj202UZQrJ5viW72hMM5GBL7Uqpet6U HzORIWHQodqg7G+JKJeBMfnVwkj6CbyQLHBBfLCb9l/0e1sALSQi58EijlJqTYFH8C3d rpR6HQMd26Zdsm3trCIUOHUjoJ34E227a0LbzeNh9o2L+BdxYaRW7+cBXm9Hh1f2gSPo aR2Ui4uFWK9G/++f96DNJriVlQryoLptYy9AQmILFC+h78WF0YOWsE1WA7ZZdYbWQnLM GKzw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZtNq3ZEk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7be9af12553si74599785a.555.2025.01.23.13.58.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Jan 2025 13:58:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZtNq3ZEk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tb5Bv-0004xa-Fi; Thu, 23 Jan 2025 16:56:47 -0500 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 1tb5Bt-0004xD-TT for qemu-devel@nongnu.org; Thu, 23 Jan 2025 16:56:45 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tb5Bs-0002me-DK for qemu-devel@nongnu.org; Thu, 23 Jan 2025 16:56:45 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-38789e5b6a7so819956f8f.1 for ; Thu, 23 Jan 2025 13:56:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737669402; x=1738274202; 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=pHD1U6D3WvJOsbcmnGXDiHvtbFUdg0u7emrKOSlHmN4=; b=ZtNq3ZEklS8e4F1uJlKdmF6Dki/rlgEt6EyqLSwNrnBcUsRCunibhEXafPAAtanNKc lEK+LUT0Po9rNn6PBqr2wEpRdt3cR2o3I85akwCy32yHahfmYh+PfU3XbVs5i5Q2JIN3 OWdM8uL8fd1yj8ulzmN51eHKdNTw/J8jDv3wCgd2NF2EurnoVuGhBEpUEDTrWElcF9PQ b/ZfAis8ml7rEVCSo+xjUuwbbFW60490Gu9+6EMxY44v85wvevF0LQlzApxgIvm0sv87 XFpTz8OMiDCU4UKRdp1vOtrBTS0TPWvXD4+HKD16ZjRku5/hLdDERC7o5vmie6wRelQv K9Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737669402; x=1738274202; 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=pHD1U6D3WvJOsbcmnGXDiHvtbFUdg0u7emrKOSlHmN4=; b=Q4icjzlnB9OLccmEcin0N/M/4nDjxh6h0D+etkeyQst8bfXdE/wgDHKp3T8s7SQM1P SNcPBC/0noy9kN+31E03hytVtXRBji5146Arc7CZr+ushm7juzK/ufJwTKCprsfH14h4 KvZSrLg1ucgojqR/6B9xk/10JrvMBvZLkaOeMgeANgDaCxZLo5g6YXvwVX76sxDbWFly H6ZBW/4xSgHW9N4evrYMePFXcwWlNLA1WCXXq11+bYIqR+IQagky8AtNjbwAfInXtS3P 7CDbrK2kEYefUF3OvBNqDOfdslO9nDkJFByrwMEt2HCpul4FUNlQX7nb35L5pXl3+WGc PeuQ== X-Gm-Message-State: AOJu0YxMqrfRjhs0Ae+86dI5aR16sJ7VtbKSHG0n0bIY1VJzi+y5S41t yCiaCqxcOoTck9WzrxrdDogJbcH/1W8pE4yrfFyM0wv6h6YZiyzsItVBeoq6r18biTT6TxvA1Wm Lzl8= X-Gm-Gg: ASbGncsMStdWzCy08+Y5lH+rxuvRqSNvRmDSGfA9gYMaKPw75VVvwvpHwI6s0U7zepa CYie9P8V0wV4fkdkRClwQfmyWqvfZDQYAuxJ2CL3cA3lnn3pvgrpnJtCbOjzlMnb+ExzqgmEQK1 xUoPMtOpoQZ1vVjpkKxKDEvFYjGKSCA3TdpRkMWiBDTgMdKVgHzZSZsJUMGJN+PYe1PgydUo9/i 6qTgrA66XxZ3b7a8pGmchEigz1KOisCcJMSyCiLQbTDS3bhuZYRmYBlZmBdakcNSZrq8y18BVMd G/M7SsmcNV+KdgicYz7WPvcm7p2CC7cuFwqp+V2SjiRjrubleHtujtU= X-Received: by 2002:a5d:64e4:0:b0:38a:5ce8:df51 with SMTP id ffacd0b85a97d-38bf564d5f2mr27169952f8f.2.1737669402622; Thu, 23 Jan 2025 13:56:42 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a188689sm796191f8f.48.2025.01.23.13.56.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Jan 2025 13:56:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Harsh Prateek Bora , Richard Henderson , qemu-ppc@nongnu.org, Nicholas Piggin , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 06/15] target/ppc: Ensure powerpc_checkstop() is only called under TCG Date: Thu, 23 Jan 2025 22:56:00 +0100 Message-ID: <20250123215609.30432-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250123215609.30432-1-philmd@linaro.org> References: <20250123215609.30432-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé --- target/ppc/excp_helper.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 8956466db1d..b08cd53688c 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "qemu/log.h" +#include "system/tcg.h" #include "system/system.h" #include "system/runstate.h" #include "cpu.h" @@ -30,7 +31,6 @@ #include "trace.h" #ifdef CONFIG_TCG -#include "system/tcg.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" #endif @@ -443,13 +443,11 @@ void helper_attn(CPUPPCState *env) static void powerpc_mcheck_checkstop(CPUPPCState *env) { /* KVM guests always have MSR[ME] enabled */ -#ifdef CONFIG_TCG if (FIELD_EX64(env->msr, MSR, ME)) { return; } - + assert(tcg_enabled()); powerpc_checkstop(env, "machine check with MSR[ME]=0"); -#endif } static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)