lkml.org 
[lkml]   [2020]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 07/24] kvm: arm64: Refactor handle_trap to use a switch
    Date
    Small refactor so that nVHE's handle_trap uses a switch on the Exception
    Class value of ESR_EL2 in preparation for adding a handler of SMC32/64.

    Signed-off-by: David Brazdil <dbrazdil@google.com>
    ---
    arch/arm64/kvm/hyp/nvhe/hyp-main.c | 15 ++++++++-------
    1 file changed, 8 insertions(+), 7 deletions(-)

    diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
    index 411b0f652417..19332c20fcde 100644
    --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c
    +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
    @@ -16,9 +16,9 @@

    DEFINE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);

    -static void handle_host_hcall(unsigned long func_id,
    - struct kvm_cpu_context *host_ctxt)
    +static void handle_host_hcall(struct kvm_cpu_context *host_ctxt)
    {
    + unsigned long func_id = host_ctxt->regs.regs[0];
    unsigned long ret = 0;

    switch (func_id) {
    @@ -109,11 +109,12 @@ static void handle_host_hcall(unsigned long func_id,
    void handle_trap(struct kvm_cpu_context *host_ctxt)
    {
    u64 esr = read_sysreg_el2(SYS_ESR);
    - unsigned long func_id;

    - if (ESR_ELx_EC(esr) != ESR_ELx_EC_HVC64)
    + switch (ESR_ELx_EC(esr)) {
    + case ESR_ELx_EC_HVC64:
    + handle_host_hcall(host_ctxt);
    + break;
    + default:
    hyp_panic();
    -
    - func_id = host_ctxt->regs.regs[0];
    - handle_host_hcall(func_id, host_ctxt);
    + }
    }
    --
    2.29.2.299.gdc1121823c-goog
    \
     
     \ /
      Last update: 2020-11-16 22:09    [W:4.254 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site