From patchwork Tue Feb 5 19:02:21 2019 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: 157528 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5578328jaa; Tue, 5 Feb 2019 11:58:40 -0800 (PST) X-Google-Smtp-Source: AHgI3IZguecrkwrr0vFkb8jjLwm7/HcLgD1U9FVyK+1YGKzokl9AOYLjj/dvftivbuq4oP5/0GkB X-Received: by 2002:a81:d804:: with SMTP id d4mr5332182ywj.197.1549396720592; Tue, 05 Feb 2019 11:58:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549396720; cv=none; d=google.com; s=arc-20160816; b=PQ25OCb8/eGSjmFqZ7h9cUhDNczvs6dy1iT9cIJDJhlAPcL2Dm5suJ91kH7bKv1utP tPpqjTZvhGcAKjKrdqynW2ZCtzrio4xEBl3qCHGIAHm4rA204ZJtmDI//9zGKeXRcRkQ pBkRXGavlZ/LV0YyMDuznYNuVeJxO+fN+M55JOgxaspzmdrLgbzNV/tDS7tpLzc9BXZ4 LvU+Vg8fEiQpjaUWFUsZSRXjkjIZw+WyEfB1Qr8vgtZnBA68+PrCvqaJlDdC+/4d9TeF S/JYl3woIEkbF43WMEgwZ8TP14spbDhTRFNyBo6E5MMxOkTm7J44ypjPX0na7S8zA2Z8 F/Pg== 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=VSMGan48u0jw2BmDqDF3JBDZ7ZffWC3BIeULp9LWLWg=; b=pEMc1SWlWWSVE0IAJqfr+WRXps3nihqEyvDw3GiLfQ0etzJQOlIXHeJvDLgNOQO8Lb SWXvLDeCzZpGcy0wQdQusUChOLFkd8bJKEkqB6GZwYLdKndE3eNCWdV0eZRwyg4HNqo8 kKPXWLQb2UD2VAGwpbNwnPqU9GnQZVjifT7FpK/voGDfugN+7GEGOaA2k8KwOcESaXGM 6mY6xJIWFWcYMLzH8ARRIs9vv5klW2Noqtsmf/mWr8E4jlcHBnL20xA9PWoEa8uVvMs+ ZxeGvJRqnhbuVfvUGMl4LxLISfoUkHpDhuikahNDpqzAvMLNoygsQCFkvEIDDmyIekD4 ClgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qDtPFwsV; 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 q125si2443400ywg.279.2019.02.05.11.58.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 11:58:40 -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=qDtPFwsV; 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 ([127.0.0.1]:39438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr6rg-0002Wk-33 for patch@linaro.org; Tue, 05 Feb 2019 14:58:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5zg-0007vH-9U for qemu-devel@nongnu.org; Tue, 05 Feb 2019 14:02:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5ze-0004Nx-7D for qemu-devel@nongnu.org; Tue, 05 Feb 2019 14:02:52 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39119) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr5zd-00044k-PZ for qemu-devel@nongnu.org; Tue, 05 Feb 2019 14:02:49 -0500 Received: by mail-wr1-x444.google.com with SMTP id t27so4869875wra.6 for ; Tue, 05 Feb 2019 11:02:28 -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=VSMGan48u0jw2BmDqDF3JBDZ7ZffWC3BIeULp9LWLWg=; b=qDtPFwsVI+cSIgKdlvpzaibWVNqXUnUBp39Ic62fMNINyccBGMsNWT1mj89rsFsI2k uLAm/9bALvD0J80lTCDX3tmh1jM9yRjpU//MLiigr+9CZQvCVEF2hee9FE5zsNNrCmGP P7zHQ/JvjoPLh2lIfkugP06Mf4HG8pGvGE88I+gVqVjNfIm+axNqv9ypO8HvPEFZfqQ0 qTFBqD6cnNtAqQtoNRthdb4QZV0V7tcipoKx5IADHmO62iwzwvVHpw0hQTDcZrGZl5U5 ZNOiVWEZ8azTCZ/gPHkCm2aCBfOnfwU4ahRq6BpAcEZZBfKumicrMKbxWLXfUQaCm0KW i/0A== 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=VSMGan48u0jw2BmDqDF3JBDZ7ZffWC3BIeULp9LWLWg=; b=TJCFZLq7Gh6RBicvYVFqM5G14cLwIuX5I6cmHhgYjUCnZP8Ai10ksX/ijFwFj8+10Y UdS9+JNZuWvtR9aqHqzre3C14ik6DJIcZ5mT+KS+2FrtojSimROVkQqTPftBprRfpjQQ N4GBms3pV1OXrI+0P7rBegSCPJQY4pZlZrry4pWBVlu9R05X9CMaGRntwnw8hpYm8F8N XeoXNiwXVSSgYWv+t0CKWp54C9QMykMxgFpjjoJcLouzczXeXedxQvRL3OsAYsQ/B3bD 2F/wTNHA6AU0O2zVbrXgJM1vn2z6n3IdCVM+vzTOgqab4MDN+rM782ISj6BcRRYIMy50 Dr6A== X-Gm-Message-State: AHQUAuZ6yMvUdkkWIjO5IWsp9rf49JclQgIk+xxqPbtAmFuueKGwohL0 EBHMC4Kcfo3qN8p8rEhx9AUElF9/eVk= X-Received: by 2002:a05:6000:12ce:: with SMTP id l14mr2492707wrx.269.1549393347265; Tue, 05 Feb 2019 11:02:27 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z14sm13469930wrm.48.2019.02.05.11.02.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Feb 2019 11:02:26 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A1C4A1FF83; Tue, 5 Feb 2019 19:02:24 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 19:02:21 +0000 Message-Id: <20190205190224.2198-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205190224.2198-1-alex.bennee@linaro.org> References: <20190205190224.2198-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:4864:20::444 Subject: [Qemu-devel] [PATCH v2 3/6] target/arm: expose MPIDR_EL1 to userspace 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?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As this is a single register we could expose it with a simple ifdef but we use the existing modify_arm_cp_regs mechanism for consistency. Signed-off-by: Alex Bennée --- target/arm/helper.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index f90754cc11..f2f868ff92 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3657,13 +3657,6 @@ static uint64_t mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri) return mpidr_read_val(env); } -static const ARMCPRegInfo mpidr_cp_reginfo[] = { - { .name = "MPIDR", .state = ARM_CP_STATE_BOTH, - .opc0 = 3, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 5, - .access = PL1_R, .readfn = mpidr_read, .type = ARM_CP_NO_RAW }, - REGINFO_SENTINEL -}; - static const ARMCPRegInfo lpae_cp_reginfo[] = { /* NOP AMAIR0/1 */ { .name = "AMAIR0", .state = ARM_CP_STATE_BOTH, @@ -6445,6 +6438,20 @@ void register_cp_regs_for_features(ARMCPU *cpu) } if (arm_feature(env, ARM_FEATURE_MPIDR)) { + ARMCPRegInfo mpidr_cp_reginfo[] = { + { .name = "MPIDR_EL1", .state = ARM_CP_STATE_BOTH, + .opc0 = 3, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 5, + .access = PL1_R, .readfn = mpidr_read, .type = ARM_CP_NO_RAW }, + REGINFO_SENTINEL + }; +#ifdef CONFIG_USER_ONLY + ARMCPRegUserSpaceInfo mpidr_user_cp_reginfo[] = { + { .name = "MPIDR_EL1", + .fixed_bits = 0x0000000080000000 }, + REGUSERINFO_SENTINEL + }; + modify_arm_cp_regs(mpidr_cp_reginfo, mpidr_user_cp_reginfo); +#endif define_arm_cp_regs(cpu, mpidr_cp_reginfo); }