From patchwork Thu Feb 14 19:05:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 158422 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1745608jaa; Thu, 14 Feb 2019 11:06:42 -0800 (PST) X-Google-Smtp-Source: AHgI3IbMRXLm2oMLea1dIS62gnPGKOmEbrVkx6hfdBA0uQ75zWHnOHgWGVDURRlJVxmU2ZFQvq9A X-Received: by 2002:a81:4c54:: with SMTP id z81mr4649300ywa.219.1550171202270; Thu, 14 Feb 2019 11:06:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550171202; cv=none; d=google.com; s=arc-20160816; b=Oezf2+IdpQMte5cl1pdlJQ3Ko2gZsjdv3b3DvfMHSdjQUY2BcmSZ9CDShHHfmwzf9N d/HscU0dK6LXSWS279gfXzTymm4DQAr+s9PN+f6Va4gge8nOdbe06N/lyoNn6p8WorQ4 sYB9fpqUIAnq+wMTnV31OOKnjZNHIDYmMnif3v37zMCzAg9XgGZDbYH+4DxJdSD9FU+b WDj/U7mz0px8WNkqDbOczWEz2xEVX2LGv353Z9ZJlqAqjWvQnYGJZFAiRyVwSjMthXDN usd2kRhKFnvRoCPY4FeyZuKmq4nVj1428juAAvA++ysFk48Lcgwv9PQsE3GtJvH8BqKd LVew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=wu8o6K6bGJE93plhMQqvd5UtFuzltGhLBZkX4kxwg8M=; b=Tx3O0vbZsa8IbW8I83tfeb//kEiXAxC5p6n+KrvtBCywc1GZcXSycHaQKw8K9yFp9c rJS+1oJz8VnqUFA2hChnVcUgN2VTL3gTo5PGapaN2ULLFMJIbV7B/OYLIGaNRYU4dySj nsip1rXR7XkwbL+WAOru0bnsiu3b/FS+rYEfiIWwNSuAb4EzYumRJCFTMYc/aNV8ZcQY VGJIlxCKablhX3FQCV0YE8n+csSUEnBFJx5HpN8Mm1YrPuK8L5iKc7zkht8PQuFe//Gp dnSN+2o933Y+9BE/PqGM2SLaLtiFo1FELVDyzxgxZ+OW2QISIZ5MWMw1sAvFiT26D/IQ 0bbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xZOePMmr; 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 k190si2008326ywd.127.2019.02.14.11.06.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Feb 2019 11:06:42 -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=xZOePMmr; 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]:53520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMLJ-0007nh-OR for patch@linaro.org; Thu, 14 Feb 2019 14:06:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMKv-0007kR-Hk for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guMKu-0004hg-94 for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:17 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:37972) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guMKu-0004gr-1q for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:16 -0500 Received: by mail-wm1-x32e.google.com with SMTP id v26so7192853wmh.3 for ; Thu, 14 Feb 2019 11:06:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wu8o6K6bGJE93plhMQqvd5UtFuzltGhLBZkX4kxwg8M=; b=xZOePMmrbBYYnK4JFn6eyHVN1tgNnjAVEZjf7K8FHCFejT5Suo6M9DqVU4jKxAvhtD ex4D0YbpmEt4iGqyHlBzW6Vr8GTNUIs3lOB+CJLHQk/d08WgtVVopUd3LjNJw5GK6cph ixP2DZZhSX9ACkgjirfty14/Xiigqa5vH3rJGfIlK6HXqQod0EsiwIbwr19HkyBVdCGY 0Kstwm/vnVEe65yKEp/bukZFwdisKXfNlLQiZc3PFjGfrknDD5tPuVoeJAK+km/nIt27 GZoNUAoWyjnY8MAyWrgScD7IQdSKxT2THzFuDu9tNCm7JHtwQYLfW0W6aZS7vZZRN47O r4NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wu8o6K6bGJE93plhMQqvd5UtFuzltGhLBZkX4kxwg8M=; b=Dz7OX20uw5KAtz7ML0szbdsTDTVkwQ/gpB7lHec5WyoO45DuLSTTksvGZWpiqExFFJ Ry8+yO7S60sPflCmJ09w70QiliCw778mDNmUb7V3mv5u1Fz4HmWaO157AEAXBwJI4kTu noGRU1uxCkO9/zknyZjLJZUzieYcQWShPMuCu8L7zv88mh6qzIEc6lj0OXVpdsDahBI9 LcvfJs+5i6KWjXwxarWdqg9BPUD6e5mb0nfPHIadJ9Kgcl55BGOhDKjbvMN5GBt3hvqv lZJMPbKid865pCFvE44yfcuCPCL8MnyI0GxZuKbTfk9Mp6yxIllhfRlmr0xFgIfojuYl RruA== X-Gm-Message-State: AHQUAuZkzxan1tFv1XNlkrnJIZzppP8+K5xPqhP9hkSMsYdvx5aX6YMs +oIO6930Ke+/Wb1931gCrQkPmBxVxrvbSQ== X-Received: by 2002:a1c:2d4c:: with SMTP id t73mr3835471wmt.142.1550171174706; Thu, 14 Feb 2019 11:06:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n184sm7798471wmf.5.2019.02.14.11.06.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 11:06:14 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 19:05:44 +0000 Message-Id: <20190214190603.25030-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214190603.25030-1-peter.maydell@linaro.org> References: <20190214190603.25030-1-peter.maydell@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::32e Subject: [Qemu-devel] [PULL 08/27] 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée 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 Message-id: 20190205190224.2198-4-alex.bennee@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- 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 b2abaf5b225..77c73056948 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, @@ -6451,6 +6444,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); }