From patchwork Sat Feb 1 19:28:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1232274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=ee2CS1UH; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48941K6hbZz9s29 for ; Sun, 2 Feb 2020 06:30:13 +1100 (AEDT) Received: from localhost ([::1]:49008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixyT5-00079Z-Qe for incoming@patchwork.ozlabs.org; Sat, 01 Feb 2020 14:30:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58564) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixySM-00073W-FQ for qemu-devel@nongnu.org; Sat, 01 Feb 2020 14:29:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixySL-0006Rj-CM for qemu-devel@nongnu.org; Sat, 01 Feb 2020 14:29:26 -0500 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]:50477) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixySL-0006RH-6X for qemu-devel@nongnu.org; Sat, 01 Feb 2020 14:29:25 -0500 Received: by mail-pj1-x1041.google.com with SMTP id r67so4474282pjb.0 for ; Sat, 01 Feb 2020 11:29:25 -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=H1scrHoRFHkW8V/qxPSJeuSDB15CpU5xa7Qviebbre4=; b=ee2CS1UHNBC+W3OSWJyMlRrSmG/GlP6pp0vgOnBrIFgNFnsZa9GIsRFkPQeZQGGxaM /JF3b0YpdViTZ1GZo2nl0NbOq5sfbteu7K2XB55LNYgKdPrKvxx30+/skOkhjw64Ht6H Lr/V/qJnqaYK4CVUydfVzpX0E+ju2a4jXLJkHZgtP3P23RsNBC8bwAShZj2iP1+DwxhG iRYMPjAWUhunx01lQEOF/tIgtY/3p4iNE6yjr9WJeaRYW897d9VHySMGtU1h1wcaW/G+ Cje5OJzGY3jSUGy/ef4zdRZDlrVuyleCZm65wNTkESq6OGaKWkF9eiyCHH9HJN01gvMi 36TA== 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=H1scrHoRFHkW8V/qxPSJeuSDB15CpU5xa7Qviebbre4=; b=Y0TE7/UrZ5u1fr/xcZWRzeRojg31NE99cnyxeEB7jv7gHaSBTh2Nsr/sg5ZZdRDJ8q wfxRDYD+jELtWK+JJReYTUUlw+UjXw6N6PVLYJ2iG4PiFaT8UY3pKUJmd/s+TXxD65kw 6FmQcq6aONdrRWH8WQkpPbotjaz+rRiJuYSJFEg4JwURfQG8bwPwFB23zmqP+HCCIrt4 06TIzn7dJidrhtLxk0hcupQgUSpdIfWb2Cvk7g18Sn1zKa59EqOKuBN9/JASfCqbVbJ2 mnWjvbEQpw3s+KnhBP6iaO+SEUWXl5/kKGuzH0+lx/NoTr2oPLuD0io4loW1NAf8V3E1 D0MA== X-Gm-Message-State: APjAAAVo2LTTby/T+krNNoU8lJH/VVabxEs5cNNrJmFEfoqFZKj6teBx lEMDEIyzUsKhna0bIOsSp2H4fuXNF6U= X-Google-Smtp-Source: APXvYqzYpd0NU1Ep7XtXp/s/I69rIXM7/Ws1l/iIdxCo109qvBOWuhcIw/81AWPYMrUdh6lFSD1Q7Q== X-Received: by 2002:a17:90a:2223:: with SMTP id c32mr20883169pje.15.1580585363794; Sat, 01 Feb 2020 11:29:23 -0800 (PST) Received: from localhost.localdomain (97-126-123-70.tukw.qwest.net. [97.126.123.70]) by smtp.gmail.com with ESMTPSA id l7sm3668509pga.27.2020.02.01.11.29.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2020 11:29:23 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 05/41] target/arm: Update CNTVCT_EL0 for VHE Date: Sat, 1 Feb 2020 11:28:40 -0800 Message-Id: <20200201192916.31796-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200201192916.31796-1-richard.henderson@linaro.org> References: <20200201192916.31796-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::1041 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, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The virtual offset may be 0 depending on EL, E2H and TGE. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- target/arm/helper.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index c7ee0d603f..dbfdf2324b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2515,9 +2515,31 @@ static uint64_t gt_cnt_read(CPUARMState *env, const ARMCPRegInfo *ri) return gt_get_countervalue(env); } +static uint64_t gt_virt_cnt_offset(CPUARMState *env) +{ + uint64_t hcr; + + switch (arm_current_el(env)) { + case 2: + hcr = arm_hcr_el2_eff(env); + if (hcr & HCR_E2H) { + return 0; + } + break; + case 0: + hcr = arm_hcr_el2_eff(env); + if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) { + return 0; + } + break; + } + + return env->cp15.cntvoff_el2; +} + static uint64_t gt_virt_cnt_read(CPUARMState *env, const ARMCPRegInfo *ri) { - return gt_get_countervalue(env) - env->cp15.cntvoff_el2; + return gt_get_countervalue(env) - gt_virt_cnt_offset(env); } static void gt_cval_write(CPUARMState *env, const ARMCPRegInfo *ri, @@ -2532,7 +2554,13 @@ static void gt_cval_write(CPUARMState *env, const ARMCPRegInfo *ri, static uint64_t gt_tval_read(CPUARMState *env, const ARMCPRegInfo *ri, int timeridx) { - uint64_t offset = timeridx == GTIMER_VIRT ? env->cp15.cntvoff_el2 : 0; + uint64_t offset = 0; + + switch (timeridx) { + case GTIMER_VIRT: + offset = gt_virt_cnt_offset(env); + break; + } return (uint32_t)(env->cp15.c14_timer[timeridx].cval - (gt_get_countervalue(env) - offset)); @@ -2542,7 +2570,13 @@ static void gt_tval_write(CPUARMState *env, const ARMCPRegInfo *ri, int timeridx, uint64_t value) { - uint64_t offset = timeridx == GTIMER_VIRT ? env->cp15.cntvoff_el2 : 0; + uint64_t offset = 0; + + switch (timeridx) { + case GTIMER_VIRT: + offset = gt_virt_cnt_offset(env); + break; + } trace_arm_gt_tval_write(timeridx, value); env->cp15.c14_timer[timeridx].cval = gt_get_countervalue(env) - offset +