From patchwork Tue Dec 3 02:29:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 180678 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp949162ile; Mon, 2 Dec 2019 18:48:23 -0800 (PST) X-Google-Smtp-Source: APXvYqwJdX2FOH83uZ3uosvBB8V18d69+QSIZgBO37TXGeqPNibxyntWGuM076Uc9lRmCilhvSxu X-Received: by 2002:a50:9f65:: with SMTP id b92mr576284edf.21.1575341303084; Mon, 02 Dec 2019 18:48:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575341303; cv=none; d=google.com; s=arc-20160816; b=czihcLytimSLCcy8otNW1vHikcyYYjn9ecUE4slOx4M6XnGSdqbMW/4i5zb2ocjSxD q4etlcdIEKmeW5149oCcr+V/EciX1XUcnjlj1t6emmWnHnDKRvdaklyuve2p+dGxAM4h 5a63L4mynAFR77Ue7/DhgwkNRH9fM0/SAlbDLf6ogXiqbXv5wP+FkSgbzuCl5/+5yXWT 8Nsa2qIo96DG1K61wC5KML0HvxlEHgG84vLeFDHULMmxTBe+jO9OWqXvZtzz+au+BemC 0t5ODdj6baCkF/DDDGHmd5xuN5N38Qd4SP3ODdLAaG2JB9NOgEEeihs45VJ7SCwQHiVh YaVw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=E8yk4OTb4DM68OtMu/yGYISogJYWI7EJZxpxxXSYsqE=; b=h+yMaBwd4ti5fmB6NLGmnBEKLckdaxCYoy2Cc1iOjEmfzNySbtoxRzbOeebgZEp4Wf jtEpnl47CkkOY3Pq4aVch6zFZ9o0hQLjBXPsrlNQ2j9nuxkN/87rka5AVDMj58neLzBo sBWszauGLeu1f9OccgGk/AIS5hpbCntI6JPuyypDKx/pLugTKInauBs77RQM5pXS5ujM eOHWhqF7g7s5FIAB9zDIiPCfYvH/fJtd2W9Ef//++1BsgRXRKFgcfNFuM9UhFYWLQtSC 5Yr/xF7j/431jeV45v8qAU5HbQQMjnokwC+islCwk7x9jXoKznMAZigh2AL4R4rQrrDg 5HDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sE+KrcDl; 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 f11si1166177edn.424.2019.12.02.18.48.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Dec 2019 18:48:23 -0800 (PST) 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=sE+KrcDl; 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]:47420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibyEf-0007ar-F2 for patch@linaro.org; Mon, 02 Dec 2019 21:48:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32782) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibxxI-0003M7-SS for qemu-devel@nongnu.org; Mon, 02 Dec 2019 21:30:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibxxB-0008S0-58 for qemu-devel@nongnu.org; Mon, 02 Dec 2019 21:30:21 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:44823) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibxxA-0008MG-LN for qemu-devel@nongnu.org; Mon, 02 Dec 2019 21:30:16 -0500 Received: by mail-pg1-x542.google.com with SMTP id x7so856061pgl.11 for ; Mon, 02 Dec 2019 18:30:11 -0800 (PST) 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=E8yk4OTb4DM68OtMu/yGYISogJYWI7EJZxpxxXSYsqE=; b=sE+KrcDlU+6nT18OIC8EFUiq/+P7tYlBURoB6x/qOKo+PsbTTV2mVzfDAJvyfI8Dgx DVeQztNveHI2/tqoS9ln9OMmnn3vd/5C6sjTuwnJpavys0kzqirKzEROYmqWkEiMrxsj 2S+VoFh5bp0xiIcRtK5mjbBpQUb953BczmSe+zXx7m2zRed1NYL8JWVsmsWfPvWH7fyG VswyB8X31AqVaDoO2R20QzAhmV0p/ddllbv5LIuZY2s3opzAA8+OMKdgX61Jn7Px89hz uCmk4x1X8uloZzNKuSyTNfIrpqFKh+pQaVIC1glY2SVTBkMPVXUkfIbkWEyfj28EW1Gq dSzw== 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=E8yk4OTb4DM68OtMu/yGYISogJYWI7EJZxpxxXSYsqE=; b=dOnE15Zr3ogT2ArRNanixsq6iMbLtP3UfNlAwkd9YwMCJNxq3Up1+W2+CaLo3ngwaI bwup1QcuUjlwzuusyx024Pq9LeRITfJW1fIrbW27zh75u9x4tVjIGNGeqGsI7qBoUBzU 9jZgVmFt0oJJqFBwI35lkT2LA6JvlnMQLXAf55QuccCpHdSlxsshZjXH267gYo/l2j7B cmOfi5CZs+5Och0MMXYt246MW/delVmmx1x6l5MElKut+4Q2rpY+NKLFoJLPuaRagfet a8Rzzdz8RkQx0TbcpXnzNp7KRiqtsNhP+y6e/gegXLXKtmnY9Y1NAHV9mzf1xRJ3CnIJ EXWw== X-Gm-Message-State: APjAAAWGxz4N3hNAywXdxX6X6xyWNe/SfrEpxsjHLBW1jZAn+0yMuqO6 E/foAIxhhmZJA0tiTqinIwHjYVlOVOw= X-Received: by 2002:a63:36c4:: with SMTP id d187mr2859006pga.108.1575340210716; Mon, 02 Dec 2019 18:30:10 -0800 (PST) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id q22sm873695pfg.170.2019.12.02.18.30.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 18:30:10 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 24/40] target/arm: Add the hypervisor virtual counter Date: Mon, 2 Dec 2019 18:29:21 -0800 Message-Id: <20191203022937.1474-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191203022937.1474-1-richard.henderson@linaro.org> References: <20191203022937.1474-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::542 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, 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 7f5b244bde..3a9d31ea9d 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 8aa625734f..4bd1bf915c 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 7a4ac9339b..81c33221f7 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1259,6 +1259,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 9ad5015d5c..a4a7f82661 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2516,6 +2516,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; } @@ -2532,6 +2533,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; } @@ -2687,6 +2689,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; @@ -2715,6 +2745,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. @@ -6989,6 +7026,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);