From patchwork Tue May 23 13:52:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 684956 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1732445wrt; Tue, 23 May 2023 06:56:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4W3xqNZTlMCUsad85Np1sFuRWi/q5z03jpKvroBgDddAYfIZPA/L85W75eFpgl28K8X9jN X-Received: by 2002:ad4:5f0f:0:b0:5f1:6892:7440 with SMTP id fo15-20020ad45f0f000000b005f168927440mr27078853qvb.23.1684850198248; Tue, 23 May 2023 06:56:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684850198; cv=none; d=google.com; s=arc-20160816; b=OocqeoBuPAwCrJuvR3XjneA/VLqdW4/1dR/vPaO6BZJ7oG87Kn2mc7WKZk6utz73T+ NCE2BK2ZO5lvAgBXCCA+t6T0YkT5O+a7rJwpuSZTen8pfqwNmrmQ3dUMGg6oQxPgi2rL FySIPkBpOwohy6GIYQ547f5AeT+3vUSxVymrqWZD/Mu/U3L4mt0/SmtPKNCAnW1VKkgq hQM/hEE7jyMAa/R98GyGFYiuuDOVuxX1tXCPzi3EXYAp4W4YoOFn9CiF28Qei0Cixff4 RYhkVTKJvRgxEVBEYuFJ/bRXNlDKP4qqfbshTVDpLqUr4w5Vc0MQ0wbvIVpmKDE50DIH R1xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:to:from :dkim-signature; bh=lLJ+OrJ6ZDoNmYA/4Pv3PzTB4pxZ5PUcgKGyl5lAA2g=; b=JOobwZW/YWV7/+DJbZ+shlewY9GqgbKWlx1+q+DyB6soTd6l9DibNuZ1QPvetwYZ8p dXZtVph9B9dHJuawwNAnjTehq4XiivSfQSQ6CVdTS/oURMkAe2rK6B2xZ1/CkyW7D+PJ ZSEHcgIxKckA4ADcvTF2766e0aPfoHtTDfZ3KZP49jstuS66PReDfabdMfNdnOqfSlkz L1/bJC1g3xs4RogGwmRK36uXuCktzwnvK1ePLKzBjB4GkEPRviVvu2s2/wm10WhmoJ20 qh2pg+lMdfvPlX9lXE4qS/+vzmu7vIFvSZysPljqn5TsDLjdVYFTJV/OAZjNkgdvL+BH 0RWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GlIsUA+N; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o4-20020ad45c84000000b0062573f62071si4137898qvh.561.2023.05.23.06.56.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 May 2023 06:56:38 -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=GlIsUA+N; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1ST2-0006Nx-M7; Tue, 23 May 2023 09:54:24 -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 1q1SSK-0004u8-Mi for qemu-devel@nongnu.org; Tue, 23 May 2023 09:53:41 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1SSG-00032f-5U for qemu-devel@nongnu.org; Tue, 23 May 2023 09:53:39 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-64d30ab1ef2so3629462b3a.2 for ; Tue, 23 May 2023 06:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684850015; x=1687442015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lLJ+OrJ6ZDoNmYA/4Pv3PzTB4pxZ5PUcgKGyl5lAA2g=; b=GlIsUA+NU9ZEZb0DZUO1pCi/doCaxMSUFRG9+qdRouYauJ7B5AcHv+G9y0LZyyvvuz LlSBVJggCpYHih3N2HJjoN+wGfAGVVOpOCWaLqZpuJjzsh2EelnLPLtZ7QJlO7aGwk0m 4qoPAY+az/PITqoPqvEJLDBuo3vPeZLDZAma7rpXWZBGyTHaSa69OIZV9DMUa27ewaVo 9alFtEpxc8GfpM/DwLMpWUkLYo8EFQt4prvI+EpOvsaTyPo872AEVBTerhFDswZEyMbZ eJgRcZjrRbgM0pENu2/H+mwIY1f/Pfc4gIJuB94iVOJOaVQguja/sLnfV5zzbA4lVhKX F/pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684850015; x=1687442015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lLJ+OrJ6ZDoNmYA/4Pv3PzTB4pxZ5PUcgKGyl5lAA2g=; b=CnCeuGpBsB2PskmRQrNXvHpr9hFtMIvsXSfWWKEqA4ILUvPljaoIuMBCv6QFlzSYB3 Et2pubyzd4JnrHku0b+5DOnS2T3fz+D4jzg5qcEGFxtt0lLyI5OE5R+Qmywi+R8XlUtr cw3S+GMFL61pXw5+69a1j55Imr6vnCwvACCK2Uzl39iuiWf4DhlbfLHMlPwATexFjMZE yj7AkONnBWx0o6Qen+GUCi5aCk91ZfxE3tpTueRs+gYwcQKRo4Radf6KizZhN4/1RH2W myluyU126wSZTyX8t/o9N1G7Vf+wLpU9hVQlTqRoXF/56NmkqQ3dZOI8HlVC47vgoJOo UDtA== X-Gm-Message-State: AC+VfDxWM1FfvLVSf2sISuqIoMZX9YT7cibcTbWFrdEclLAnlWphgh5i SpRj96wkwKxPc0o2qjaXlcGiPzBaMpk0BhuB9TQ= X-Received: by 2002:a05:6a21:329a:b0:10b:4f58:3fef with SMTP id yt26-20020a056a21329a00b0010b4f583fefmr8923085pzb.2.1684850014820; Tue, 23 May 2023 06:53:34 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:c13a:d73:4f88:3654]) by smtp.gmail.com with ESMTPSA id b8-20020aa78708000000b0064d27a28451sm5796111pfo.100.2023.05.23.06.53.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 06:53:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 13/52] target/arm: Fix test of TCG_OVERSIZED_GUEST Date: Tue, 23 May 2023 06:52:43 -0700 Message-Id: <20230523135322.678948-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230523135322.678948-1-richard.henderson@linaro.org> References: <20230523135322.678948-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-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, 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, T_SCC_BODY_TEXT_LINE=-0.01 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 The symbol is always defined, even if to 0. We wanted to test for TCG_OVERSIZED_GUEST == 0. Signed-off-by: Richard Henderson --- target/arm/ptw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 69c05cd9da..b0d2a05403 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -418,6 +418,7 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, uint64_t new_val, S1Translate *ptw, ARMMMUFaultInfo *fi) { +#ifdef TARGET_AARCH64 uint64_t cur_val; void *host = ptw->out_host; @@ -473,7 +474,7 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, * we know that TCG_OVERSIZED_GUEST is set, which means that we are * running in round-robin mode and could only race with dma i/o. */ -#ifndef TCG_OVERSIZED_GUEST +#if !TCG_OVERSIZED_GUEST # error "Unexpected configuration" #endif bool locked = qemu_mutex_iothread_locked(); @@ -497,6 +498,10 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, #endif return cur_val; +#else + /* AArch32 does not have FEAT_HADFS. */ + g_assert_not_reached(); +#endif } static bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx,