From nobody Sun Feb 8 23:05:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=os.amperecomputing.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544542370244369.70827641687345; Tue, 11 Dec 2018 07:32:50 -0800 (PST) Received: from localhost ([::1]:38697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWk1g-0005ha-U7 for importer@patchew.org; Tue, 11 Dec 2018 10:32:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWjqO-0004Pg-Sc for qemu-devel@nongnu.org; Tue, 11 Dec 2018 10:21:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWjqI-0001kq-79 for qemu-devel@nongnu.org; Tue, 11 Dec 2018 10:21:07 -0500 Received: from mail-eopbgr800102.outbound.protection.outlook.com ([40.107.80.102]:11923 helo=NAM03-DM3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWjq7-0001dB-PN; Tue, 11 Dec 2018 10:20:51 -0500 Received: from DM6PR01MB4825.prod.exchangelabs.com (20.177.218.222) by DM6PR01MB4601.prod.exchangelabs.com (20.177.216.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.21; Tue, 11 Dec 2018 15:20:49 +0000 Received: from DM6PR01MB4825.prod.exchangelabs.com ([fe80::9c7c:27c7:4cb7:f820]) by DM6PR01MB4825.prod.exchangelabs.com ([fe80::9c7c:27c7:4cb7:f820%2]) with mapi id 15.20.1404.026; Tue, 11 Dec 2018 15:20:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amperemail.onmicrosoft.com; s=selector1-os-amperecomputing-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pGq08p3YHvPWrndSn5oZZbnHS6W0/LYuWqc1GxqE9hc=; b=FXFB94ahDMK8FA4B+dVKCpcZ5aN6vvTump43Q4Y/G+0rcy3GrEfBW7hazIet9LZFMbn0CAoo+Jm8PFyZm5UmpMve9+Dv9pKpXN/Kf8861yY9oND1GxEbQTmVFtqFU9nWu1rq5FDSu6gIXvPlPeEfX9APZ1ospVmIzf0V1bqv7oo= From: Aaron Lindsay To: "qemu-arm@nongnu.org" , Peter Maydell , Alistair Francis , Wei Huang , Peter Crosthwaite , Richard Henderson Thread-Topic: [PATCH v10 12/14] target/arm: PMU: Set PMCR.N to 4 Thread-Index: AQHUkWUYWjeYOy/9s0KtpgjoZvT56A== Date: Tue, 11 Dec 2018 15:20:49 +0000 Message-ID: <20181211151945.29137-13-aaron@os.amperecomputing.com> References: <20181211151945.29137-1-aaron@os.amperecomputing.com> In-Reply-To: <20181211151945.29137-1-aaron@os.amperecomputing.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR11CA0041.namprd11.prod.outlook.com (2603:10b6:a03:80::18) To DM6PR01MB4825.prod.exchangelabs.com (2603:10b6:5:6b::30) authentication-results: spf=none (sender IP is ) smtp.mailfrom=aaron@os.amperecomputing.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [65.190.6.212] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM6PR01MB4601; 6:AP/ZCFcnlraX6P7r1yK9APUXmjrd7Ee2Jiw0L0PlaDCkHt0GB08uty/WURhrTVwxu4ha6pbqEDnY9Z2k1qHtlhXJTIVIko5j0kMGKngi68Wi3wOiILgjNHHqVLxfh4mxUPHs+mWJUlXwUVY9kxgKQBiY58MEIEDo2ElgrzDlyfMHCAkrIy2kRvtJxyV2ujam9H+5+WJWYJ7RQwPJxdK21wKyJkOzNYhG8kjzL+pXSpdRorINiauPt3YAAJnv6d9hTKaGYHseOnD/NbqcAnjFLNFHmskmFe/AG2iJqDP3LRRZvd5byZFGWnYjBBzw+Q8v338D34TXNFcw9bmOn/Gsq54T/6pmQF1aDCBIeh30fOYdbwSvEpnRYKJT3JXkB/jcB96Tuv/l23F0o/0YOVoLwJsbXpFV1TqxUCYt8nIuuPBfEIqMsuknJY3vUhAFlRnmLfabzhNNXAkqaKnNk+j3nQ==; 5:QtdY9dxD9tiRtzBQJXEsCzDRiwceMKjRT+A3QPlgH+vUOGPWKoTiSLsYg+bGa/tKvypMNaeckdvQKJ52Ul/DCiDgNYBxh1xKIt5B1Vt6BJLsjPwisb2yGvi1X/N6HAC1jDN2h8frAym7KmoUpQTuvAGtrngJVpVYwtDjFzq4sFQ=; 7:sPfZIdzwPuGxkgLxoybThRCFhwPkRfTrA7vi5+zXqf/tydtBkFxEk/PFBHIN5K2FNVlZ9ueW7RMBsYczaJwLZLQoE5y+m6fXBpsYRA8jBUln92sS/noPK2kF4Iau3kg0UhZ92LBV+m0mHjs9eGa4Tw== x-ms-office365-filtering-correlation-id: 0fda9599-bff1-4a29-e05d-08d65f7c3b3b x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DM6PR01MB4601; x-ms-traffictypediagnostic: DM6PR01MB4601: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231455)(999002)(944501520)(52105112)(10201501046)(3002001)(93006095)(93001095)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:DM6PR01MB4601; BCL:0; PCL:0; RULEID:; SRVR:DM6PR01MB4601; x-forefront-prvs: 08831F51DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(39850400004)(366004)(346002)(376002)(136003)(199004)(189003)(66066001)(7416002)(54906003)(106356001)(2906002)(97736004)(110136005)(305945005)(105586002)(316002)(5660300001)(3846002)(256004)(39060400002)(68736007)(14454004)(1076002)(7736002)(76176011)(11346002)(2501003)(99286004)(52116002)(6116002)(4326008)(6512007)(53936002)(81166006)(81156014)(8936002)(102836004)(26005)(8676002)(186003)(14444005)(71190400001)(446003)(486006)(6436002)(86362001)(25786009)(6486002)(2616005)(386003)(476003)(478600001)(6506007)(71200400001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM6PR01MB4601; H:DM6PR01MB4825.prod.exchangelabs.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:0; MX:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; received-spf: None (protection.outlook.com: os.amperecomputing.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: sskyGzMldK2s9RbhEIYAokt54eLN/Uxnmj4NRauxxD5Wruvahzvl2Q66U5Gbq1FSY1pzt3rxdSlt5u7fnat1riWswNFt+iWTFzZXUT8cQhfJNKbIBNeyqZ3nF3yeKRvnVZnm6XnF6yb0nqb17D1SWkF2y9bnvl0Jf9LCPYd0jSzSjYO0bcpzu7dlRm+OJGX5bbByD5SpHkeLrpV8GtQ2auanOsLw4sUs40sbNowIA2Dd3KuzbBDOyHqDRdRNbqJUgolTNMLhKw7hQ4+9lxLf48BpMYRXJPGqXS0CwW7Ukse7dbnGR2+4Tlj+gTgUukrA spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0fda9599-bff1-4a29-e05d-08d65f7c3b3b X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 15:20:49.6523 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR01MB4601 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.80.102 Subject: [Qemu-devel] [PATCH v10 12/14] target/arm: PMU: Set PMCR.N to 4 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: Aaron Lindsay , Michael Spradling , "qemu-devel@nongnu.org" , Digant Desai 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" This both advertises that we support four counters and enables them because the pmu_num_counters() reads this value from PMCR. Signed-off-by: Aaron Lindsay Signed-off-by: Aaron Lindsay Reviewed-by: Peter Maydell --- target/arm/helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 7e81473405..af09f757df 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1768,7 +1768,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] =3D { .access =3D PL1_W, .type =3D ARM_CP_NOP }, /* Performance monitors are implementation defined in v7, * but with an ARM recommended set of registers, which we - * follow (although we don't actually implement any counters) + * follow. * * Performance registers fall into three categories: * (a) always UNDEF in PL0, RW in PL1 (PMINTENSET, PMINTENCLR) @@ -5502,10 +5502,10 @@ void register_cp_regs_for_features(ARMCPU *cpu) } if (arm_feature(env, ARM_FEATURE_V7)) { /* v7 performance monitor control register: same implementor - * field as main ID register, and we implement only the cycle - * count register. + * field as main ID register, and we implement four counters in + * addition to the cycle count register. */ - unsigned int i, pmcrn =3D 0; + unsigned int i, pmcrn =3D 4; ARMCPRegInfo pmcr =3D { .name =3D "PMCR", .cp =3D 15, .crn =3D 9, .crm =3D 12, .opc1 = =3D 0, .opc2 =3D 0, .access =3D PL0_RW, @@ -5520,7 +5520,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) .access =3D PL0_RW, .accessfn =3D pmreg_access, .type =3D ARM_CP_IO, .fieldoffset =3D offsetof(CPUARMState, cp15.c9_pmcr), - .resetvalue =3D cpu->midr & 0xff000000, + .resetvalue =3D (cpu->midr & 0xff000000) | (pmcrn << PMCRN_SHI= FT), .writefn =3D pmcr_write, .raw_writefn =3D raw_write, }; define_one_arm_cp_reg(cpu, &pmcr); --=20 2.19.2