From nobody Sat Oct 25 13:17:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521232898050921.3524159565969; Fri, 16 Mar 2018 13:41:38 -0700 (PDT) Received: from localhost ([::1]:59489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewwAT-000592-47 for importer@patchew.org; Fri, 16 Mar 2018 16:41:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eww1O-0005pv-T4 for qemu-devel@nongnu.org; Fri, 16 Mar 2018 16:32:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eww1N-0003IG-Ks for qemu-devel@nongnu.org; Fri, 16 Mar 2018 16:32:14 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:55830) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eww1K-0003Dg-Fp; Fri, 16 Mar 2018 16:32:10 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3C7DA60FE9; Fri, 16 Mar 2018 20:32:07 +0000 (UTC) Received: from mossypile.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: alindsay@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id AE9156055D; Fri, 16 Mar 2018 20:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521232329; bh=sDuiE6LXXfdX5487SXN6aqIm5QZvYG3GALksd6/HLRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GHG1Oy2a8efoshu+o0yBccOTd39C7Syg4wYWGh0+YTpDAJwvwRSUWDPfxtLlEgHnA lbabjSEZahYu3ljWd6o8LkFvWlIrcgBQ9JDaE+is7FwwKcAlX4ee5rgAVpwFMPSfEq MovvNvok8oTV3K/XHT8sqfTdC/X48/DfUYAFObJs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521232326; bh=sDuiE6LXXfdX5487SXN6aqIm5QZvYG3GALksd6/HLRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVWtpkXnz0h2DzfcDngwegkw3fq+FoD3w77K08wzVKMLJJENZcaoUXJWOqfiTBRkt 8nIYbxUDHfQaVKlO1gJtB4yKjTOEcXfhw5v9olGbvdB2NZZ726WE6CClDQKNLmgK/Z 5HHYMUrL1sTnx7tznRyaaTJLy8BjuK8SANMJjEDs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org AE9156055D Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=alindsay@codeaurora.org From: Aaron Lindsay To: qemu-arm@nongnu.org, Peter Maydell , Alistair Francis , Wei Huang , Peter Crosthwaite Date: Fri, 16 Mar 2018 16:31:06 -0400 Message-Id: <1521232280-13089-9-git-send-email-alindsay@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1521232280-13089-1-git-send-email-alindsay@codeaurora.org> References: <1521232280-13089-1-git-send-email-alindsay@codeaurora.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 198.145.29.96 Subject: [Qemu-devel] [PATCH v3 08/22] target/arm: Support multiple EL change hooks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Spradling , qemu-devel@nongnu.org, Digant Desai Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Aaron Lindsay --- target/arm/cpu.c | 15 ++++++++++----- target/arm/cpu.h | 23 ++++++++++++----------- target/arm/internals.h | 7 ++++--- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 072cbbf..5f782bf 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -55,13 +55,16 @@ static bool arm_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_EXITTB); } =20 -void arm_register_el_change_hook(ARMCPU *cpu, ARMELChangeHook *hook, +void arm_register_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook, void *opaque) { - /* We currently only support registering a single hook function */ - assert(!cpu->el_change_hook); - cpu->el_change_hook =3D hook; - cpu->el_change_hook_opaque =3D opaque; + ARMELChangeHook *entry; + entry =3D g_malloc0(sizeof (*entry)); + + entry->hook =3D hook; + entry->opaque =3D opaque; + + QLIST_INSERT_HEAD(&cpu->el_change_hooks, entry, node); } =20 static void cp_reg_reset(gpointer key, gpointer value, gpointer opaque) @@ -744,6 +747,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error *= *errp) return; } =20 + QLIST_INIT(&cpu->el_change_hooks); + /* Some features automatically imply others: */ if (arm_feature(env, ARM_FEATURE_V8)) { set_feature(env, ARM_FEATURE_V7); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index f17592b..3b45d3d 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -633,11 +633,17 @@ typedef struct CPUARMState { =20 /** * ARMELChangeHook: - * type of a function which can be registered via arm_register_el_change_h= ook() - * to get callbacks when the CPU changes its exception level or mode. + * Support registering functions with ARMELChangeHookFn's signature via + * arm_register_el_change_hook() to get callbacks when the CPU changes its + * exception level or mode. */ -typedef void ARMELChangeHook(ARMCPU *cpu, void *opaque); - +typedef void ARMELChangeHookFn(ARMCPU *cpu, void *opaque); +typedef struct ARMELChangeHook ARMELChangeHook; +struct ARMELChangeHook { + ARMELChangeHookFn *hook; + void *opaque; + QLIST_ENTRY(ARMELChangeHook) node; +}; =20 /* These values map onto the return values for * QEMU_PSCI_0_2_FN_AFFINITY_INFO */ @@ -826,8 +832,7 @@ struct ARMCPU { */ bool cfgend; =20 - ARMELChangeHook *el_change_hook; - void *el_change_hook_opaque; + QLIST_HEAD(, ARMELChangeHook) el_change_hooks; =20 int32_t node_id; /* NUMA node this CPU belongs to */ =20 @@ -2895,12 +2900,8 @@ static inline AddressSpace *arm_addressspace(CPUStat= e *cs, MemTxAttrs attrs) * CPU changes exception level or mode. The hook function will be * passed a pointer to the ARMCPU and the opaque data pointer passed * to this function when the hook was registered. - * - * Note that we currently only support registering a single hook function, - * and will assert if this function is called twice. - * This facility is intended for the use of the GICv3 emulation. */ -void arm_register_el_change_hook(ARMCPU *cpu, ARMELChangeHook *hook, +void arm_register_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook, void *opaque); =20 /** diff --git a/target/arm/internals.h b/target/arm/internals.h index 47cc224..7df3eda 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -727,11 +727,12 @@ void arm_cpu_do_transaction_failed(CPUState *cs, hwad= dr physaddr, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t retaddr= ); =20 -/* Call the EL change hook if one has been registered */ +/* Call any registered EL change hooks */ static inline void arm_call_el_change_hook(ARMCPU *cpu) { - if (cpu->el_change_hook) { - cpu->el_change_hook(cpu, cpu->el_change_hook_opaque); + ARMELChangeHook *hook, *next; + QLIST_FOREACH_SAFE(hook, &cpu->el_change_hooks, node, next) { + hook->hook(cpu, hook->opaque); } } =20 --=20 Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, = Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.