From nobody Wed Apr 16 02:28:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550171305426428.6942140745982; Thu, 14 Feb 2019 11:08:25 -0800 (PST) Received: from localhost ([127.0.0.1]:53526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMMn-0000Nd-9v for importer@patchew.org; Thu, 14 Feb 2019 14:08:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMKn-0007hC-65 for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guMKm-0004c6-Cm for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:09 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:41848) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guMKm-0004bY-3i for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:08 -0500 Received: by mail-wr1-x430.google.com with SMTP id x10so7687752wrs.8 for ; Thu, 14 Feb 2019 11:06:08 -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.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 11:06:05 -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=Jh5+Frt/7Rja8KutRCKJMPQxR5V89Yg+i67n1ES5EEM=; b=wYM4BQp8PpeL8Eujkhz62VB9URaL3GpfkcEEBpAa8PTRsB2UBkI2cCL5sFnvMfzZCO vuLfYKf6nWiTskh0T/iAKafICOSKCANIGZaDPuTdZxxYkg6Fkv/YYtlio9TFs0tyLkXx ck9oAxoS56vNpXsHPznvx08/adyl6T8j4hNaRHJe96bWTkbiO3ttom7rk5KseEDsWyPI af6Q08oPrzN0oHqzAn7eOn3GYC5aBDboo72VkSiuCMz6L5MYcb+cSv0/5AxDKMWtjeU8 yEtHq5D9QoaROlsr1fEckXZzATFItl/5I52MnXWWgMnt9YWe3gGXmjappua+aiX+FCvz 66VA== 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=Jh5+Frt/7Rja8KutRCKJMPQxR5V89Yg+i67n1ES5EEM=; b=uDyIy+BLiKukfg/lcQYgsw6hU+DvOQXpDEKzf8qeVMmCpnX5qGEigq1fOTJjeVVNGX dilsTo2rh57dkZHH97bTMYFN9960VmHCRnRgqVaikQI0PUM0+tjonGNGl1aL8xtyGWDh mI2ay5j6ZJZNgpvdXmmzRYZzUpUZyuxaBx1t3kBh02llVYCi28F2si4AzWQVsXMI/uGA KwMR2Ma5ccgViF1yj5foH8JE2zvD0DjRu7WQToyY3foVwwmcj5Lwc8R/9453jAxgHsmv cRdRetdUOTIkY8660sVNc5k219nFD+UbGFquTEoSMWx+R9jvcdl3dSyBMZvQM+mNZXMu 24AA== X-Gm-Message-State: AHQUAuab5uxvKu9gxfqbgHiStDFgnGSEldkzMCkEJApj5U5AVhJPbZ6Z DbcOTSoZwh0OYfD69luYooSknx+UKoMRWw== X-Google-Smtp-Source: AHgI3IauLvqCAN42D0PdbXtNXmw0u/OcbHh6135fww7EzH5EgWPeonhhE8k0hr3/wdc+GU/aBgdvSA== X-Received: by 2002:a5d:4a8a:: with SMTP id o10mr3989534wrq.189.1550171166661; Thu, 14 Feb 2019 11:06:06 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 19:05:37 +0000 Message-Id: <20190214190603.25030-2-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 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 Subject: [Qemu-devel] [PULL 01/27] target/arm: Fix CRn to be 14 for PMEVTYPER/PMEVCNTR 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Aaron Lindsay OS This bug was introduced in: commit 5ecdd3e47cadae83a62dc92b472f1fe163b56f59 target/arm: Finish implementation of PM[X]EVCNTR and PM[X]EVTYPER Signed-off-by: Aaron Lindsay Reported-by: Laurent Desnogues Reviewed-by: Laurent Desnogues Message-id: 20190205135129.19338-1-aaron@os.amperecomputing.com Signed-off-by: Peter Maydell --- target/arm/helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 520ceea7a41..bd9f6050eca 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5855,25 +5855,25 @@ void register_cp_regs_for_features(ARMCPU *cpu) char *pmevtyper_name =3D g_strdup_printf("PMEVTYPER%d", i); char *pmevtyper_el0_name =3D g_strdup_printf("PMEVTYPER%d_EL0"= , i); ARMCPRegInfo pmev_regs[] =3D { - { .name =3D pmevcntr_name, .cp =3D 15, .crn =3D 15, + { .name =3D pmevcntr_name, .cp =3D 15, .crn =3D 14, .crm =3D 8 | (3 & (i >> 3)), .opc1 =3D 0, .opc2 =3D i & = 7, .access =3D PL0_RW, .type =3D ARM_CP_IO | ARM_CP_ALIAS, .readfn =3D pmevcntr_readfn, .writefn =3D pmevcntr_write= fn, .accessfn =3D pmreg_access }, { .name =3D pmevcntr_el0_name, .state =3D ARM_CP_STATE_AA6= 4, - .opc0 =3D 3, .opc1 =3D 3, .crn =3D 15, .crm =3D 8 | (3 &= (i >> 3)), + .opc0 =3D 3, .opc1 =3D 3, .crn =3D 14, .crm =3D 8 | (3 &= (i >> 3)), .opc2 =3D i & 7, .access =3D PL0_RW, .accessfn =3D pmreg= _access, .type =3D ARM_CP_IO, .readfn =3D pmevcntr_readfn, .writefn =3D pmevcntr_write= fn, .raw_readfn =3D pmevcntr_rawread, .raw_writefn =3D pmevcntr_rawwrite }, - { .name =3D pmevtyper_name, .cp =3D 15, .crn =3D 15, + { .name =3D pmevtyper_name, .cp =3D 15, .crn =3D 14, .crm =3D 12 | (3 & (i >> 3)), .opc1 =3D 0, .opc2 =3D i &= 7, .access =3D PL0_RW, .type =3D ARM_CP_IO | ARM_CP_ALIAS, .readfn =3D pmevtyper_readfn, .writefn =3D pmevtyper_wri= tefn, .accessfn =3D pmreg_access }, { .name =3D pmevtyper_el0_name, .state =3D ARM_CP_STATE_AA= 64, - .opc0 =3D 3, .opc1 =3D 3, .crn =3D 15, .crm =3D 12 | (3 = & (i >> 3)), + .opc0 =3D 3, .opc1 =3D 3, .crn =3D 14, .crm =3D 12 | (3 = & (i >> 3)), .opc2 =3D i & 7, .access =3D PL0_RW, .accessfn =3D pmreg= _access, .type =3D ARM_CP_IO, .readfn =3D pmevtyper_readfn, .writefn =3D pmevtyper_wri= tefn, --=20 2.20.1