From patchwork Fri May 18 11:44:23 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: 136295 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1129282lji; Fri, 18 May 2018 04:45:09 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqJVSHBR5fIDiObky8Ge1adCdmDeKewbcu/vmfFisqrPUyIGs7JAVqa7pgTVgWjrIB+Kd32 X-Received: by 2002:a0c:93da:: with SMTP id g26-v6mr8597946qvg.243.1526643909902; Fri, 18 May 2018 04:45:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526643909; cv=none; d=google.com; s=arc-20160816; b=E0++AVdQd6Onx6SEBx2nlDDg+0LEn2KQWsUK3azQXY2mbUPOiVbyRE7rp0jsRyXmja Ua6nRkE4Ciliiz9rODJI6lQRp0cVfBgzXIxh42a6TvJ03DjvwmJ4RRgJa1ThtZ4j7j4q lmXn0oRl3BDSwG6UuOL8oh69jkJfOfalGuyuzRBnvBCE7d0RRdIZn58pPbyREmg97zs8 dXiwVWSYGiGUhnKr7EbC3PcIMzLYPdWwYxNOaCRFK1E9xQ9TLmlXU4h+4A8sLBhK30re 1nEeAjPY0vrbTwOtSPCUKrPAHy1UcQ5d3CMHZM6B3FgjwW7blpTJksenV1Lby6Du/1JP vd/g== 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=dELcojVFJWt7A2v6t7CFtT+0hLIdSVJNso/IcORbe2g=; b=0UHx1duGqx6XlRKxxmpqSXyyAw4VPwlFFo0713/95hjdhlHYbmWP85n7nlpDfLATJr 4KpM36G/OiNI7sHByXucHd9dZUdan8h82sK5xrYSqF9MW1UWN78JBPks3AdaPm7xsqnn lgMQSzUFlVYs9MAsSQ31xyrttOBkbGQ7sMCf9gbnY4KgE0vpYZrgg7SCX4g/XLMtbrwI Dgfst6Q7KyW6AM4KJsUDX0xp4U+BnGxMn7HSq8BRonpfFeBXO8CLoo489ZeJjQeHQqum Gay3ujDt/0zYqOCPTYLWyLSg/6LLZirZA/3Ars56oR4Nn3+NKTKoD8+sgNpFvi92Ypae nGcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CeTig8jZ; 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 93-v6si74456qkw.278.2018.05.18.04.45.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 May 2018 04:45:09 -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=CeTig8jZ; 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]:38171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJdor-0006vn-B0 for patch@linaro.org; Fri, 18 May 2018 07:45:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJdoE-0006hd-FB for qemu-devel@nongnu.org; Fri, 18 May 2018 07:44:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJdoB-00080j-PW for qemu-devel@nongnu.org; Fri, 18 May 2018 07:44:30 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:45074) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJdoB-0007z8-H0 for qemu-devel@nongnu.org; Fri, 18 May 2018 07:44:27 -0400 Received: by mail-wr0-x244.google.com with SMTP id w3-v6so1185299wrl.12 for ; Fri, 18 May 2018 04:44:27 -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=dELcojVFJWt7A2v6t7CFtT+0hLIdSVJNso/IcORbe2g=; b=CeTig8jZJAtlkWEkzpo0qdEcqpuGXzaV8LkYbaYKIprgF+/SYCka4fsWOJkRoT1tCO aHv0LijegnyJEV3dKnZ9RiZAQfInT+GZAZpBEh/22Vi9zuVNbqRNh7gimQGyJfFSOWb1 rU5c9Mdoj5J6KGSV/AnYSNT58vMiKTmlNVlGM= 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=dELcojVFJWt7A2v6t7CFtT+0hLIdSVJNso/IcORbe2g=; b=Kq9LOIWwkq6vIYlHO9BVyQxcCAHATeDKS/sY0+LJVaJS085HUSlRu5YCSZR01RaWtX D2smmTwwvwNwZ4EkJoQXtDlNpIwmnCTNwC/imOe6TAnmgsNhcsz5YCyfIuHebZJ2TJWM DmsU6RG4O/hsTBHRoFHU4Y9CY1X/N0Izq7iKHssmVKmhm4ZjszlsfucUnAyxhcv9NbZR W2K7AehY0+FBNtKi9hq7OrY+l0P6oeuzsXf4H/QDsj6IxVOwCVXRftZDO5XnAhz2jl5h 0taTY7RWzlQt+78Udu0W77XIqTO8XEThDGhn8hhU2p/rS2iv5BSJVK6fcE+9wr37AQXq 1XiQ== X-Gm-Message-State: ALKqPweb0q48EjChN4N8hS9Mz4H3gD5fxvSXJLQanF43UBeXYv0ansFj XK64lCTZfgj83DhfDH/a9s+93A== X-Received: by 2002:adf:afce:: with SMTP id y14-v6mr7833436wrd.249.1526643866258; Fri, 18 May 2018 04:44:26 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d83-v6sm9959996wmh.16.2018.05.18.04.44.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 04:44:24 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 389E23E0260; Fri, 18 May 2018 12:44:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 18 May 2018 12:44:23 +0100 Message-Id: <20180518114424.18054-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518114424.18054-1-alex.bennee@linaro.org> References: <20180518114424.18054-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:c0c::244 Subject: [Qemu-devel] [PATCH v2 1/2] 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 --- target/arm/helper.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) -- 2.17.0 diff --git a/target/arm/helper.c b/target/arm/helper.c index db8bbe52a6..39098a15bf 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2135,11 +2135,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, + .access = PL0_R /* no PL1_RW in linux-user */, + .fieldoffset = offsetof(CPUARMState, cp15.c14_cntfrq), + .resetvalue = (1000 * 1000 * 1000) / 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 }; From patchwork Fri May 18 11:44:24 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: 136297 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1132868lji; Fri, 18 May 2018 04:49:23 -0700 (PDT) X-Google-Smtp-Source: AB8JxZocUdWHXPRgh/j3qH6v8tFYRk2H8TTDuxQqVXBWCy4CiEzJ2zYOZDMMHAtc+V56mfdc32oU X-Received: by 2002:aed:3e19:: with SMTP id l25-v6mr8717010qtf.143.1526644163105; Fri, 18 May 2018 04:49:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526644163; cv=none; d=google.com; s=arc-20160816; b=B4DWWsk3zwFpRjSlOR570y6cqHPWEmw5LDD8cGwP0T6xoB0JxP3ffnIr5vJsiW0QfW 2kH9VjcnXsQkSWRhY0wl7joO6GsrxflSt+iFxg8oTcBH1J/BzZ0EUtr1B26q2TENV9Kz hI6CaAGtMdnAtKKECqMD1SGGFrM+nLKL9/Ybsma8IlqNguom1GZyp2tNBRaE601i3Ggt ZQ+WLD7ZhsrRAMjiwtfebg5vwM9lpENCT0kK004bOpLIycqIAxa3fljfCCXy000vacHy Rs84EJZLAvMii9DBzBfRqb7ytqJo9G2ZHMpnkshiyinm8T//bujjGBbxxf6Ye1HNoeHE a+Bw== 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=6yLmObHEVxu0zCdFrBDUjZZu7B0GQyPAuk74uJdtrTw=; b=yXa27f7RXNUwhRO0n3Zfsmu7hMROux9DgjPReUEPDFOs/95dAKXL6I6G0X1OHILl1d re3tMaqUQ23zTdDENKLZaUM6lgk323GFV13JvLXBAhrY0533RKPjj9EsPcf56UfYGn4t kh73CyU3H4P9ZmEloHvgWHFTQ5B9ZwCXUyer2ydwqFjrZYYlmah+Qj1TBcN5+nXYeiFY hB/0Il2xTFPW5NR7WF8oCDBZ3Gavw+vdtNptL06warNpGNDYy5zWtLgD6XEXpVTv8dk2 37xj6KkdxJKCRrlpeQe1waLgpPqtYiUg0marmBaTfGt8w3eDWGleM+B07hRuDPXwVYQ7 xbMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZwGq56xw; 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 h89-v6si4192591qtd.54.2018.05.18.04.49.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 May 2018 04:49:23 -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=ZwGq56xw; 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]:38190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJdsw-0000vh-KW for patch@linaro.org; Fri, 18 May 2018 07:49:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJdoF-0006jM-06 for qemu-devel@nongnu.org; Fri, 18 May 2018 07:44:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJdoC-000823-KF for qemu-devel@nongnu.org; Fri, 18 May 2018 07:44:30 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:40792) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJdoC-00080N-8u for qemu-devel@nongnu.org; Fri, 18 May 2018 07:44:28 -0400 Received: by mail-wr0-x236.google.com with SMTP id v60-v6so8883291wrc.7 for ; Fri, 18 May 2018 04:44:28 -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=6yLmObHEVxu0zCdFrBDUjZZu7B0GQyPAuk74uJdtrTw=; b=ZwGq56xwivCXaBiWtLSrJfwXdhfh4GHeMXE+a9NcWQJBbmGIG68jpEFBkjSWQOc9my z1dkdieKHV5oAwtkTV0OHCekF6GBcuaM30JGzhjKN65qMZNkXUjepn4p+XSn1zbwNeaO G8Wx3PXIDPh3GmZwKaQbZQo2GMgrfOtHUVp1w= 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=6yLmObHEVxu0zCdFrBDUjZZu7B0GQyPAuk74uJdtrTw=; b=e/25MtncFK2A0zr6Z5bNiJf7xfmhZE+lm3d/4EV3JhYNmleRpzXlbJr8illq+9QMtj YJcmmQdChNa1+xIZTF1uoSYqUNkH5p9oHq8ADy1Hge9Tki+Qm5nngfJG6vlMF/jBL204 K3yoEjcTat/EKwiRWzRdhGFGiqz54kFPBlBENcjIj2zMXCESuvULGjOIgOW0m2af8k1O fVMQVqjj0tQ/fQb65PTqHsz+GrFyoRKuOgdQV5OcZ1FS+H2RK2sPzCpTUo00iHhO/e5v UtZYPhGhxjGhvU4VkV2Uqqb/t/o4C2CUl6GNJzQALfuTm29cG2mLPELqBPQPic722Gqq 8Tag== X-Gm-Message-State: ALKqPwcOWz83SJqKSHUbVbAMU/FWGIQBmxzbQ1zkt+0tMPDPQmDVrpuH Hq7d/7r7tHMXgBCc8+FVj+7U9A== X-Received: by 2002:adf:8505:: with SMTP id 5-v6mr7113914wrh.77.1526643867110; Fri, 18 May 2018 04:44:27 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q81-v6sm5068421wmd.14.2018.05.18.04.44.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 04:44:26 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4C04F3E027B; Fri, 18 May 2018 12:44:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 18 May 2018 12:44:24 +0100 Message-Id: <20180518114424.18054-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518114424.18054-1-alex.bennee@linaro.org> References: <20180518114424.18054-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Received-From: 2a00:1450:400c:c0c::236 Subject: [Qemu-devel] [PATCH v2 2/2] tests/tcg/aarch64: userspace system register test 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" Signed-off-by: Alex Bennée --- tests/tcg/aarch64/Makefile.target | 2 +- tests/tcg/aarch64/sysregs.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/aarch64/sysregs.c -- 2.17.0 diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index ac177d9747..595927f027 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -7,7 +7,7 @@ VPATH += $(AARCH64_SRC) # we don't build any of the ARM tests AARCH64_TESTS=$(filter-out $(ARM_TESTS), $(TESTS)) -AARCH64_TESTS+=fcvt +AARCH64_TESTS+=fcvt sysregs TESTS:=$(AARCH64_TESTS) fcvt: LDFLAGS+=-lm diff --git a/tests/tcg/aarch64/sysregs.c b/tests/tcg/aarch64/sysregs.c new file mode 100644 index 0000000000..0cd0c42d8c --- /dev/null +++ b/tests/tcg/aarch64/sysregs.c @@ -0,0 +1,14 @@ +#include + +#define get_cpu_reg(id) ({ \ + unsigned long __val; \ + asm("mrs %0, "#id : "=r" (__val)); \ + printf("%-20s: 0x%016lx\n", #id, __val); \ + }) + +int main(void) +{ + get_cpu_reg(cntvct_el0); + get_cpu_reg(cntfrq_el0); + return 0; +}