From nobody Thu Dec 18 19:35:29 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 1547824785064720.3626239383017; Fri, 18 Jan 2019 07:19:45 -0800 (PST) Received: from localhost ([127.0.0.1]:41282 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVvr-0003AT-TI for importer@patchew.org; Fri, 18 Jan 2019 10:19:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVc0-0003Ls-2U for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:59:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkVbu-0007oz-8J for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:59:12 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:38102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkVbt-0007n1-1p for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:59:06 -0500 Received: by mail-wm1-x32e.google.com with SMTP id m22so4811295wml.3 for ; Fri, 18 Jan 2019 06:59:04 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e27sm92094561wra.67.2019.01.18.06.59.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:59:03 -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=Jowc/FBCz8XRY1StuJjoHUd6JspCGnmk9nEZdh98/eY=; b=DGBMHu008W1+tcs+F6H9fAQXU2B2ZO+Ga2wv2cmghTNloDYMAqUk2Kxd6fIXxbE3u1 YArOMkc9wt5AolNuXt5soBl52kz32VqY0mbkW2K1/P8xVZjQz+3Tu5BMh2dYWXBy3vyp 4Fjq+1RszWk8+JA+GZ31wwZNilSVOYrFvcqdE= 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=Jowc/FBCz8XRY1StuJjoHUd6JspCGnmk9nEZdh98/eY=; b=ScyhNQLwGbOeKuP2WEsmdVSJ53FngR9Ez3Phxnsfpl8ylpzSG9//4iYLWll3hlFrmz IY1cGCb2vHwoIaKvx9PaDfgRPCnl+h51+e8pEgxGudeUv6TNTzEpBYU/L1qhxcalPkft Nlize3I1LdFHHkRfwnFFuJNFBb+BKGWuw8ulfLO2xwHpPu7+5WK9GrY7fuKiUsjmTJEn yib+QaBmtOq69GuXNFeuLwvMqnH3BuBYYNYY1uUszVECI16+xpwXTB9XXqSUXQ9x9mfl MqU/THSFtfoXYofQN5PNlb5Nn0Dng0T+u4vUASg89E7DwbZ9tDgPqyDuC6rzWH0/0+as nG3g== X-Gm-Message-State: AJcUukdL1xlsdCpiUCVl+jgPKVJMPuO9itXcym9SDWQ+0/I2goLrkW65 QNtA1XW025NfaseU/oKb65fWGAmhs2IMsQ== X-Google-Smtp-Source: ALg8bN4I6o4u0/85rTOr2AeGdHSonnheCjx0sW5i5RfEItz9Q0HW7Pb/XcsgM+8Mga5m/TMjpj/RVw== X-Received: by 2002:a1c:8acf:: with SMTP id m198mr16892239wmd.143.1547823543846; Fri, 18 Jan 2019 06:59:03 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:58:04 +0000 Message-Id: <20190118145805.6852-49-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118145805.6852-1-peter.maydell@linaro.org> References: <20190118145805.6852-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::32e Subject: [Qemu-devel] [PULL 48/49] target/arm: Implement PMSWINC 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 Signed-off-by: Aaron Lindsay Reviewed-by: Richard Henderson Message-id: 20181211151945.29137-14-aaron@os.amperecomputing.com Signed-off-by: Peter Maydell --- target/arm/helper.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 44f1340ee13..92666e52085 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1027,6 +1027,15 @@ static bool event_always_supported(CPUARMState *env) return true; } =20 +static uint64_t swinc_get_count(CPUARMState *env) +{ + /* + * SW_INCR events are written directly to the pmevcntr's by writes to + * PMSWINC, so there is no underlying count maintained by the PMU itse= lf + */ + return 0; +} + /* * Return the underlying cycle count for the PMU cycle counters. If we're = in * usermode, simply return 0. @@ -1054,6 +1063,10 @@ static uint64_t instructions_get_count(CPUARMState *= env) #endif =20 static const pm_event pm_events[] =3D { + { .number =3D 0x000, /* SW_INCR */ + .supported =3D event_always_supported, + .get_count =3D swinc_get_count, + }, #ifndef CONFIG_USER_ONLY { .number =3D 0x008, /* INST_RETIRED, Instruction architecturally exec= uted */ .supported =3D instructions_supported, @@ -1393,6 +1406,24 @@ static void pmcr_write(CPUARMState *env, const ARMCP= RegInfo *ri, pmu_op_finish(env); } =20 +static void pmswinc_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + unsigned int i; + for (i =3D 0; i < pmu_num_counters(env); i++) { + /* Increment a counter's count iff: */ + if ((value & (1 << i)) && /* counter's bit is set */ + /* counter is enabled and not filtered */ + pmu_counter_enabled(env, i) && + /* counter is SW_INCR */ + (env->cp15.c14_pmevtyper[i] & PMXEVTYPER_EVTCOUNT) =3D=3D = 0x0) { + pmevcntr_op_start(env, i); + env->cp15.c14_pmevcntr[i]++; + pmevcntr_op_finish(env, i); + } + } +} + static uint64_t pmccntr_read(CPUARMState *env, const ARMCPRegInfo *ri) { uint64_t ret; @@ -1822,9 +1853,13 @@ static const ARMCPRegInfo v7_cp_reginfo[] =3D { .fieldoffset =3D offsetof(CPUARMState, cp15.c9_pmovsr), .writefn =3D pmovsr_write, .raw_writefn =3D raw_write }, - /* Unimplemented so WI. */ { .name =3D "PMSWINC", .cp =3D 15, .crn =3D 9, .crm =3D 12, .opc1 =3D = 0, .opc2 =3D 4, - .access =3D PL0_W, .accessfn =3D pmreg_access_swinc, .type =3D ARM_C= P_NOP }, + .access =3D PL0_W, .accessfn =3D pmreg_access_swinc, .type =3D ARM_C= P_NO_RAW, + .writefn =3D pmswinc_write }, + { .name =3D "PMSWINC_EL0", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 3, .crn =3D 9, .crm =3D 12, .opc2 =3D 4, + .access =3D PL0_W, .accessfn =3D pmreg_access_swinc, .type =3D ARM_C= P_NO_RAW, + .writefn =3D pmswinc_write }, { .name =3D "PMSELR", .cp =3D 15, .crn =3D 9, .crm =3D 12, .opc1 =3D 0= , .opc2 =3D 5, .access =3D PL0_RW, .type =3D ARM_CP_ALIAS, .fieldoffset =3D offsetoflow32(CPUARMState, cp15.c9_pmselr), --=20 2.20.1