Commit 08267487 authored by Aaron Lindsay's avatar Aaron Lindsay Committed by Peter Maydell
Browse files

target/arm: Support multiple EL change hooks 



Signed-off-by: default avatarAaron Lindsay <alindsay@codeaurora.org>
Message-id: 1523997485-1905-7-git-send-email-alindsay@codeaurora.org
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent d5a5e4c9

target/arm/cpu.c

+16 −5
Original line number Diff line number Diff line
@@ -55,13 +55,15 @@ static bool arm_cpu_has_work(CPUState *cs) 
         | CPU_INTERRUPT_EXITTB);

}



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 = hook;

    cpu->el_change_hook_opaque = opaque;

    ARMELChangeHook *entry = g_new0(ARMELChangeHook, 1);



    entry->hook = hook;

    entry->opaque = opaque;



    QLIST_INSERT_HEAD(&cpu->el_change_hooks, entry, node);

}



static void cp_reg_reset(gpointer key, gpointer value, gpointer opaque)
@@ -552,6 +554,8 @@ static void arm_cpu_initfn(Object *obj) 
    cpu->cp_regs = g_hash_table_new_full(g_int_hash, g_int_equal,

                                         g_free, g_free);



    QLIST_INIT(&cpu->el_change_hooks);



#ifndef CONFIG_USER_ONLY

    /* Our inbound IRQ and FIQ lines */

    if (kvm_enabled()) {
@@ -713,7 +717,14 @@ static void arm_cpu_post_init(Object *obj) 
static void arm_cpu_finalizefn(Object *obj)

{

    ARMCPU *cpu = ARM_CPU(obj);

    ARMELChangeHook *hook, *next;



    g_hash_table_destroy(cpu->cp_regs);



    QLIST_FOREACH_SAFE(hook, &cpu->el_change_hooks, node, next) {

        QLIST_REMOVE(hook, node);

        g_free(hook);

    }

}



static void arm_cpu_realizefn(DeviceState *dev, Error **errp)

target/arm/cpu.h

+10 −10
Original line number Diff line number Diff line
@@ -632,12 +632,17 @@ typedef struct CPUARMState { 
} CPUARMState;



/**

 * ARMELChangeHook:

 * ARMELChangeHookFn:

 * type of a function which can be registered 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;

};



/* These values map onto the return values for

 * QEMU_PSCI_0_2_FN_AFFINITY_INFO */
@@ -826,8 +831,7 @@ struct ARMCPU { 
     */

    bool cfgend;



    ARMELChangeHook *el_change_hook;

    void *el_change_hook_opaque;

    QLIST_HEAD(, ARMELChangeHook) el_change_hooks;



    int32_t node_id; /* NUMA node this CPU belongs to */
@@ -2894,12 +2898,8 @@ static inline AddressSpace *arm_addressspace(CPUState *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);



/**

target/arm/internals.h

+4 −3
Original line number Diff line number Diff line
@@ -727,11 +727,12 @@ void arm_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, 
                                   int mmu_idx, MemTxAttrs attrs,

                                   MemTxResult response, uintptr_t retaddr);



/* 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);

    }

}