From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 348DEC5479D for ; Mon, 9 Jan 2023 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ei798DajTaZv2GyZWT8z7jsn2qnWFL5++L8x2vZR+a4=; b=t7MCbsoJMAYBDf FR/eNMM5333uMq+/OPPUZU5yJzfKotM/9LSTGJvfFYHYBaK+zHbKS8ia8FMltg5+q7jdMIo4RYlzR dQ7+GQs33DkGyfw7LU3llSLKyvr5rq6MKre8z6oej/ror9PlpX3K9KPjrUzHDyNjSiJs9yyGvnlY0 nPUSARDoe697H/LXA9PJCiCEQ4CR3oojsKTBF4wig8MRHOIrPzTeabuAXlXSr4C9hIDMaMtwQIMCZ 8+UcKmxYCdzSwyruOo23bKf/E0022KBle6tj8KNGvSHbn8mvNTj56SwrSRGcq9AZR1JlMwzPSExqp j/JXXtMwlgCPoJ7gbVPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pEyWf-003pEH-I3; Mon, 09 Jan 2023 20:13:45 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pEyWb-003pD5-MX for linux-arm-kernel@bombadil.infradead.org; Mon, 09 Jan 2023 20:13:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=jYXNYZPoEZW+cpasaK2qS1x4BldwPdfg2ohHEnkw8tk=; b=d0BCmDRAgcKVO4MV7dl2BIH4On WqcnHynLpe4QpdsAIUGHeN9mgNpK9520jHnbzKY3gg8ZoLaLat+x+CgYxoxNDADb7yRTITQtKn4ja /Z8zXr6U/oRI86DUHp9rMl5TAIGbRyuFmB8GGDkvY0sXTQZ/VTR5XnDELUYPDic1FTXaQoNCnN6HB kl6p1EnO0tci9U9CGeyhGuFjczUWGFwPV1op4SA2dqQZqn6sO8UGg4klx64n5KkTEQgvyRnZJ72VK dtEGHMUq0awLX24MSvqyZiF7RdwXGq8Yyy8OD49imubRuDUg6c9vJ6kxdijL0sfCVHO9sM55B6u6A UyKdyFQQ==; Received: from mail-oi1-f174.google.com ([209.85.167.174]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pExnH-002r83-3D for linux-arm-kernel@lists.infradead.org; Mon, 09 Jan 2023 19:26:55 +0000 Received: by mail-oi1-f174.google.com with SMTP id e205so8030682oif.11 for ; Mon, 09 Jan 2023 11:26:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jYXNYZPoEZW+cpasaK2qS1x4BldwPdfg2ohHEnkw8tk=; b=6KrWZXjG09dsHATjAqmBPMcgcC0pvt23au6dZf3RzME1rH79pcQ0xiW14jpnqivA83 KHUj4cxD6t4R002Xv6rQwvKNFoc90DohigJ8m9lj30QI+huwpLWtU2Em/WGJJ5JWBJoz 6JOCk2wMAFGoKAua/Jjk6s/gJJHwKWpWxrUQfVSl0GWW+FsgwL3TYzxDfKPy8JF+Q20e 7W1R1vRBhAcvns2i6heC03C7ISHsj1MdJKTuVNWw5WaUMPTsptwXmZAWUsJC005Hi/7h uOdp1vekpC2d//AjyXqUxUkDZwKn6cBM6sDkMb9ZjSRKypfDDDeFTjq0CZKFNi+GQGqV Md/Q== X-Gm-Message-State: AFqh2krvn9mQLcbwbyiwzhi2FEj96u96QITWnI58U6nivJUzIsjBVJRE O4x3r8AuVbj2QgDbJFXz/Q== X-Google-Smtp-Source: AMrXdXuWN6s2Ip6alGnEK9Y77CLyDy7KYWq7dZYuDLZi9RmEcarrAkz9gBXHZpKxv9AwTjYuASRn7g== X-Received: by 2002:a05:6808:190e:b0:35c:b79:8cf8 with SMTP id bf14-20020a056808190e00b0035c0b798cf8mr38989203oib.6.1673292405102; Mon, 09 Jan 2023 11:26:45 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id bg31-20020a056808179f00b00363b5a6bc9esm4343635oib.12.2023.01.09.11.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:26:44 -0800 (PST) Received: (nullmailer pid 1483616 invoked by uid 1000); Mon, 09 Jan 2023 19:26:31 -0000 From: Rob Herring Date: Mon, 09 Jan 2023 13:26:22 -0600 Subject: [PATCH v4 6/8] perf: arm_spe: Support new SPEv1.2/v8.7 'not taken' event MIME-Version: 1.0 Message-Id: <20220825-arm-spe-v8-7-v4-6-327f860daf28@kernel.org> References: <20220825-arm-spe-v8-7-v4-0-327f860daf28@kernel.org> In-Reply-To: <20220825-arm-spe-v8-7-v4-0-327f860daf28@kernel.org> To: Peter Zijlstra , Will Deacon , Mark Rutland , Catalin Marinas , Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Oliver Upton , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim Cc: Mark Brown , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-perf-users@vger.kernel.org, James Clark X-Mailer: b4 0.12-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230109_192652_095402_881DE114 X-CRM114-Status: GOOD ( 15.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Arm SPEv1.2 (Armv8.7/v9.2) adds a new event, 'not taken', in bit 6 of the PMSEVFR_EL1 register. Update arm_spe_pmsevfr_res0() to support the additional event. Tested-by: James Clark Signed-off-by: Rob Herring --- v4: - Rebase on v6.2-rc1 v3: - No change v2: - Update for v6.1 sysreg generated header changes --- arch/arm64/include/asm/sysreg.h | 2 ++ drivers/perf/arm_spe_pmu.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index db269eda7c1c..fc8787727792 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -221,6 +221,8 @@ BIT_ULL(6) | BIT_ULL(4) | BIT_ULL(2) | BIT_ULL(0)) #define PMSEVFR_EL1_RES0_V1P1 \ (PMSEVFR_EL1_RES0_IMP & ~(BIT_ULL(18) | BIT_ULL(17) | BIT_ULL(11))) +#define PMSEVFR_EL1_RES0_V1P2 \ + (PMSEVFR_EL1_RES0_V1P1 & ~BIT_ULL(6)) /* Buffer error reporting */ #define PMBSR_EL1_FAULT_FSC_SHIFT PMBSR_EL1_MSS_SHIFT diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c index af6d3867c3e7..82f67e941bc4 100644 --- a/drivers/perf/arm_spe_pmu.c +++ b/drivers/perf/arm_spe_pmu.c @@ -677,9 +677,11 @@ static u64 arm_spe_pmsevfr_res0(u16 pmsver) case ID_AA64DFR0_EL1_PMSVer_IMP: return PMSEVFR_EL1_RES0_IMP; case ID_AA64DFR0_EL1_PMSVer_V1P1: + return PMSEVFR_EL1_RES0_V1P1; + case ID_AA64DFR0_EL1_PMSVer_V1P2: /* Return the highest version we support in default */ default: - return PMSEVFR_EL1_RES0_V1P1; + return PMSEVFR_EL1_RES0_V1P2; } } -- 2.39.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel