From patchwork Wed May 3 07:22:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678700 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp911459wrs; Wed, 3 May 2023 00:32:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6A2kgh8MoCQOYtCpHhdYcXGO++jht5WeuawGiTgMVVZhcGzq3nDDzyh84JQPVQFCOhnVZf X-Received: by 2002:a05:6214:501b:b0:616:5215:42ff with SMTP id jo27-20020a056214501b00b00616521542ffmr9290785qvb.28.1683099124464; Wed, 03 May 2023 00:32:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683099124; cv=none; d=google.com; s=arc-20160816; b=ohWGwI8UQVF3S8QmA7OZbTFrQXWBgQZlwXagYWu/Awe5lG4oRGtIUiHESBpsj1RNMs Eg2/O5OB21MTkkmO3WItllXrK1ShYfRwf92xJqld6ahZk4BZA7f1Qu9rpTTc2PB24ySl CrvToiPllKVLNuT0RaGz9obU8I3PjlGfO9IYjpZep9DAp0h3wb/8NlMJw5DCiilkTe3y GeSO4w81kw0/5MsXDc5pKPl66D/mTq9J9wSVyBA30v07TsxtCLwoR7ZdtSix9Vp+XLEG k1rCZMQ0O8IZjYHgFehvnnXioYweGQoKP9DJCiz/egj+Ez6/cll6nXlMdwAj/FKlvNvv Vi7Q== 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:cc:to :from:dkim-signature; bh=cSo1+AMJGaRkyGN2dhJQ1AhgSMEAPlcpn7H2/sgsup0=; b=MTTH7gQKIdTBM3l7r7wGGOI4XVOI086mEjRiVtDE38Xt9IM+mnrFNfT0GXs6FDspRa HiGeeaLBoajZ7QFN/Zy6C3cP4q8yf5b7Xe52idI6+F411CKPkhotj4vEvfkP1446d/62 6PzGIAFQqBNkJBBSQF+/Xnm3bdDO4UuBDTfeXuiPTFwOVFXNKJ0EXoKYZofoDkKlfTJP vwSetZ4DRXgrWdAh0aSTtvkwY3z5BfnLNloJF3MQ5VNP3bXrHEFx2MfoX+Mx2PZCIKTE 80qC6ckAIFmtz9gWySJYJNz9e8GC0f8HrySgWR+M3qAqEA9y9nxoq6QptZST0rtAzRfO PAFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rQ6vElbY; 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 u12-20020a05622a14cc00b003e4e978fca2si18752423qtx.666.2023.05.03.00.32.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:32:04 -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=rQ6vElbY; 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 1pu6tM-0003jX-2v; Wed, 03 May 2023 03:27:12 -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 1pu6tI-0003Ja-JW for qemu-devel@nongnu.org; Wed, 03 May 2023 03:27:08 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6tF-0005a3-Pf for qemu-devel@nongnu.org; Wed, 03 May 2023 03:27:08 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f1950f5628so46361455e9.3 for ; Wed, 03 May 2023 00:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683098824; x=1685690824; 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=cSo1+AMJGaRkyGN2dhJQ1AhgSMEAPlcpn7H2/sgsup0=; b=rQ6vElbYCoTWpU+k1Ws1wjoC/yA5VSTGqR+Ip0DmJM0O7vQKBev2QY00x03xm4C7mR caR40XgiKkq9o2a6WPuiZPsVttpD2ngqwd2oh48h2961Nvoj/O5tmOOATbxgd8lOF1LW o4Btwe3/xS6Y/OApbQ0PxNVkuG+yYSpZ5FoCnqfdGluuv9Eo27dXcwOlhFD9AG4B6499 3Sua0UHzK8sczrPxcRDyP+R6RTUihjfiB2yJlY84ZgC7E6U7Lw9nSMmhj8ha4/rcyhv+ oRTrlabjhpgNPof/0vmsGMxzNswojvL2tDBxSwF6v8DnlsKxboPn0hexGFHRBSrqTnxC 0xqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683098824; x=1685690824; 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=cSo1+AMJGaRkyGN2dhJQ1AhgSMEAPlcpn7H2/sgsup0=; b=iUDQrEnuRn2lLvpWH7ZJ/FCcFW0i2jBRT/sLL4Y1F4E7s5NjxkV0zK5t113OliRs4J HMNqj+6ToJRYXDQhzrdSJ7Q14njvHunb71zjuIV5RCPE9rsFo/iKbl+T1aOd1R8rLkBL 23SCn6oWZf/JPnlhLkKlSv/gZIyA05PcyEXugiZfvsWEXRGCrh5tS5/5m+ZO7v172GF1 DE1WIClqj0wr0bFMc4t08oe1CD8/mbA9YOdPF2/fkZpnkfOvcjyAdQ/uNvUo2q30ByC1 Y3U77Bv33+RPW6lYAm7mUBMLmnpUm0gmVhrn/6hvHz8xuSDqDWd0380qnZtEuAhK/PU1 T7ig== X-Gm-Message-State: AC+VfDwHuIkEcXy238H83WJwigpByqhDTM0MeoBumtJw3Xrmw+IlECIl XKAMFtxm3VWCW8c8lfWdlzOwJGNPGfqp4Yuqz8nw6A== X-Received: by 2002:a7b:ca56:0:b0:3f1:6ec5:3105 with SMTP id m22-20020a7bca56000000b003f16ec53105mr13776990wml.20.1683098824304; Wed, 03 May 2023 00:27:04 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id t4-20020a7bc3c4000000b003f1745c7df3sm974315wmj.23.2023.05.03.00.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 00:27:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ale@rev.ng, philmd@linaro.org, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, anjo@rev.ng Subject: [PATCH 41/84] target/arm: Fix test of TCG_OVERSIZED_GUEST Date: Wed, 3 May 2023 08:22:48 +0100 Message-Id: <20230503072331.1747057-42-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503072331.1747057-1-richard.henderson@linaro.org> References: <20230503072331.1747057-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32c.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 bd75da8dbc..7b7ce65c7a 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -393,6 +393,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; @@ -448,7 +449,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(); @@ -472,6 +473,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,