From patchwork Thu May 1 06:23:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886318 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp174905wrq; Wed, 30 Apr 2025 23:28:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWrtn2A/Unt4QCcf/Zmht12r/axSStl24mJHA1tD0BsGWMxkDGV6N1V56ZBg4peOUdiFrlhHg==@linaro.org X-Google-Smtp-Source: AGHT+IE+fE9dZ25IvBOLbVnt/5Kc3zml7hVaCM1/h8A+M02Lh2YKmSwzk3k1sHMrmxGvv7sIGKB/ X-Received: by 2002:a05:622a:5c8e:b0:47a:e1b1:c6c9 with SMTP id d75a77b69052e-489e60f2f72mr86577221cf.42.1746080912373; Wed, 30 Apr 2025 23:28:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746080912; cv=none; d=google.com; s=arc-20240605; b=cJ7r1L1bvD81xBfrwza96ysW5ACXsXbJjAsRgm+W6ZxgJIw0R2v90P4HBdrafsLryV RB9/N3B5UWsM4mBFkGCR8YoICiDqium45ayA2abU3H9TlzoZ8iTPmbDqceh0dbm7WEcX 7e55MZ/kFXUHCyRU1Dx2jtSqQfYMCq6zhJdfHASTNygCDQ4sKyI1LQ9F3lgBAzPdRrpM 8kfTunlyUmyKXTQ+LQ6trHyrC77iG64jlCJDbwfdfr0KS3R+lzHzPzqOP7510ocqr88z wHnyYQ4R1WBQTGrWCNSLTKQAFiMVebC3N4nWGC+TYp9gJOYTzBO78YFau6SBo2kSZec+ ZF7Q== 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=yIdah7DauyVJu2UfcXO7gW3KsF259Fcu0NGf/SnDj/4=; fh=Fszn0PKjr1lTJ9agfldZI0BguDyTJI4MYSL4G/fcmsE=; b=guyk9XJ5zWC4qaBUFe7YYsEnY4pyDTH54pXArW+vvoP0ldqwaHjLZ7QsdsYyoIj8k3 J8Kwh7SXkidxA6uFukFQWMBzt2aQmHWu4BOHcGerROVImsKyzHSd7FNsMsckIkqQ6imx Me1qswHDFq+S7yuiZ9DQ/lGM488S1YW+dbcrx4mldv5ao6dNnoavS9lsMo0ZYtXbY60Y GUJHRHBhs6WeHtZSXKl7FmjeugvjxrOIuJltQOdzaROfNkNufofR3nITEcrGDEHXUN31 QVaTJMfDjqjy0Wo3HinIK/aw2XCVwZQuUobE2ZsHNY3rKUfWeBjv9OhdzxFVUhM+p2tP TcjQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="I/wJTUU0"; 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 d75a77b69052e-48b0661b639si10822281cf.10.2025.04.30.23.28.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 23:28:32 -0700 (PDT) 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="I/wJTUU0"; 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 1uANLr-0005tK-6m; Thu, 01 May 2025 02:24:55 -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 1uANLO-0005IO-1L for qemu-devel@nongnu.org; Thu, 01 May 2025 02:24:26 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uANLI-0007QQ-Nu for qemu-devel@nongnu.org; Thu, 01 May 2025 02:24:25 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-736c1138ae5so707555b3a.3 for ; Wed, 30 Apr 2025 23:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746080658; x=1746685458; 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=yIdah7DauyVJu2UfcXO7gW3KsF259Fcu0NGf/SnDj/4=; b=I/wJTUU0QwZi9/+JK1KfTnjn6pp/30bDU4K3YVur7hLY4Ypu/UEcbln9WBGkkT+nWv EDN1u6j7FNks8CXXXdwcXdTw/85Bn0CxC6jJcJwDKkidue4TiBUZdd6rGYlsPLvzAvlo 47zfguQuGFFeg6wbfHfX5ucor1w5VSS7xK2hj+EQhxomZERRVbn8dMrzjrTtPXK1nTbn RWLZxk1/uif+K6IWAh26n2EycuXYp4iC0Uqq77zpa38eoV93BhAe9BEUtqrRnWwCgMbP EeGqgep21z5XJaAd54MXl5DZQiZcO4wx6WYrG9ymLSFWwPAkd8mHdE+ZDjWmr90uBYsz AxMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746080658; x=1746685458; 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=yIdah7DauyVJu2UfcXO7gW3KsF259Fcu0NGf/SnDj/4=; b=WkoPdewA6jqqbG38ADly38OVu7eYA0/IxDBV0cpgQEA4uuBbk16lTAobAoAEW1T9eF TZShGVExEsnSPHIs3kktZg6EXJcEZtfvByuuPA+ObHdmu2xQgRp9CiaahrKgDckNKAAc AXudZQMmLFZMvxaEAwguGKWFQeLIKe+DLQV+1FrfbHDfV8tgG3rW3bzlVk4DpLWI7rrb ZNn3sAgAaOQgC5WMj2ZjCjs47ira5hNVgq7JeJxlM9iyJ+8rncuAUbbI5HncrZD7NU91 MCkQLrRK3PS0efALFMAcx/IIMD/Av+069EsgUtG7KF7fiJVom1oFK+exgDg25oDsYKWU VPJQ== X-Gm-Message-State: AOJu0YziRTYRmkakZWQdjaICV90UlWjB28HagFjz6+Bp5D8SGlElZQ4Q hwWUrX353nfATAMI0ChcR9fwMuVhRACpIPm9ZB7+qfWapZgaxAujbfrH/M7owJGigaVab7yvonM 4 X-Gm-Gg: ASbGnctZf7YfIXyzJzHhHD75O48QRk3Reg5fE5KHluX6evlR0AwJRSbJQGxExfFUi5F 66QfsK+ZWNZsUSF4l0yK2TUAMW7ze30O2mgVxaEmaEW0dhvgdABOZgGA5lf+0246d2zFnV5vpy+ 1doypFwetqqS4rp4dI6CyYEIMEo3ZCCvaP+Qkmfv0IM5Rn6zyRALpEnpq/DTLOOLKr5+S495gRu qSHmFOAMmGgxHBAzHvl2E/u2CKanJzNhAWjVHpGCGCOoNqb/j18dgxYpcy2RNJI3hthUgnBskSn X/WN0VtL7qq/K2xh7WskZqILXEoTSxkh/x0gNp9f X-Received: by 2002:a05:6a00:2181:b0:736:4cde:5c0e with SMTP id d2e1a72fcca58-7403a77e9e2mr8027903b3a.10.1746080658189; Wed, 30 Apr 2025 23:24:18 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7404f9fed21sm108134b3a.93.2025.04.30.23.24.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 23:24:17 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, Paolo Bonzini , anjo@rev.ng, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , kvm@vger.kernel.org, Pierrick Bouvier Subject: [PATCH v3 30/33] target/arm/ptw: remove TARGET_AARCH64 from arm_casq_ptw Date: Wed, 30 Apr 2025 23:23:41 -0700 Message-ID: <20250501062344.2526061-31-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250501062344.2526061-1-pierrick.bouvier@linaro.org> References: <20250501062344.2526061-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x429.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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Pierrick Bouvier --- target/arm/ptw.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 424d1b54275..f428c9b9267 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -737,7 +737,14 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, uint64_t new_val, S1Translate *ptw, ARMMMUFaultInfo *fi) { -#if defined(TARGET_AARCH64) && defined(CONFIG_TCG) +#ifndef CONFIG_TCG + /* non-TCG guests only use debug-mode. */ + g_assert_not_reached(); +#endif + + /* AArch32 does not have FEAT_HADFS */ + g_assert(arm_feature(env, ARM_FEATURE_AARCH64)); + uint64_t cur_val; void *host = ptw->out_host; @@ -851,10 +858,6 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, cur_val = le64_to_cpu(cur_val); } return cur_val; -#else - /* AArch32 does not have FEAT_HADFS; non-TCG guests only use debug-mode. */ - g_assert_not_reached(); -#endif } static bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx,