From patchwork Fri Jul 19 21:03:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 169269 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4323938ilk; Fri, 19 Jul 2019 14:04:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqBnVGz0RI2FWrRigsvLsMDUMmyruFx3i3wwGDzMGSx3EeVOtfJPnnHz4hVjBBOiKk8GKk X-Received: by 2002:a17:906:b315:: with SMTP id n21mr5150268ejz.312.1563570277849; Fri, 19 Jul 2019 14:04:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563570277; cv=none; d=google.com; s=arc-20160816; b=nNKziz/Pc9RRC6yYTO9Z8kyzMtc9Du7YDDkglOwU3IQuwbjWlx013IT7sS6Py7i01r qpnMm8V8S05M8riLDVlx8pfPcpWFsQtGOgD5tp31hqi84Y9bF+f6xyz5lke+dLmydaj1 1+bLmeIkh32iy7zoihBg7N2NtOrquABChcxZPzD3FZMVIuTH98WlwXyCEQXfvh5araCW o3BoVVNu8UuQkOYAGbWcWSLIdqjLLDLd/JRSp9JrPvPhaI+qOx36rfTYw4/UWjLIRBsr uys6IgPTPKQh0PQdrvLvPuK+S+witcyDDMZRaP6pfDYZX69YG0Nojy76PUwuXW2d+Vz7 j9hw== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=bTH7aSoItBiIk3DIxJaTq67j1jqzFDHGY5zqBaAqigU=; b=wL4BE+XZ8efcKtd8He0MNcpv5AtYMnQpOLFSFTzRoGgRSFHnaeAFLrjpZiIDcX+2KS 3xaBaYbqpBAC7xOAgCcUngUT0BnjfpWEXgBu9MJ8s3ifkW85YQcbq6I8P7Z5CrO7hNqs n/JZu/ss2o9B3aBo6bYqreyhXEbGI48vT+8tEXZAZM3Vsx3cQF3PMaWNVtYuvTpZCj1Q w/YaLaZg9c4t5zRN7w8uAkvuta0szqtN4T7yXvvEJrbKw3Nq31rHfudJRSA2kI9dwkRz Tjqkg20zNfq+H2ajJt0aI+ISQrUfSOtBmEVfxj8EVjIcjb6/p+gnLz2eIfKpIVi8W0Kq kFTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ts3f1ohr; 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 j9si603299edn.191.2019.07.19.14.04.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jul 2019 14:04:37 -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=ts3f1ohr; 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]:48166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoa3Q-0007Fj-EI for patch@linaro.org; Fri, 19 Jul 2019 17:04:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55014) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoa3L-00077w-Er for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:04:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoa32-0005L3-P6 for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:04:16 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:42557) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hoa2z-00058z-Eh for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:04:10 -0400 Received: by mail-pl1-x642.google.com with SMTP id ay6so16193603plb.9 for ; Fri, 19 Jul 2019 14:03:42 -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; bh=bTH7aSoItBiIk3DIxJaTq67j1jqzFDHGY5zqBaAqigU=; b=ts3f1ohrVi+w84vD2lKk6gGOI0rKYllupe9O4OkDqd6abAHxL0JI6H2vu3i3xA36ny LLFyQ3h/0PbFQv1ATKJeLcSMBpIwDZ9Db4Q4RLyjjaG0ojYQu3vUUe9lwPq5cAkLAKJe ydp5EhO9hByFc7qCXuO6mx5abo3ABIXi7WceTGO3C0Z7CkEKld9hJFT+Ok6PkW8xfiCu nlmggDWTzCJfByJhQdWX02SqtrTSaMiP2fADUJQJpjjNGpoCPtv3BIYn24VjtnkwmzRw qVc6euvnDQy4S4AVbpdD80AndlBOblWfs07TEx5D1K6FqsUHTyb11nbF5+TiWUVEBXO2 xs7g== 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; bh=bTH7aSoItBiIk3DIxJaTq67j1jqzFDHGY5zqBaAqigU=; b=AkjtRs7ng34vC43Y3ddeBx0i+owSWPDXdT70ufiXD+6tFIMIL4uMvcL5fEKVdglKHi +Ahru30+lRosML1ayLgC9GWsSppXSrlHePQ8ICbcZG5+cLuX2uOptiT5u8bFUZ6mMc4g G0hhNSDTLmBd41jcdPY2ZkbtEoRY11PV4oI9MssUviQMYeNa8bweHauEV8ljzlqDIPhj yuFumITeDCQL+Nu1vMnlBQVoBVkr47Y/NniTL+KXiRybssmEgaVSE9BmOLXjRTHNvyU0 eTGtT9f9+zXxg1XbFDolyo/e+mUerS3osOSFzUNHBdYksVPEOE3SwOyWFTjBEVCvG7s7 XatQ== X-Gm-Message-State: APjAAAVBBC0xVlxkgfX+mjgwRL6sNY3yCQrpLl/ryG1Kp3x0H3Ntqsun gAsyOSfbW8JwTbmdCQeLKdlidMsgpUc= X-Received: by 2002:a17:902:290b:: with SMTP id g11mr58074777plb.26.1563570221373; Fri, 19 Jul 2019 14:03:41 -0700 (PDT) Received: from localhost.localdomain (97-126-117-207.tukw.qwest.net. [97.126.117.207]) by smtp.gmail.com with ESMTPSA id i6sm32724751pgi.40.2019.07.19.14.03.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 19 Jul 2019 14:03:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 19 Jul 2019 14:03:13 -0700 Message-Id: <20190719210326.15466-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190719210326.15466-1-richard.henderson@linaro.org> References: <20190719210326.15466-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 Subject: [Qemu-devel] [PATCH for-4.2 11/24] target/arm: Add the hypervisor virtual counter 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, beata.michalska@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/cpu-qom.h | 1 + target/arm/cpu.h | 11 +++++---- target/arm/cpu.c | 2 ++ target/arm/helper.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 5 deletions(-) -- 2.17.1 Reviewed-by: Alex Bennée diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h index 2049fa9612..43fc8296db 100644 --- a/target/arm/cpu-qom.h +++ b/target/arm/cpu-qom.h @@ -76,6 +76,7 @@ void arm_gt_ptimer_cb(void *opaque); void arm_gt_vtimer_cb(void *opaque); void arm_gt_htimer_cb(void *opaque); void arm_gt_stimer_cb(void *opaque); +void arm_gt_hvtimer_cb(void *opaque); #define ARM_AFF0_SHIFT 0 #define ARM_AFF0_MASK (0xFFULL << ARM_AFF0_SHIFT) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index e37008a4f7..bba4e1f984 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -144,11 +144,12 @@ typedef struct ARMGenericTimer { uint64_t ctl; /* Timer Control register */ } ARMGenericTimer; -#define GTIMER_PHYS 0 -#define GTIMER_VIRT 1 -#define GTIMER_HYP 2 -#define GTIMER_SEC 3 -#define NUM_GTIMERS 4 +#define GTIMER_PHYS 0 +#define GTIMER_VIRT 1 +#define GTIMER_HYP 2 +#define GTIMER_SEC 3 +#define GTIMER_HYPVIRT 4 +#define NUM_GTIMERS 5 typedef struct { uint64_t raw_tcr; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 1959467fdc..90352decc5 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1218,6 +1218,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) arm_gt_htimer_cb, cpu); cpu->gt_timer[GTIMER_SEC] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, arm_gt_stimer_cb, cpu); + cpu->gt_timer[GTIMER_HYPVIRT] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, + arm_gt_hvtimer_cb, cpu); #endif cpu_exec_realizefn(cs, &local_err); diff --git a/target/arm/helper.c b/target/arm/helper.c index 3124d682a2..329548e45d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2527,6 +2527,7 @@ static uint64_t gt_tval_read(CPUARMState *env, const ARMCPRegInfo *ri, switch (timeridx) { case GTIMER_VIRT: + case GTIMER_HYPVIRT: offset = gt_virt_cnt_offset(env); break; } @@ -2543,6 +2544,7 @@ static void gt_tval_write(CPUARMState *env, const ARMCPRegInfo *ri, switch (timeridx) { case GTIMER_VIRT: + case GTIMER_HYPVIRT: offset = gt_virt_cnt_offset(env); break; } @@ -2698,6 +2700,34 @@ static void gt_sec_ctl_write(CPUARMState *env, const ARMCPRegInfo *ri, gt_ctl_write(env, ri, GTIMER_SEC, value); } +static void gt_hv_timer_reset(CPUARMState *env, const ARMCPRegInfo *ri) +{ + gt_timer_reset(env, ri, GTIMER_HYPVIRT); +} + +static void gt_hv_cval_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + gt_cval_write(env, ri, GTIMER_HYPVIRT, value); +} + +static uint64_t gt_hv_tval_read(CPUARMState *env, const ARMCPRegInfo *ri) +{ + return gt_tval_read(env, ri, GTIMER_HYPVIRT); +} + +static void gt_hv_tval_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + gt_tval_write(env, ri, GTIMER_HYPVIRT, value); +} + +static void gt_hv_ctl_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + gt_ctl_write(env, ri, GTIMER_HYPVIRT, value); +} + void arm_gt_ptimer_cb(void *opaque) { ARMCPU *cpu = opaque; @@ -2726,6 +2756,13 @@ void arm_gt_stimer_cb(void *opaque) gt_recalc_timer(cpu, GTIMER_SEC); } +void arm_gt_hvtimer_cb(void *opaque) +{ + ARMCPU *cpu = opaque; + + gt_recalc_timer(cpu, GTIMER_HYPVIRT); +} + static const ARMCPRegInfo generic_timer_cp_reginfo[] = { /* Note that CNTFRQ is purely reads-as-written for the benefit * of software; writing it doesn't actually change the timer frequency. @@ -6852,6 +6889,26 @@ void register_cp_regs_for_features(ARMCPU *cpu) .opc0 = 3, .opc1 = 4, .crn = 2, .crm = 0, .opc2 = 1, .access = PL2_RW, .writefn = vmsa_tcr_ttbr_el2_write, .fieldoffset = offsetof(CPUARMState, cp15.ttbr1_el[2]) }, +#ifndef CONFIG_USER_ONLY + { .name = "CNTHV_CVAL_EL2", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 3, .opc2 = 2, + .fieldoffset = + offsetof(CPUARMState, cp15.c14_timer[GTIMER_HYPVIRT].cval), + .type = ARM_CP_IO, .access = PL2_RW, + .writefn = gt_hv_cval_write, .raw_writefn = raw_write }, + { .name = "CNTHV_TVAL_EL2", .state = ARM_CP_STATE_BOTH, + .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 3, .opc2 = 0, + .type = ARM_CP_NO_RAW | ARM_CP_IO, .access = PL2_RW, + .resetfn = gt_hv_timer_reset, + .readfn = gt_hv_tval_read, .writefn = gt_hv_tval_write }, + { .name = "CNTHV_CTL_EL2", .state = ARM_CP_STATE_BOTH, + .type = ARM_CP_IO, + .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 3, .opc2 = 1, + .access = PL2_RW, + .fieldoffset = + offsetof(CPUARMState, cp15.c14_timer[GTIMER_HYPVIRT].ctl), + .writefn = gt_hv_ctl_write, .raw_writefn = raw_write }, +#endif REGINFO_SENTINEL }; define_arm_cp_regs(cpu, vhe_reginfo);