From patchwork Sat Aug 3 18:47:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 170490 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp2345021ile; Sat, 3 Aug 2019 11:55:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwaf29OMeIYzzpBPliiJ+WidUV2sHRF6k0S2r+lg1W7PSotORzTlB85Pflq+DbG+5Y3egMX X-Received: by 2002:aa7:c149:: with SMTP id r9mr122960788edp.92.1564858537359; Sat, 03 Aug 2019 11:55:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564858537; cv=none; d=google.com; s=arc-20160816; b=LdNlSsNvle66uyjyUDh1PuoesYDoynCDVAYBaSVMQX4s3jO0zFqBQxd4nWlgVdTxEO X9sSdNAWTYwgJAA8Et2DWy68jyRjQaW1ZqDoxPKOIQaGVp3sKqN/0Qn/kow4FTqjBCnN lgbpaaWKi42nBVORmzd0tM0hNwKW67vo8lBFI8gxtXitrMzRLs+T/95NCuD5aT7Jtb43 PXdwbbdxM/CnpfaLz+D2rqCVA8UG4iLIohCxmvs18yhQGWWtGgX8LEmwZ6NtxJa0VPzs 2XRur2qGbXI3YnYFeeWyKl6Aoz9OJSifdSfu3fm9Z5MD7qpk6dVdwGYN9wxFZ7VGK9PH jTmA== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=XQAThtHXgFyxyKRl2tP3DLgR3ROFgj6xArwRDkS66hw=; b=wS4jDEzuMwQxcMKh6nJYqchKNWHcgxalyka2aUQpmsIrkITOJ7KsN4t0+/sW0huz7h aLyX1f8sEFF7E+1YocgQmzr+7JL6yesjcFDd5IlkKM/mF9tvaUp0dwx9f8yHpz24fIF0 xuoZ4U2waMOyMQJViXxlS7OfppRGExnQ9mYzLlHlIUtLYjwSBYSwGPzNW3z1g1KACCrt Xs1wXihZFLq7+fiTD707jtzpj4n/kObgS7iNpkevI1KDMr1UukUiO3oVzIV4juuU+DTL n+++WkoMDzbhPMgNGdTd9KyCH1KBa1a3eR4HTa1/ilr86gpJ3791pL74OuHeQgMj6QeE AHSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HYzJtc4U; 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 w41si26688156eda.9.2019.08.03.11.55.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 03 Aug 2019 11:55: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=HYzJtc4U; 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]:41464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htzBo-0003pb-CD for patch@linaro.org; Sat, 03 Aug 2019 14:55:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60761) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htz4o-0006H5-0Z for qemu-devel@nongnu.org; Sat, 03 Aug 2019 14:48:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1htz4l-0007DO-KB for qemu-devel@nongnu.org; Sat, 03 Aug 2019 14:48:21 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:36974) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1htz4k-0007Bb-8h for qemu-devel@nongnu.org; Sat, 03 Aug 2019 14:48:18 -0400 Received: by mail-pf1-x441.google.com with SMTP id 19so37616100pfa.4 for ; Sat, 03 Aug 2019 11:48:17 -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=XQAThtHXgFyxyKRl2tP3DLgR3ROFgj6xArwRDkS66hw=; b=HYzJtc4UILsYqHR3YMKJ2c7daYwFs9zPhg1eV7Vi3ygCUyRnRaa+lx3zvB/6jGWc9m 7XWhIeW7l7bq3zr103Lm1lmY0xHzB4UkCej5+WuiIMpY9qHPs3EdhEMsgyqCqhTj2dHY +j2AssPsadGFSRo8gYavQ7kqEpfVer3Up2+R2ylIzJKdGbBg91DkbEJo80ixMASFFP15 KjE8cs5rqFJ6epB/Ns0k8ol004Ii6zOgbEpSnHFGw4KxEAN9D2bB2kuh0bISBmBSlhFH hvtvr9m7D3gRupu/E207j72Q7X7b8iAsFAMW9Co+hPP4DNjON0RqMyRBOg44xR+RH8yr J3sg== 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:mime-version:content-transfer-encoding; bh=XQAThtHXgFyxyKRl2tP3DLgR3ROFgj6xArwRDkS66hw=; b=F1M5DTc6IqdDdzJZbyF2zPPF9TInj5oLwOTr88gvqqRPBqjIgu5g0PJZR+XjBHJ33F 6HeXfGTSqUxYO9fJPljxWn9paIM/g5nipIbn29h3t72QKmuceI7eVDYJ9tFhjskC6K73 xLPTTXP+b4bNF3UzRH5WlyJ1PprV+KAOQjq/oZsivL/3slbqLsq+YGOGmoBCim1XF06o LJ0w68b8z5gr2k6xL/4/pOZdhzcrMe+0VtmEtls41DpXXLRqKjxt3IPBtCuqpELsvITS 6ELA9S0E3HWTdnDHOma+ztHcd4OO3QJAICfjkgfNFcu780WJgIZVlPDVOSWP0Timo7as IRIw== X-Gm-Message-State: APjAAAWiQYhhNDG6sza67X1Wh5eRSOEC0bkSlXGBxs59ci1hzpUGvGAw YX31pDg3hpBbjV7HZ6Hgi5h69KT7v/s= X-Received: by 2002:aa7:8102:: with SMTP id b2mr24660458pfi.105.1564858096083; Sat, 03 Aug 2019 11:48:16 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id q69sm15405454pjb.0.2019.08.03.11.48.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 03 Aug 2019 11:48:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 3 Aug 2019 11:47:37 -0700 Message-Id: <20190803184800.8221-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190803184800.8221-1-richard.henderson@linaro.org> References: <20190803184800.8221-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 Subject: [Qemu-devel] [PATCH v3 11/34] 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, qemu-arm@nongnu.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Alex Bennée 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 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 ec2ab95dbe..4431330c2e 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1226,6 +1226,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 e2fcb03da5..e0f5627218 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. @@ -6849,6 +6886,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);