From patchwork Mon Jun 25 16:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 139861 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4159660lji; Mon, 25 Jun 2018 09:01:55 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLcNQ0AAdUXbV6gy/qWR925wQ+oynFRtV1RznzTc65PEK2YbyoKWcloZNhYXIsfzn9DW1dT X-Received: by 2002:a37:b12:: with SMTP id 18-v6mr8463519qkl.217.1529942515018; Mon, 25 Jun 2018 09:01:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529942515; cv=none; d=google.com; s=arc-20160816; b=pPVm+MRjVfjf7Q6dd8OetvBPEL/iPZDsqLE5yl2FIBwAowzIVJ4YgKi0AjKlJcSpX0 H1HPoycvZCInEKCuBgWr+PhnEaqGt0aT/nKaJ+eY/XyHoahpktDEjIUnLiz9eBCwF4Wb HQwV8xeEwNCepxkU4z3ml2v7z4BH50thqi357ePXirYToNgqWpD4TgC7E2GjVLPZ5FPv dOUZYUL7g7YdfpNNom45eUhzLVXizKc6e1nzpOL4Uhg0ToWyXGkLSQVX8smvk0XM3rs9 eAfylIQpo/gI2wW48bnd+EDdrm6KWDO/5qy6rfF+LtHQZthrAkPwvNlHCwi/fSK0ZyJy 6eXA== 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:arc-authentication-results; bh=jw+vFO42AWQuky1xdpGzosmSyOqmsc+deFAWMnBM/sg=; b=XTfUUZwFtPUOGIrsLwZOn83wCImWpjWcUQjNjVMo+CCZKlgTXFH9r140J7D6GDO90o ge9k2EsyaACwV61r2xS4hKG7V7j02J2nENFjAcNccBspzLOmEveXjK6Bb8W6YIXrOKsc DYGUrGEiLz+UXo+QcOX7UWiaxdm+D3pwrRdMAZUnhi4Cm2M3RhE/W1pPcGwHK1g0ql14 CGlrcJ+Ar5y0HTxqRRnvR9daGvRBBuOA9ey1+Dn9vdex6COKkgTYW4shkgoff3Wke3fb Zofvr8D2pewOlT8Cc/xMPr6lb4O7LunT/Cl+lH/337Y3bBKN/GqIJbEuRtmv08+/0ly7 oevA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VxzIpma3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o7-v6si7308992qki.245.2018.06.25.09.01.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Jun 2018 09:01:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VxzIpma3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:47980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXTwA-0006IN-3Y for patch@linaro.org; Mon, 25 Jun 2018 12:01:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXTuZ-0004oc-9S for qemu-devel@nongnu.org; Mon, 25 Jun 2018 12:00:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXTuW-00050z-5Q for qemu-devel@nongnu.org; Mon, 25 Jun 2018 12:00:15 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:52882) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fXTuV-00050M-Uf for qemu-devel@nongnu.org; Mon, 25 Jun 2018 12:00:12 -0400 Received: by mail-wm0-x242.google.com with SMTP id p126-v6so9909152wmb.2 for ; Mon, 25 Jun 2018 09:00:11 -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=jw+vFO42AWQuky1xdpGzosmSyOqmsc+deFAWMnBM/sg=; b=VxzIpma3VPNKdSQ7OzVYCETDZg2WzgA20De3aWdWTDBV8SLXgfNAeWyk1aWLPimb7K +Q67LCxknAWiw1wIWC54GuoZKMcgka0r9bnw2UIXps/TAuw03m/rXsn9I5m8fj0URW2q jBYU81aUxzazgHsJO2yS/eE7akcVb1UYjfqSU= 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=jw+vFO42AWQuky1xdpGzosmSyOqmsc+deFAWMnBM/sg=; b=iw2ncsi3ip0pHXoFR/fAwqzRQAOwiQ3gef/+oRSRhAq/5d5jeyoP7BJO81c3zskg6e SkKIGvlIhc+dgXIYqKSjzsyQaG0vejkECk8G9zdWlFI3k/DW1DeAN63CWvY4LnLVgHXS 1JELHT0SplaugwJ321CfssFTj7jWTzF+1FNs6pjG+K0hxM/jfj+EjxZe48TN4nmnxHWv SPQesjkEYYYRot/lhP/gehgPkUDLW/+vLGFjXQURf67z+17KBuXzzI0FGRncaSAk0Dv9 SLglFoWUI0YVn3T1HWVAShsEbg4v3BrOXHfUwEf5B3Ip8tsn0C6psvIa6K/IIGKqSWFX tjGw== X-Gm-Message-State: APt69E1X0n/DjXVk3qFj7pqXfwjCna+Px5H5bHqIOqFyxHSqvujJnYq6 zVygGA5WBppGvVLMw0ksA4Gi7A== X-Received: by 2002:a1c:c241:: with SMTP id s62-v6mr1530311wmf.146.1529942410567; Mon, 25 Jun 2018 09:00:10 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g11-v6sm15870933wrr.46.2018.06.25.09.00.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Jun 2018 09:00:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4A3FD3E0866; Mon, 25 Jun 2018 17:00:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Jun 2018 17:00:05 +0100 Message-Id: <20180625160009.17437-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180625160009.17437-1-alex.bennee@linaro.org> References: <20180625160009.17437-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH v3 1/5] target/arm: support reading of CNT[VCT|FRQ]_EL0 from user-space X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Since kernel commit a86bd139f2 (arm64: arch_timer: Enable CNTVCT_EL0 trap..) user-space has been able to read these system registers. As we can't use QEMUTimer's in linux-user mode we just directly call cpu_get_clock(). Signed-off-by: Alex Bennée --- v2 - include CNTFRQ_EL0 for PL0_R only v3 - use NANOSECONDS_PER_SECOND / GTIMER_SCALE --- target/arm/helper.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) -- 2.17.1 Reviewed-by: Richard Henderson diff --git a/target/arm/helper.c b/target/arm/helper.c index 1248d84e6f..6e6b1762e8 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2166,11 +2166,32 @@ static const ARMCPRegInfo generic_timer_cp_reginfo[] = { }; #else -/* In user-mode none of the generic timer registers are accessible, - * and their implementation depends on QEMU_CLOCK_VIRTUAL and qdev gpio outputs, - * so instead just don't register any of them. + +/* In user-mode most of the generic timer registers are inaccessible + * however modern kernels (4.12+) allow access to cntvct_el0 */ + +static uint64_t gt_virt_cnt_read(CPUARMState *env, const ARMCPRegInfo *ri) +{ + /* Currently we have no support for QEMUTimer in linux-user so we + * can't call gt_get_countervalue(env), instead we directly + * call the lower level functions. + */ + return cpu_get_clock() / GTIMER_SCALE; +} + static const ARMCPRegInfo generic_timer_cp_reginfo[] = { + { .name = "CNTFRQ_EL0", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 3, .crn = 14, .crm = 0, .opc2 = 0, + .type = ARM_CP_CONST, .access = PL0_R /* no PL1_RW in linux-user */, + .fieldoffset = offsetof(CPUARMState, cp15.c14_cntfrq), + .resetvalue = NANOSECONDS_PER_SECOND / GTIMER_SCALE, + }, + { .name = "CNTVCT_EL0", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 3, .crn = 14, .crm = 0, .opc2 = 2, + .access = PL0_R, .type = ARM_CP_NO_RAW | ARM_CP_IO, + .readfn = gt_virt_cnt_read, + }, REGINFO_SENTINEL };