From patchwork Thu Sep 16 15:30:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 512955 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1333051jao; Thu, 16 Sep 2021 08:43:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwint0nt7qmmFdsPWhqtB2QSMCyBFOw/ihPpu29ocKEufwbzkwocZBagr3Y084Fq2nkW7vZ X-Received: by 2002:a05:620a:79b:: with SMTP id 27mr5644361qka.248.1631807032049; Thu, 16 Sep 2021 08:43:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631807032; cv=none; d=google.com; s=arc-20160816; b=Me5bDTdsguGModLfHAPgKmSjuOxpTIZMZCr/HtpzfXZn4GG4pwC5UgDHQchVr1P68W it0LrQKwkdumZSp1H5KQSP5mFEBQcPd1ravHIYmU2ZWjcfYGU1Kxu7htvlLJUwc8WFUW 1nbNHvd7JhZMPXlc+LfJW1QAIazbgYkZUvjI5dRTfCUuYOq7np2JaxHVtKGAqznwC7QL TO0OBaFJg/85nHvYZ3UxU4t7eh/XievHcZn+Foe49vMOPDyNVULV5vHWK1k5LEEvkbdA KKVHHr4pSzCukcldNc/vk8PuN6jFgYl7zxxd7HPPKBhDQDwcgK/krf5Evidv8qDAy/Cd Akag== 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=gP5Ac48Ygfft0H1EsMdA6mk0u3/jlbxiZGs/HX9oV80=; b=tl2TpZM3StjOQPUBh+G/RcT+mop5hHyILsCoFM2xadyPL3IwOlOBO6xvanBexvZhA0 BPB6RuCP1ZfyXetzaRlzrgQbrGfPkVziTgfFQZD8U3aNtQh+Oqk9VAfUIdJWTZavPppS q1+B3tgtXJwgbhLcDFnmkzCGfNSd1eJ4n69HZQwIinBJ3tAy9tMeFbe+4UYRK2KQvhyu hVhD3ImOb9XCezvUuun9u/sO8pVJtfBkXyc1ghewYleuZPRkYWGp5m/kpMwGT7bEYDAr 1SIALJVTBIrus6ktyNm0caSoZUuaB3AtMrU9SCG+tNK6h+hWSLgpaY1XsVGnMDHzTK2E AQpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=reRTrn4Y; 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 fi16si2203876qvb.241.2021.09.16.08.43.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Sep 2021 08:43:52 -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=reRTrn4Y; 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]:39200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtYF-0007qv-If for patch@linaro.org; Thu, 16 Sep 2021 11:43:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLT-0001KS-Q6 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:39 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:41835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLP-0002S0-EW for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:37 -0400 Received: by mail-pl1-x634.google.com with SMTP id v2so4089297plp.8 for ; Thu, 16 Sep 2021 08:30:34 -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=gP5Ac48Ygfft0H1EsMdA6mk0u3/jlbxiZGs/HX9oV80=; b=reRTrn4YS09XgwIqmIE5sE98aKB3UCDjos5N0DV+fGXi5UbkooZpUCpGT/DVAqjaHv uAbxYFOAaZ0uVMSks9KwJdvfHna1TKk0KutR+6wcZi15ZVSmB+blM4s6S20CntmCHFzW +8oeARJtDhzDTJtFqx9wdKEVfd981jTwx3+jJ1Mn8iluVLIXEpP73HfTKlED3fiSD26T MGdxgbiiFtzn834NK4/fhxAU0oIL41G+9wIpBCa5UQ/tz8rrVL0fM4nqC+nXLpezZh+z Mgbhu5lEtqfFNHnlFwEkKfZDVp2KLbV446/I761f62qE90hLyzybi4DKqUcxL41qVxjl fYwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gP5Ac48Ygfft0H1EsMdA6mk0u3/jlbxiZGs/HX9oV80=; b=yh215zoFz/oHIfS6wE6oAgzfmrkjlAP2TAw/BX4WSdISxjnurEbGQOzNr5h7hg+h7P FidFSEGnDMRtj5ZC3vq4H4uflZPSq+/j1Xl8Bc9/kUix6NU7CucWxMrJgqoFp/shCd8v 8F7MtBkWcLDLHrLT6jZ55xwCbceGEMzhgBHuM5a2F+PGL1pXpJ2wFDnsw/rCg4wVKrBi IJDQf2AXyfmmzXVTx+3UWkhQjwtFZwp3m7ko7PVp1ZSYKCdl36r82GdLjfBw8YaHkXZ+ Pgp5+jP+PJtmxm8Ao8vzBxsmoR0vEIflUhepTgZgC0DR3y0I3poKy3+egCQa7akwuXk4 wleQ== X-Gm-Message-State: AOAM533kufZs/oU6VO50mQ7N+U2fxdJKDf1qcoVTQ9h0QIhmhpd61sYM a+vWfbX0ioBv2bBGhmjZSO/y3SHGZLJ+XA== X-Received: by 2002:a17:90a:578e:: with SMTP id g14mr15720522pji.184.1631806233275; Thu, 16 Sep 2021 08:30:33 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 10/35] target/arm: Restrict has_work() handler to sysemu and TCG Date: Thu, 16 Sep 2021 08:30:00 -0700 Message-Id: <20210916153025.1944763-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Restrict has_work() to TCG sysemu. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-10-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/arm/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index ba0741b20e..e11aa625a5 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -73,8 +73,8 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, env->regs[15] = tb->pc; } } -#endif /* CONFIG_TCG */ +#ifndef CONFIG_USER_ONLY static bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); @@ -85,6 +85,9 @@ static bool arm_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_VFIQ | CPU_INTERRUPT_VIRQ | CPU_INTERRUPT_EXITTB); } +#endif /* !CONFIG_USER_ONLY */ + +#endif /* CONFIG_TCG */ void arm_register_pre_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook, void *opaque) @@ -2017,6 +2020,7 @@ static const struct TCGCPUOps arm_tcg_ops = { .debug_excp_handler = arm_debug_excp_handler, #if !defined(CONFIG_USER_ONLY) + .has_work = arm_cpu_has_work, .cpu_exec_interrupt = arm_cpu_exec_interrupt, .do_interrupt = arm_cpu_do_interrupt, .do_transaction_failed = arm_cpu_do_transaction_failed, @@ -2041,7 +2045,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) device_class_set_parent_reset(dc, arm_cpu_reset, &acc->parent_reset); cc->class_by_name = arm_cpu_class_by_name; - cc->has_work = arm_cpu_has_work; cc->dump_state = arm_cpu_dump_state; cc->set_pc = arm_cpu_set_pc; cc->gdb_read_register = arm_cpu_gdb_read_register;