From patchwork Wed Oct 25 20:08:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilkka Koskinen X-Patchwork-Id: 158261 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp209055vqb; Wed, 25 Oct 2023 13:08:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKIXMLktYPIW2mbZDDCTnRKo02DHCk+/plCv3Ch0FbVfk+27znmDVqvDqrTnezwksZvR8x X-Received: by 2002:a05:6870:c6a1:b0:1e9:f73e:636c with SMTP id cv33-20020a056870c6a100b001e9f73e636cmr21470371oab.43.1698264533687; Wed, 25 Oct 2023 13:08:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698264533; cv=pass; d=google.com; s=arc-20160816; b=S40x+PrZ94jmdkmC2biP4S9HX4fQlzhkStG292z1JeQWtUd0SGmlupPwA2lFmvspfu IQMgPIPKPwdE3dd8xBeAiAl0uYI2GIRAOvolsVzzr+OK+V9vw471DaoU+oL7ZNoNPigM oimd3++mxMRry9+WksTkd2EF/aCqJp8CdaGv0wQJc9Kf1gDNot1jZ+J45gFx40jkRcaR +Mrp7zwUknoHSZovkd5CB7SboM5CBOgsAzL0nABnzhpIQy83yI0aYex+/WoFqkEgISCH H9zH4CPHI2YzxdnzRqZGNZzYIhuStqYIWo/FVysF0AApRDngAowcT1bMtAG16GsDSUcu /mqA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=0VF92Gu+bsHYurF5m1ieE8BleJa0LFpgfkNUhDPm3Vo=; fh=u/arpVk1M8SmY12bmqjQJNSG3/ZaaXbz0K8T88J4xPY=; b=zvUo2m5E5sGELv5XmW3b2dfh5aaqelC624LwNrkPJ6/i6Xn4hq+cE61fhmpnaYQfhR p1hRPxFuaE/vLSkQRYwM2UvIedy52Mp7IpT8cc4rGCvf9Ai6mqzVvU+4KkDJbuBNrn/3 f6LBYswzaQLqDSM2fMow1KBK0NbU1/VilHndRUBtwGU4MXVbwApJzVY3I/tqv9/bG6J2 SV7T0eCeLYVx2C9d8HCSPeRC1X2/fXJly5HkP/62AOaHlpr0g6UtybmlQ6Y/SkSC+P6i Vl3Q5pVA+yv4l2qsGDCyGnY95i4u+tVjH3M62nAZ1sZosSUjxzYdABeq0U7zDiniRAJy W9rw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=Zi49ZPuA; arc=pass (i=1 spf=pass spfdomain=os.amperecomputing.com dkim=pass dkdomain=os.amperecomputing.com dmarc=pass fromdomain=os.amperecomputing.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amperecomputing.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id r18-20020a81c312000000b005a7f5e20626si12321231ywk.176.2023.10.25.13.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 13:08:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=Zi49ZPuA; arc=pass (i=1 spf=pass spfdomain=os.amperecomputing.com dkim=pass dkdomain=os.amperecomputing.com dmarc=pass fromdomain=os.amperecomputing.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amperecomputing.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 26F778023433; Wed, 25 Oct 2023 13:08:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232105AbjJYUIp (ORCPT + 25 others); Wed, 25 Oct 2023 16:08:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbjJYUIn (ORCPT ); Wed, 25 Oct 2023 16:08:43 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2128.outbound.protection.outlook.com [40.107.223.128]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F364183 for ; Wed, 25 Oct 2023 13:08:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QHmgMaXuLBUdlzm4JXazdAKUVDVTWqnRo1v0OKltUvuWjZG/mqien1y9Pmgg6MCtmkw8lMw6bfGPt/nGlZLTyGCJ9HpxcpfBBrKxt666cDxl1J3D3Sy4nbMpUL/O/rFt2O3FMmjOPHWhxySPebpYB9prRKhUeoJxTgzY7E6cK4fglJKcc2dgyd+blTPiTSplJekntOm9TPeoDgcp/JvRu/Wz2ZHDs9mDxZqzrF3J6tNt7Zq7oxejLbIK+N+PgO8hU426kxaY3fZe/HY2VeC8jRnzKdIO3IJRZhXbnFC0gImvUphNBozu9FysCeGzkK0XHippWU8PK2nAmnuDhNHAqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0VF92Gu+bsHYurF5m1ieE8BleJa0LFpgfkNUhDPm3Vo=; b=katxf9adiJU2u76PRC62kEiZhjQJb4OBmAjHdBO6Pf0ms5v7fvanawxAkoJwnez7/XQPI+wWdFNzBtiD0DpJITMfaCjIRB/3RJwQIb+/BGvOIuBuwcPQfjPT3qKCgzMn2QlstukMa+pehkN6VzZlsvnQQL7IX7JKn+Du/oWFfcwImpiSTDNGQbw/eJGUlY6npA2achqopyI2z/XxavaUT+9cXV8zXmPWQ9cthzC6TrWuJI+R73dya3+sKyiUc8cf76nQ2527Bc1SOMTFBUdbntlKequZMNjeNm+gecyXGMCPy1fU4BbFvHuiJY0ne9VZldwgcsgRafyq7vmzNjVW5g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0VF92Gu+bsHYurF5m1ieE8BleJa0LFpgfkNUhDPm3Vo=; b=Zi49ZPuAproDQnqkm+Su77A4h9jQ+i7s7KPWPzaPTnHmEDT7d2MeQb3g2JpEikkryMy0WQvX0u6OwkhLMtt6ya48VMXeB3S5WMzrSqbKyo0u9/cHf6ptSnbgK/VJv8MDTA2b2cFWAgh+V4ro8ac02NWCENfuIIz5h1RkHo9IGlw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from MW2PR0102MB3595.prod.exchangelabs.com (2603:10b6:302:13::25) by SJ0PR01MB6189.prod.exchangelabs.com (2603:10b6:a03:29c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Wed, 25 Oct 2023 20:08:37 +0000 Received: from MW2PR0102MB3595.prod.exchangelabs.com ([fe80::bfe2:cf53:9a23:f07a]) by MW2PR0102MB3595.prod.exchangelabs.com ([fe80::bfe2:cf53:9a23:f07a%6]) with mapi id 15.20.6933.019; Wed, 25 Oct 2023 20:08:37 +0000 From: Ilkka Koskinen To: Catalin Marinas , Will Deacon , Zaid Al-Bassam , Marc Zyngier , Geert Uytterhoeven , Mark Rutland , Ilkka Koskinen Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: perf: Don't disgard upper 32 bits from PMCEID0/1 registers Date: Wed, 25 Oct 2023 13:08:15 -0700 Message-ID: <20231025200815.104017-1-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.41.0 X-ClientProxiedBy: CH2PR15CA0013.namprd15.prod.outlook.com (2603:10b6:610:51::23) To MW2PR0102MB3595.prod.exchangelabs.com (2603:10b6:302:13::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW2PR0102MB3595:EE_|SJ0PR01MB6189:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a10d392-0d18-4d3e-7d85-08dbd5962c9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vbtM/4S/FkZRVB8zHMa90CcX09MwPsfcWYAWvWL/zWpsPaLu6uJ7EBWh10Sdf/wQIUd8JUVijX2PZBD6f2rkzxaTZYlDCunP8IXuFrHSpvXv+DjIovRPkAlFMTYJAP8dxzkCNyDQ1g4MqUKU88ebvPZusUZnhqAoUg+FYME585vUfbOMVES8EDvxLu3kGxTV1c1X1yIZfSZxwyk6Zw6W6EpmfAKq89uyZD+WC+Kk3ApPKbNaY2bRyT57OxkrOgI3oZrp7c2IB6eTV2FiIE0lUGPl9HirY60FTDnm1sZxTLUKXgzl4eXDMEIg26uNyfxd+aJMGLk7mkPCEP7c5+u3x1JlEre71l6azyA0qGNoyU2cYvAZpmGFRf1plUAo8l8dj9STIkCSD3wF0GHxNTHRtwUzrqfkAonG5UXgxNZFLA+YPpzw/Vy5DVRUwJEOaX10hCXkhurQeu+ILp+0Sdh3JLTNF/QEcHjq897CyeL1xguQDHXORj9ZHOmCUudQPSKIgRbPNkib6YMG0Gr0W45g2mt1xIIiJcEC6kkYMYW203VuSWuIxqcKkclsgEH239LtR2S9v7meuaVoDr1CvaNOCIoxfA9cGC6hXd3VkELqlPmWIpKx1ITzSNJk1yNi2MV/ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW2PR0102MB3595.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(396003)(39850400004)(376002)(136003)(346002)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6486002)(38350700005)(41300700001)(66476007)(83380400001)(6666004)(6512007)(52116002)(7049001)(478600001)(6506007)(1076003)(2616005)(26005)(66556008)(66946007)(110136005)(38100700002)(2906002)(316002)(86362001)(5660300002)(8936002)(8676002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TIg5pyrq+VsN9+v1fmoTzKRDCwOfu/C4jI6l9jheTuODwMcMf7o+QJn0b+nVdiIQHZmQX10gxZO0KgkEAXcVohEiJzVm7YN81dawBxewz4fW6+5HL5Qolz8USQHXJeH4/YuRtiBRVCll6cnD3az7u/TchSmVL5mXT0e0esWRMEouRWu3kFeBY6+KqdA8K1gSMwtEeZK9e+A3xwzye9Rtp5UbWBEqVq3jNF21XXxMcmVMXfSnEkBQUY7aBpcijvLucvwCkgmhdkjHdo4xBPReDr58SXUrlWomCs6O8k9URbIyXcu0DMXNTQEpag4Hkqd1Q7PmCtyUS3ZRX5Yoq715xy7ucv0yKLMs24FTfzKlQX9dtoM2hwRJSYQKFBP46lSl4pjA6zHmwDs8diGwk71Nr3HMnSvWOLSuZNaR/sfwEFLDWUQhT4iKUVosvQtFF7Isvxz+M6f2A6V1xGtIUK0GSZ0Q1bgGbdBHY/6T6t9VaSTSFywaVheayFR5ko7kEtGtuMNiYSWXV633g27D3xPADtI8t0ZMZ25rF7bFvUuW02/tZ8tbMDCksKKMnRBiJ9j6aUfjPwNbhI7LCOHF9uwPLbismZ7tow+sqKa9Ccf5BmJTI5soOBv42dGTIYg8yjdOgWFcyu/BWjZsX3r2yq5frcTFyOJh1fybBe5escLOeXGKUZBM3p1x5wR/tinTT+yID4IQdk9lTzmvfm67tm4MwIKIY49vIxe3HSpaLwQHaYmlNjZfey65g1aiUPbvbLwlPAMpZdbdj3eKIOLJvffuuhQrCZR3BZabBEaHHaSww+VLcQw6utzb8RQg1XGd9Qm8YOGL+uwJ+jyQsee8s5ZT9Pu9rs65Npfp1RlugPVhuTZOQlYRgfxJjXW7XiAnADkC9mUIMJ0NNu4V31YKmANl1qZ6/N3h7/9Yj7/doUpmoF6+4OG18CCXBh/iltmAa2rQ24FUWzB3OoOiP7c3c2CPFiu846DCjTAdp38JaumFj5OIDw7rAMfh8/0WFm9ZFYIodKkRTSIFU3j0M++a5xGLMsU1Eho5F1bs/o+cQQOGOn03RkZVT9wl1iDZcbmitFid3gE+OWnZTDXHusWZ18FQyioH2LgsDiOLgbLsVI8O4pko5Fgn3VayzQTyP2nIJmpGZBh4A328RFexxJ8/cM8yXzoLgR59Jcp9tdH4ArjRSfQ14TjjwDUYs1c0ghIR00xHKGQLZYS3aqg/NbOe/kUHRHHn1GY/j+uclEXHtpHKTq9Ax8uzh1WLBH6Am1r0OkBBZ0UKFDULWoo37i0zuTnDRR+0Y6wZ/dk5Tns6fK7aUsDpMV3S5/XmkUv3ac456w6OtFE7IKqKoZAqHniU9U41+eo6ckcadZ5AaNl9Y34YDqCN+UVQeGdWofr0ufvmNOYbFpUOxyOMEOSKsk9ID4x7EihHv19o9pxSanL346YcG5W90SbQ+Yr0P4AVS/aWMJekOdVJiVF4Arx8wTpQkWYoo7Cd8nAxoHd9pvNg1Pavkghm93PYbJCueZkL5CdxWf/Jzh9baYDjsmRwavUZZFvZCcgCOtNI+GEtqKF/Qwrc1wFqr5JoutdlUhzLthUMcWCWJsTwLutd9fm3N49LBak7+yUYu+YgCLplIt1B9wmodMg= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a10d392-0d18-4d3e-7d85-08dbd5962c9b X-MS-Exchange-CrossTenant-AuthSource: MW2PR0102MB3595.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 20:08:37.6019 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UojYTR2LZOGd0F6mTGepaIimAY2DPRGw9nOfvhOOePuyybWODLhrfJFx8WLzkzn1qPAl6GevXVejLRTWZWCN94VSeskSmiY5ABhBgWlMRCBN1tvRPIJruJ5Fr1N4apQO X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR01MB6189 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 25 Oct 2023 13:08:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780759431875512897 X-GMAIL-MSGID: 1780759431875512897 The upper 32 bits of PMCEID[n] registers are used to describe whether architectural and microarchitectural events in range 0x4000-0x401f exist. Due to disgarding the bits, the driver made the events invisible, even if they existed. Fixes: df29ddf4f04b ("arm64: perf: Abstract system register accesses away") Reported-by: Carl Worth Signed-off-by: Ilkka Koskinen --- arch/arm64/include/asm/arm_pmuv3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/arm_pmuv3.h b/arch/arm64/include/asm/arm_pmuv3.h index 18dc2fb3d7b7..3e92b7cb57a4 100644 --- a/arch/arm64/include/asm/arm_pmuv3.h +++ b/arch/arm64/include/asm/arm_pmuv3.h @@ -126,12 +126,12 @@ static inline void write_pmuserenr(u32 val) write_sysreg(val, pmuserenr_el0); } -static inline u32 read_pmceid0(void) +static inline u64 read_pmceid0(void) { return read_sysreg(pmceid0_el0); } -static inline u32 read_pmceid1(void) +static inline u64 read_pmceid1(void) { return read_sysreg(pmceid1_el0); }