From patchwork Fri Jun 4 15:52:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 454101 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp582024jae; Fri, 4 Jun 2021 09:49:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypI2IQFhpUc+XMVChal1hGkJES8Bxmxrp9tT6n1aV1+eTIYhcyENtAbI7Q5EYOs8ykJo+R X-Received: by 2002:a05:6102:124d:: with SMTP id p13mr3596282vsg.21.1622825351184; Fri, 04 Jun 2021 09:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622825351; cv=none; d=google.com; s=arc-20160816; b=CH7RZ55IvHmSFAYP0FJ6xZQ8TepNAhm9p+zSlv5PYedp/9ZrWqAa9FHDSHDRoEvG6d 7fBvkhpw9gHOsQ2P/VsBKTG3rngEDo4NO9ULkCVsRGswSnlWIumiBuH/F4f0zC0blYK9 vvQKgkeXhEiBe6tQaDxqB87yIJh1qlueculxrK0AClG4thQ27UzqQuNKGhjwiJk11WZe qQriC8hFaKxbMMimtwbAxrNHF4Ocrc5aWmwIJ3xJcrjkjxjjqsk5OOqklobUw2xx5bPI mKpcciyjGcIgVsm3N56oenxWR4s9C9r56uf26NIEZDNsw/ADK7x2V22V0Drr7l7W+v7W CLwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=1niJS7hSglD8mEiCtLQ9fXnqmC61tEmzNc7ZOj4a5VQ=; b=DKprGa1UlR/m6mYRlpv3WFFvQwYVZrszY18F+GaOyi8fEbyLpz6wmLkOniN6n1kYcL 5cuZctqSrQab/m4rnV2+xGyTf4nAI+scSXo8ELs1hOh/QftvTmYLobHVGEmiqwjSNuRb LiYGbQovnI+usuHxnD9hf3IVuRd0ClWTTjTFKDx2r+SSMytWg3K9g9kPJRTUBGSbGh4K D6jt2Zlo6uUW2CE+Nbq4/OXgIY9lquzWBD7r6z3I70a8xkkrWJSpqgfBkd+x8KrUBJxz 19XVW4e/byHBXvVfETF1p5ZYbti+9AwUoEOSKesQmTkn1ACijzwHQtdw0MdJgDoz8Bb4 m4YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kc9bC2bx; 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=fail (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 j194si3022323vke.15.2021.06.04.09.49.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Jun 2021 09:49:11 -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=fail header.i=@linaro.org header.s=google header.b=kc9bC2bx; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lpD0Q-0007Xx-J1 for patch@linaro.org; Fri, 04 Jun 2021 12:49:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpCRX-0003Hs-Cn for qemu-devel@nongnu.org; Fri, 04 Jun 2021 12:13:07 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:47041) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lpCRO-0003si-90 for qemu-devel@nongnu.org; Fri, 04 Jun 2021 12:13:07 -0400 Received: by mail-wr1-x434.google.com with SMTP id a11so7976638wrt.13 for ; Fri, 04 Jun 2021 09:12:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1niJS7hSglD8mEiCtLQ9fXnqmC61tEmzNc7ZOj4a5VQ=; b=kc9bC2bxV3woV3SDD6n85+Q/HlLWOtCSuOMUG86UL7O+llzIcSVvnTAZmB+Fd9Da2u LRFC6IYt2IclWWcT2IAyDzAGbnF77oHyucOCFy+OIeVFYBCkksuaqWLsHbScwbxMG8Cu SdS5Rls9e7TXxeYeJJTk8qhx+QutkRb1EmPc5dy2CrN4VhXn2VRkVESgTHPLpeqq7Qhk IhiqzVG4qT0hYBWBj9zjCDCYHr1Dc80FGpYv2xKYJ+xwAR3c71Rp7gS4KN+JH+2ZIglo towCNMFvSfY3iZNYDdJrBlJq07SJBvuYUh3KlYuQKkHhLlXbMNImJMKcz8H31xVO/pAr mw/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1niJS7hSglD8mEiCtLQ9fXnqmC61tEmzNc7ZOj4a5VQ=; b=X3WLglTi+XCpG1exBECN4TZpbwwp9bNW9SV+yOdCjVOcdtVUjIERNcPLCRuWF8xyc1 7ewi3ge6+qLTi6hMW/I4iIF2j2Kb7VZmrHx9/hivnWMJXkjPlS6CXau3JR74hvEJQ+It BOE6PcjymFFnwJ0RBjNtv6HLYQ+Vu4fVqnrp9/TB9lyKQJqNSOVurT7RVqc/zvgpJVMD ZD/7lshjkeRHz8b5wGYxFuNYVMaVOR2NWWR2O3In62QS5n3lcFUvWRtTj4MygtdNTe0K CM8LjVtxpiQA32kMap0jCx305xtDIlNtHJdDnOokjN4xVWDgVjdhiH6YYPZXhEEL7yVx 2GtQ== X-Gm-Message-State: AOAM533BZ4Y+ShGJV1OwX8TbtxH/6uKvjYubzaDPnK6mbGow4YPN9Jxg kZhzZk9jejwxzgXBJ3qKb8nL2A== X-Received: by 2002:a5d:51c3:: with SMTP id n3mr4679437wrv.322.1622823176253; Fri, 04 Jun 2021 09:12:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s128sm6256282wme.6.2021.06.04.09.12.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jun 2021 09:12:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0EECA1FFBA; Fri, 4 Jun 2021 16:53:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v16 33/99] target/arm: add temporary stub for arm_rebuild_hflags Date: Fri, 4 Jun 2021 16:52:06 +0100 Message-Id: <20210604155312.15902-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210604155312.15902-1-alex.bennee@linaro.org> References: <20210604155312.15902-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, Richard Henderson , Claudio Fontana , Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Claudio Fontana this should go away once the configuration and hw/arm is clean Signed-off-by: Claudio Fontana Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- hw/arm/boot.c | 5 ++++- target/arm/arm-powerctl.c | 8 +++++--- target/arm/tcg/tcg-stubs.c | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index d7b059225e..13eea9e372 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -26,6 +26,7 @@ #include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/units.h" +#include "sysemu/tcg.h" /* Kernel boot protocol is specified in the kernel docs * Documentation/arm/Booting and Documentation/arm64/booting.txt @@ -796,7 +797,9 @@ static void do_cpu_reset(void *opaque) info->secondary_cpu_reset_hook(cpu, info); } } - arm_rebuild_hflags(env); + if (tcg_enabled()) { + arm_rebuild_hflags(env); + } } } diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c index b75f813b40..a00624876c 100644 --- a/target/arm/arm-powerctl.c +++ b/target/arm/arm-powerctl.c @@ -15,6 +15,7 @@ #include "arm-powerctl.h" #include "qemu/log.h" #include "qemu/main-loop.h" +#include "sysemu/tcg.h" #ifndef DEBUG_ARM_POWERCTL #define DEBUG_ARM_POWERCTL 0 @@ -127,9 +128,10 @@ static void arm_set_cpu_on_async_work(CPUState *target_cpu_state, target_cpu->env.regs[0] = info->context_id; } - /* CP15 update requires rebuilding hflags */ - arm_rebuild_hflags(&target_cpu->env); - + if (tcg_enabled()) { + /* CP15 update requires rebuilding hflags */ + arm_rebuild_hflags(&target_cpu->env); + } /* Start the new CPU at the requested address */ cpu_set_pc(target_cpu_state, info->entry); diff --git a/target/arm/tcg/tcg-stubs.c b/target/arm/tcg/tcg-stubs.c index 14220d59a1..332f1b9cfb 100644 --- a/target/arm/tcg/tcg-stubs.c +++ b/target/arm/tcg/tcg-stubs.c @@ -14,3 +14,8 @@ void write_v7m_exception(CPUARMState *env, uint32_t new_exc) { g_assert_not_reached(); } + +void arm_rebuild_hflags(CPUARMState *env) +{ + g_assert_not_reached(); +}