From patchwork Fri Jul 14 01:01:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilkka Koskinen X-Patchwork-Id: 120157 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2192538vqm; Thu, 13 Jul 2023 18:07:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlFfpka74fzkpFtOrGPEzm/QGalbOY9z51TQ0X0QiW01ANaDI/WaZxcElZcVQbAv/yXDtYgz X-Received: by 2002:a17:90b:3b82:b0:262:d1b5:3390 with SMTP id pc2-20020a17090b3b8200b00262d1b53390mr2662247pjb.3.1689296829755; Thu, 13 Jul 2023 18:07:09 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689296829; cv=pass; d=google.com; s=arc-20160816; b=Ef0AYuI8nLEW1jBO5dK2ZwYSPy/QAozqo7VdgSDpQz6tuw9P8xZLhkaaxrvx4wDJRo jRJA3jOzvOSIhb4E2kCC8GPsLZT65xCXgqv920sta7c/klxADUg9qmqj/Ij7Izg+tgJ/ mHQ/mYu0DyuyX3kB3h6L401vAIjPLBz2DI9+DWtjnC7de9fLgyFu1RJokJdzavITQTP8 n4qrdJ/Cn0un2DMdox5ykpNmc0mT89iay/0yhoR57gxBgDMUESbeYT3nIJ/ezlwTYjNR 48LXwhOiy/0oh6czZzkfX5NFDQp1jax5Y5Cwz/lauPkQe3wsHPlki8zQct2cR+XqsBDS xUSg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UyYUQQp9yBc4hP0w+WM6rga4/CQa0V5X5PZ+PPakvrs=; fh=26GyE49KjSE4+CIbBX0WsKdZgEMElM+fJ8Bjkxk50VU=; b=t6dWy6kI6y0xlgVxW331EVZEj2y8CGihNz0Nd8JDfU3lbMmb5sQPMb9OZyVeD5thB8 3b7hT1vfQJG3nrU2pCzh2GTg/7jGJhJh59EeJSh1FPvdf4I9PV725pcVieyb9q9R8DiK 21/0vAheg9L/+aXSgzZQX90hQCgu6GxFYHDaVPWfFq/uINJ9bKAcw4Ve89TVH1MEbviw lCh7l5T+h2G0aLxuz080OavZG4rKtPYgag2CJujSwxTUTVzfdblfPBezcEmmWB3Mb0GN IOtVEbsTO2Yf5QNVRdodFs+xoU8CD1EqhGoOzuNMo45qPTGVUd5HCEBGrMfhmsFB3sjX Ai3g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b="g/d+4zTX"; 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::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a22-20020a17090ad81600b0025c16614fa6si266235pjv.145.2023.07.13.18.06.56; Thu, 13 Jul 2023 18:07:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b="g/d+4zTX"; 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::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amperecomputing.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234607AbjGNBCi (ORCPT + 99 others); Thu, 13 Jul 2023 21:02:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234609AbjGNBCg (ORCPT ); Thu, 13 Jul 2023 21:02:36 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E1902D73; Thu, 13 Jul 2023 18:02:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KgN0HferY5jf21gGY+3Cq4XL0myk3K4p82RORmPmwHRMz9nosUSTbRigq5xMFsuvs50fKmRY3WjLJO3vNYvJLH4LLpMezX99dQVa0mqB2rbOlb1luRl/Ai6M2tTduW2D0jiCIfP9MXomaRw0UTjdxywF5YvF+VhLVdipH94Ha9eT0zVLGZZQLSSO5JaGDv2ujMNGQaS4ZmqFo75uMwBQJtVB4ZMUdWsRkLLXhTVFj0mgiHvQDfNz5iCmzTiJSf8F6COTC7/KDyXwQPm+0pTNEZdxwmN7oYMw0OiKln5jUEWtwlcj+eOQX2C865II/lRGaTaHFYbH0gSv9CXfpA7/Rg== 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=UyYUQQp9yBc4hP0w+WM6rga4/CQa0V5X5PZ+PPakvrs=; b=OgDDkzNGpUTtLBijQWfFIB7xQX9oX1Tj58YUMKHeDHTB+A+QI9MTiD+wDv1LlWvpB7llpms66iPInjVtEksJd2FLUuj6tqNi2CsrPeksNsY2Es357TJEukpMmPpPOFEJIjpXBQi+KOpzT7FHrWg7Z6q4NDiFebG3NY2gDxpY2G8kMcpS4cHluhPLOCtwRA1W9njm+MpCA8EeW/qoRhalmwiJ/tc5XOtskXeKrzn79o6qacPi6d0p73I1tDVkma7KTd6PPG969pqsK5N2FOEfkEiPGV8kuk0sG63vCIj6GeJSbIXkqVi3gpdSYyimfKqeraoy6HI16VyKVbwFyKYOlw== 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=UyYUQQp9yBc4hP0w+WM6rga4/CQa0V5X5PZ+PPakvrs=; b=g/d+4zTXQh4OoDbHKvnOS6uGKb2OF5TnOHGU4D+bjVkryi1uplC/q+DFOgqMv4c7R84isfs67MiSq6BMAa4sq/NINGvJts/z3F3elZSdIm1N4tVSrpu/ylu7CLupAZD81lyGvMChiZkY8rUg9ANHNcmOVVM0cWzI9uuUSAbof4M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) by BY3PR01MB6611.prod.exchangelabs.com (2603:10b6:a03:36a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.27; Fri, 14 Jul 2023 01:02:25 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::235a:622:9239:3963]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::235a:622:9239:3963%7]) with mapi id 15.20.6588.017; Fri, 14 Jul 2023 01:02:25 +0000 From: Ilkka Koskinen To: Will Deacon , Robin Murphy , Besar Wicaksono , Jonathan Cameron , Suzuki K Poulose , Mark Rutland , Jonathan Corbet Cc: Ilkka Koskinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v5 1/4] perf: arm_cspmu: Split 64-bit write to 32-bit writes Date: Thu, 13 Jul 2023 18:01:38 -0700 Message-Id: <20230714010141.824226-2-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230714010141.824226-1-ilkka@os.amperecomputing.com> References: <20230714010141.824226-1-ilkka@os.amperecomputing.com> X-ClientProxiedBy: CH0P223CA0013.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:116::30) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|BY3PR01MB6611:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e29187d-a754-43b8-178c-08db8405fc93 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kd5LZAYiQ6Lgo7MVla34/8WlwTAEnrsf/WbGyOaXmwUkhnq2iXVb4lMn5v2GTgOE+5799l5sCoWZNXl9DIDgzxGD4adq3nt7po66+2U+h1am6rO9l0uYFysVBywf1lUWCH8LHUoWEUdny8XWdJSdGXWRd0i7r1H5fsA4txHn/b7XGpwEkG66Rw/U4pcAAt2yNAFGSoaU+59kuUwh+t8pYzWb/vhaVtTq/UUYg5hPQ/kgcOO87lwSiNV3yJXnTJVvf6IcmCRV8tbEMifkg/jW7dggak4FQpnre60MfVZcKZOQkGBvRuEAF+HBmuFgNgpirWJXJo8tDRTwfQLaD8t9yVhOPu5iGY7SrXk2/q/jUQSOgyO3dxziJQnv1z/xbaro+7QIW5Wvi3/yzokrRYG4e8SRxziyR4Cz12z7uVwfbmkBVr1BQTdyPfxx8zxNA/jnQJb5Vxbz4pkirlzJy8CMXftoiH92YC6z+C6rh1karT+aPZCrEvYJUvOnxEJjpYhlNcaCwuyEeUN0bkCvbEktltCIHpBzofA2iUt4Zgb7rNY/cGDW9ydJaYrMaUJPNR6c+xW8VV0oaJTFGnxTdaXXDoOFqUvurDhk7bqhglthNsKmHcHFl05jZnNxv1DRM3sY X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR0102MB3590.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(366004)(346002)(136003)(39850400004)(376002)(451199021)(2906002)(38100700002)(38350700002)(6512007)(83380400001)(186003)(2616005)(26005)(1076003)(86362001)(6506007)(5660300002)(8676002)(8936002)(4744005)(7416002)(110136005)(478600001)(6486002)(52116002)(6666004)(41300700001)(66946007)(66556008)(66476007)(316002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BGzk/j4u/X1AVOBZPe682S2I8XmnbqEWAGbkcIEkENyMU9qx81XvM2i1q8NQb5MIuVl3iXG0stII0B+U+KRfrkvb8ZVo6i17NWesZdbJN8YGGYPxhZT+jnJi0jOZYP8+2pb6Z6hY4477jVIQ43M7oEk2Uy7e369BHb1A4mRtT3yfFuJKUOkygikAKg3DkmQtfZB8oyLWZpPFQg5mp912cFe4xbNp/Y6JiiWGegoU8vR6wTTL5G1FABWPnQDWKJiSkHqt+71Xd5XW18+gZzS8M4LBiQ+99/ou9jOvVDA+lEb+68U0Xgvr56uGnbMt5gYzFhpo+69tWaS6A8+nyZVVGgvqoY2QxQx4W6/8/8S8vlvWYBXYUu5kYVApaj1MBf9a/hh65Q2qLBRUtjrKNbIw9Q0WC967q9EvkP7PywifZkTrZywgkxcBroRdrUja+NYNtUvMEfACO5kiaxC+pVmOwJAAcJzpLQn9x1SKk6MHvXToWEtyhM+J/QpYhVwxyCb4S3S6jpkofoG1gHtgfjSiNaiU5Uz6MhD3gJsKLqL5mVbPtlSgFulu24uLElgyBbRG9x7dk4f9Nq8bWc4yX598qdJpskfa4Il3KUxW4WTRN/R3ZQ8prWfUtbExGDAZ2oOF4kWXFY3nlLyKG+bgryOI0zNht2+mJDz0bvV90qZsg+Mc9mJMLqaSWSJ0n5OUmg/Jgaqz470z3TRirU3q0bcrPmTO3/Uuzlg2z/e5I5vU+bL60b/3X9Uir/ZTUZtOhPIPCqgLiVTqphebKRlo4pC2vl0YnjHHgN+81C3mRuPSX3/cAhctnK8zSKkxItq2IkpJv2c18dqCkLqkwiMGaFtGd3s3nkVeCe1s1mM2b6GyGX1pUtfGuzH8ujq/ifeZfR0OL+V4PxB6tMN4EM6o2wJ+ZitM56ZPOdlJOzTB3C0zbTBVUREo/r0ohiSXqZIDwu9+cPOK/ZsfA15pbkmp8VW9BIyvEn4s/KdRq7Dsk9vTKifkzXM+pXIbkUXJBRiaaBvjZIrWl0eUNsPzFhYuxh5unTTM40lLs7l9p2z++SndsuWkrwEE3agyeKIBmbdUgG1FE5ALLBe9SbF+Ps1/VMVMaSdAM86wMPKTFJbVInAKppCqWvc5f8PTZg7R3wCjIuA88tAC8Bf8dnqUq4YwRjqnA2LbAtaYUUH3HrBkBUJ/CepHKaV20c9Hni66bhq5EeNspgE2dbfXrPtZ4cuEcZN1wsHEBHGgJevo/fL1MWpsM9L3kgjX5y4xXHO0wsXRcgX9NBE23SAO0DWbXBVNsVxgsiH8DZ1BIp8GucSxDB8d+6QN5KC6XU5h2McNfFN0DL5ff+KhdaXvRtdY55qeMg8imFLLBEINadnB+uX6mHCZB9i1RmvJFScgjYuVYX0z+fD0QFI+BDL4l8KvvxGtmtwSNU/kw80hcGW2k6sXA9qn2dEcCMFQmZUWSY7IDZ8oMYkhnjRgbEILbKWr9fUtZOJaK1S4Mk29EBnIqtlZI0F7vLOn5CCQjsrol+ZsY+AbukLpP2lJvlY0XK9VgcUvpqJ5C9FKUixQrurHwtEKoEcJTd6VdluwGZjNBa9ORrOQtQjPdrjVTIij/jvFYkSZENAPa9q6TC2mTzM0wHleLNxhG04= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e29187d-a754-43b8-178c-08db8405fc93 X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2023 01:02:25.1959 (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: m+wi/Wgs2LAVthooEQ1PuD0IBFpKqx6zJsutQXPFymyxLjccluSphvHHrvnTIfeF7CB6DVia/1xeFCh8YGzFxMX+XvEFeyYs2lfLhAgEzv01ILAaJRY4NC2VKY5H3aoB X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR01MB6611 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771356112645864472 X-GMAIL-MSGID: 1771356112645864472 Split the 64-bit register accesses if 64-bit access is not supported by the PMU. Signed-off-by: Ilkka Koskinen Reviewed-by: Besar Wicaksono --- drivers/perf/arm_cspmu/arm_cspmu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c index e2b7827c4563..0f517152cb4e 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.c +++ b/drivers/perf/arm_cspmu/arm_cspmu.c @@ -696,7 +696,10 @@ static void arm_cspmu_write_counter(struct perf_event *event, u64 val) if (use_64b_counter_reg(cspmu)) { offset = counter_offset(sizeof(u64), event->hw.idx); - writeq(val, cspmu->base1 + offset); + if (cspmu->has_atomic_dword) + writeq(val, cspmu->base1 + offset); + else + lo_hi_writeq(val, cspmu->base1 + offset); } else { offset = counter_offset(sizeof(u32), event->hw.idx); From patchwork Fri Jul 14 01:01:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilkka Koskinen X-Patchwork-Id: 120158 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2192908vqm; Thu, 13 Jul 2023 18:08:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlHcjpgXWiLTQ+5nt77/ZFDWF3lHRHV2s3vHRxT9l2CQSGJSToR0O2PDuoINYjJtRILsBIA3 X-Received: by 2002:a17:902:ea94:b0:1b8:5bcc:2ffc with SMTP id x20-20020a170902ea9400b001b85bcc2ffcmr2464893plb.45.1689296881233; Thu, 13 Jul 2023 18:08:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689296881; cv=pass; d=google.com; s=arc-20160816; b=t32MvFNmXmuUZaiGARWbX8AFR2LGO6fhQU73HGsxeWLrqH0mqBGVW1Zy4yJT91YUz0 eyJ20t8wy3y+T4c+FuLYZba+awa+g6Dz30/utKFqVmenbDz0cADxmAo6GjBA86njTrZk To0W1cESZY2JYfi+mC80E3TxujOqcbbXlPSK5M2YqhXwtFBDyR7eKaOAI7wO01S8w4bk KZtMHF9zfUMR1q8mg7yidyTazmkqitfOBxJITzedYr75ZDiEELs87wfnvQoxDofkFBVI rFQGCA788o8IbnuUTm7icN7dYluW20iE+aiO+vDtjWc3Y4hOqWc+SrCvO1pqqvd+4aB9 26pg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Qoqy0gmISfnAljfEMv75zDnA84+ti8B1BA7M8aLiHP0=; fh=26GyE49KjSE4+CIbBX0WsKdZgEMElM+fJ8Bjkxk50VU=; b=mmK400lPQM26HY3nNWeSI73JLBjEWMMG3PtszKYuitlHch6lC9gTD7vZrMpJ+8JNj+ l+xhQL3N3WYpZw94xrTB/pcrCnWzMIECI79r79OmJYVc72hHF+HdtR0XUrIWPQLGDiiT SnjRzgfWSV4Sde15HYZ0Z5Hn2sNpvyCqG3bizStfYBk/teiBJJxz0Y3t7QI9yKDKOJ0z hThlAxmr+uz2eU41OOPXEfUY079HXESK+vzV91mvXReUye/rpxHCCX/QWjIuy4ucihUV Hm9EpncDwNzsNlMq1chvOcAXVDAI2ZvFJ5bmMezi6yxuTduoPjEa4/vD8yzOsrfuJgCu 957Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=HNuVm+K1; 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::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z2-20020a1709027e8200b001b892a54da5si1031966pla.37.2023.07.13.18.07.47; Thu, 13 Jul 2023 18:08:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=HNuVm+K1; 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::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amperecomputing.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234609AbjGNBCo (ORCPT + 99 others); Thu, 13 Jul 2023 21:02:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234623AbjGNBCm (ORCPT ); Thu, 13 Jul 2023 21:02:42 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 232F72D6B; Thu, 13 Jul 2023 18:02:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fHeU2yNLQDMVsU6RgKmeoOMkijXIkLhVg2rCgH75qH+xg1d/Vol6fL7kqn+eCyBS+ua4HWDJpy4z3QOpHonWSD4aXFs+iyl7b++phSWfuKX8Ubb4Wt4ofW8SGB2duHXpqkdFcAVGSgYVFSfgXx/cculF1oOlQbWGQecj9pO3KTskkjA7TDBhUuxxG+ecVLAUM+yBfgwQ7Gk/TE0bW3i+V5yOP3T0mPgMutKlxNPXZlBBr+neXkDV9DDf7Sfgt6Czsf9FNlPtPimoQaV7tl3sOgh3s0BoqtjkCeQlhNsWgmdRyEwbxhvwn/OXfd/VdZ6gFBUdFAm/moSNT4DlbvhjHg== 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=Qoqy0gmISfnAljfEMv75zDnA84+ti8B1BA7M8aLiHP0=; b=JTeonWsYPwZ9gGlm9+kfV9XeU16G829FanVORThq+RLCKfhCzkF78dY3dd3RMSQO3VOKXetwtjE3U/PFz3naboIKxnKAvjJ39U0etW3oHhJsjuDs7MZjSB8KwyXhsE3mBWilNzegif+t37h9WvzG5eCf8f+gxw9jI1j2PunoribPzmQ6Dxdl7ZQrUKOw4bXfNKwUz7UZ0HuBQnJBrMPUfV+2rVePs92WkUUFn0XpscrcimV5MDkbGHcARaGLY5WQ4nc+89ajsFJ5JvKMlIvzb6P5pMuz4RdfJPAOwbIk6Z/QKGWLfKD6HWtPVf2sJeCSOPYBC6UvE9VlPl//1wOM9w== 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=Qoqy0gmISfnAljfEMv75zDnA84+ti8B1BA7M8aLiHP0=; b=HNuVm+K1RvW/QGsC3Jhp9OV+/GKIAcWTorNfpvWH5+18F+YlRDKlcpTTby+ck3u6QrMgQ81fItd05mBSxK26TlydASVmmmpI5lvTf9Cnh3H+iikztYU3VzEBLQQ1Onufp68NDna+GJiwA0dgnpCdDEmkyVbp5bjR+aRTBl+YIbg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) by BY3PR01MB6611.prod.exchangelabs.com (2603:10b6:a03:36a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.27; Fri, 14 Jul 2023 01:02:29 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::235a:622:9239:3963]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::235a:622:9239:3963%7]) with mapi id 15.20.6588.017; Fri, 14 Jul 2023 01:02:28 +0000 From: Ilkka Koskinen To: Will Deacon , Robin Murphy , Besar Wicaksono , Jonathan Cameron , Suzuki K Poulose , Mark Rutland , Jonathan Corbet Cc: Ilkka Koskinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v5 2/4] perf: arm_cspmu: Support implementation specific filters Date: Thu, 13 Jul 2023 18:01:39 -0700 Message-Id: <20230714010141.824226-3-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230714010141.824226-1-ilkka@os.amperecomputing.com> References: <20230714010141.824226-1-ilkka@os.amperecomputing.com> X-ClientProxiedBy: CH0P223CA0013.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:116::30) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|BY3PR01MB6611:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d4e5565-fa4b-4140-e6ec-08db8405fe6f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: blLD09utF7Y4Q84tvg5mA0Pa+ug8T5C1vuxOzC2305qBuxWOUg+J88j/GOuBBUmuSu2xKlGAIR3i1FhAzjIZFotdb3cbS+FPBAZ461bsfCZEnGl6a/jD7YU3GqtmazUB/BTohQxGDZO71ztNSu91A0C2H5nrbBrtADVaAFq/kzOamYbsNh6oKqL+5bftM0gT9eRntxKN7hjPK0ys+Hs/GX3f66JniIjppTJWzE+BbcY8jha3PpZMG3fIaJn9mTpt6lIOwx9akhME+/q9OIHALo+FEwPCkEX86l+5LKSX+JNGwdbYU5j6DpkW9TjVQUcOmEHuc9bxbbCDFug+sm+dAREq4LpJTX3889L6ZieFDb8V9Y7iVRtCK1naH2kb4DK4+6lxO/yWIlfoCmqDCijkMao6Rz/ZZ98lyGGBJ/VbHxD7aHNd+4vePRNTO9xoUQbHZsFHVamozeDESC6/n65SzBGdtJKpO8fU+j6aPaQjTr0fGRVTdDcgtt/jWna2t/gMFHSrdgb2wX9HMRst+WD0Zc3leFUBC2b+teaSrHuMyfNvgP8H88O6LB5l579V1dz9nLdbhGAhM2y5afKYb/dxnnvQo5sadBYxVeCW5hShg3Q= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR0102MB3590.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(366004)(346002)(136003)(39850400004)(376002)(451199021)(2906002)(38100700002)(966005)(38350700002)(6512007)(83380400001)(186003)(2616005)(26005)(1076003)(86362001)(6506007)(5660300002)(8676002)(8936002)(7416002)(110136005)(478600001)(6486002)(52116002)(6666004)(41300700001)(66946007)(66556008)(66476007)(316002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aAiIPmHOdsrvaWZkkgRuoExrV2NXHE+sTjPLOgEHhJGEDrDr1+BpSDZCFnXeBps+FIHL0Ol5CYYLeVYIB/R6xLWpYSept0hxLfhqzXgEs+xD26ckok6XEJwf5F8KFCJWNnGCuGu3ZGGNfREtw/LYHGRY+PZsJPu8Lcll8rPD5DYFJJnVBsqZZejaHGJjCuBXnzTluV/jbP4GBFRPztjOOCxiMt2hIkxDosFNVm3pVSfGrTsSPioqyh5wb8JJ9T6m+KkoGg26eBvAZfUrGTD1MimJyMdyQCITVInUxKedAgBFyMogl41leql9tM2NroRZnBMhpErvncvMxb92xa54w2YNc54YlYwxxlCYV47dJOv0E9rGeyBHyZ0xlXlJoAORShUIGkOATxVaf4Wtjpp9/y+cA9Y+u4o6xW8KHI9sKxrWy8UF8Cr1irojdyIY5gCvP1mGeOukVFvz3/DNFpxxZC6WB+2AR1QcRMC82/9ZXYblVFlMhFNzx63lQkOgptwMlyaYRA8pLQu/+hZeFNPW3vst9crMv1Y49NftLJkxa62G2z8xOId9lQ92ZG6Ag8djENzJa2SIf4WQZsQU6nr2w9JR/qGsNG3ld4rRbrLGvw9lMujTA9OLLdzJ1uCyXFPnYXiKiP+YE2eWxyeWGZ24utKJeHn2mafMBbJPTzSbjw4XFfBaLA6pu2tLz3+pwElDCAkXTImz5aBe2kbwh4ToZVS66k+6ZlIwPlMxsdz93b90FZUvqvLX6xiMAcX4+CUW71v4lZsbHb7UhcGh7uxVddTOCsZgPGgFC0V0Sk3XnJ27RTxkABtfURP5f5BRnK/eBjuwrDKH9c5GqHd35fTshCV5ieAqTkZMjIVoEm+laT2JyPAarigvJAcpWF8JwJsWCFsp60Xqahxx7EiLpwIeVdq2ad6QS9feRLWQHFFtq3DWbLxcd3VXt//aXInvwEaFL+uNicBpPRJemZUDTde+G6FloMJ5wcKmn4OvxL5rR9GfNWE1OmfraQoGDbLNZ8dvO5ru0Z7hZWpSY/FuuUjvMJv+qmbPySelisa2kCV/Yx4bp6ooz2HB8T64NoTG8OKJ5PxAdObOs4fN8j70F5JBTAnBSH/+Z0PxKQC/7QA1aQ5N46zlDHOgVpNKQSnvfDy4Ex3jDKPLixInwNEsvVudpHllDuPZnCmS1DCQGoDcu196PqMZVeOIwgs1FW0HAK+9phB791T1k3lF/+inz0Y++7Gf7QjecRbgVHbKS0U4nUMh2JPgWCAGZ/ZxEykpC8cxqqbKhcYWLycaznSWS4H2DbiFOYaFlOqivm8sow1IlWikOWUovJGOlECzidhIeGtWmpP21AIuMFktN8K955sMnWtkJpeFIFVXD5sArCtoH+lJ80joqBsryoDwiB1cnOzPXp+RcO5gLbcTMBswvIj1x7Lgl2upHDdUO3sespab4OaUgmWvT/GI0JcSJOAdoqwCeYBDbC8grS4TL4S441jxC5z+gqY0fEpXx3H8LbN5nuqJNnJmSvAf4vmB5AaIvGmxxPPL/7VP8LaA0RVL8S+AI83vorW9sqDu38aQc7pHcTkbiLYcsOPHaBYwI38wTxIMl0zDaG6LSjVCb8ZIiOFtOA== X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d4e5565-fa4b-4140-e6ec-08db8405fe6f X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2023 01:02:28.3131 (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: 0r5Na3f7pflSwPBg19EXTN0hoi8jCjxaIe/1ZLQis4y4IMMll4xudE6oxnPiC2tQfGar8xIAE6aJjAFOYn0UQe7MAhUFq0Z2/OX5wsyRyZ96di49QOct+uGLCq0i9qq5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR01MB6611 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771356166450944167 X-GMAIL-MSGID: 1771356166450944167 ARM Coresight PMU architecture specification [1] defines PMEVTYPER and PMEVFILT* registers as optional in Chapter 2.1. Moreover, implementers may choose to use PMIMPDEF* registers (offset: 0xD80-> 0xDFF) to filter the events. Add support for those by adding implementation specific filter callback function. [1] https://developer.arm.com/documentation/ihi0091/latest Signed-off-by: Ilkka Koskinen Reviewed-by: Besar Wicaksono --- drivers/perf/arm_cspmu/arm_cspmu.c | 8 ++++++-- drivers/perf/arm_cspmu/arm_cspmu.h | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c index 0f517152cb4e..fafd734c3218 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.c +++ b/drivers/perf/arm_cspmu/arm_cspmu.c @@ -117,6 +117,9 @@ static unsigned long arm_cspmu_cpuhp_state; +static void arm_cspmu_set_ev_filter(struct arm_cspmu *cspmu, + struct hw_perf_event *hwc, u32 filter); + static struct acpi_apmt_node *arm_cspmu_apmt_node(struct device *dev) { return *(struct acpi_apmt_node **)dev_get_platdata(dev); @@ -426,6 +429,7 @@ static int arm_cspmu_init_impl_ops(struct arm_cspmu *cspmu) CHECK_DEFAULT_IMPL_OPS(impl_ops, event_type); CHECK_DEFAULT_IMPL_OPS(impl_ops, event_filter); CHECK_DEFAULT_IMPL_OPS(impl_ops, event_attr_is_visible); + CHECK_DEFAULT_IMPL_OPS(impl_ops, set_ev_filter); return 0; } @@ -792,7 +796,7 @@ static inline void arm_cspmu_set_event(struct arm_cspmu *cspmu, writel(hwc->config, cspmu->base0 + offset); } -static inline void arm_cspmu_set_ev_filter(struct arm_cspmu *cspmu, +static void arm_cspmu_set_ev_filter(struct arm_cspmu *cspmu, struct hw_perf_event *hwc, u32 filter) { @@ -826,7 +830,7 @@ static void arm_cspmu_start(struct perf_event *event, int pmu_flags) arm_cspmu_set_cc_filter(cspmu, filter); } else { arm_cspmu_set_event(cspmu, hwc); - arm_cspmu_set_ev_filter(cspmu, hwc, filter); + cspmu->impl.ops.set_ev_filter(cspmu, hwc, filter); } hwc->state = 0; diff --git a/drivers/perf/arm_cspmu/arm_cspmu.h b/drivers/perf/arm_cspmu/arm_cspmu.h index 83df53d1c132..d6d88c246a23 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.h +++ b/drivers/perf/arm_cspmu/arm_cspmu.h @@ -101,6 +101,9 @@ struct arm_cspmu_impl_ops { u32 (*event_type)(const struct perf_event *event); /* Decode filter value from configs */ u32 (*event_filter)(const struct perf_event *event); + /* Set event filter */ + void (*set_ev_filter)(struct arm_cspmu *cspmu, + struct hw_perf_event *hwc, u32 filter); /* Hide/show unsupported events */ umode_t (*event_attr_is_visible)(struct kobject *kobj, struct attribute *attr, int unused); From patchwork Fri Jul 14 01:01:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilkka Koskinen X-Patchwork-Id: 120159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2193122vqm; Thu, 13 Jul 2023 18:08:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlEdonp4O0WdzzW8DeOYxUM8LMRcQHpIY5HogLlWK4Wdkq3EBxUZ9FjR4QY3Yy0AlnsP9W8d X-Received: by 2002:a05:6358:9184:b0:125:a552:4389 with SMTP id j4-20020a056358918400b00125a5524389mr4133509rwa.22.1689296917518; Thu, 13 Jul 2023 18:08:37 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689296917; cv=pass; d=google.com; s=arc-20160816; b=fMFzfkZhSjOJXF/k2B6/GIleSFb1+H6ROEoMKmXP2Obbyy6jK1MsMam+RiyOkhBQxA 3pJtzl9HQn0EI5xASM0R+ncqLZtTvq6qe9Ltzuypz4MZYvLaZZDEKu6xjb4vgwJ3dcA9 EhND8N9HTIrDS2Yc4+rGhyWfnmv7kf6JqnDPh9WDhMXVgUNG7PkVuBTSBRn3WKfhiMrp 2u08kgOkkjHb/qqk8p3dU/VKRMuHa9dlhtg9+XDxH2iqk59rVLk6XP2m89l1t5wCjIiB azZql2PkNcJLpVCFMdJFo+vRQDdCEH2ipXkUbLAMIdFp2H1SBmnefp9oLROsBG/5XMp5 C4KQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+9tazuVe05QCK17nT3MvqQqUmm72WRzCSQgnqL1GZGM=; fh=26GyE49KjSE4+CIbBX0WsKdZgEMElM+fJ8Bjkxk50VU=; b=DVuaXM7rIbq2yrtO0pXHf4N/YaVx9IHdFJiTYH4wpex9eNsMLnaMT6pSgJdB6j51VU WsGWKMz7WQaYttwau1oEwJSduP1GEjfFxdvxqxYCr+skPYKOrm+Z+gisDQheFQfMzv7G Oo28b0JdcDAJHu/mvGwOEmA5Yw/HOz0qAxK8MXyAQ7BNOBysarMnHS+EJQDUebR+DZvZ U6A4+7g+kN7v+RYH5W70VmEdt+x09Cw3H3SO+vWEPBhHi4MOUhq7qfWOs0XLa29eTZfn 27zK8aM0wkVe7A82PcCpBx9hTh7KcCst+jG8fBiuxXrzjZskvc504PJIw5saYOe6aMsv vDhg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=afUr4LR8; 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::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id in7-20020a17090b438700b002636ac73ffdsi278321pjb.63.2023.07.13.18.08.24; Thu, 13 Jul 2023 18:08:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=afUr4LR8; 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::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amperecomputing.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234639AbjGNBCr (ORCPT + 99 others); Thu, 13 Jul 2023 21:02:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234613AbjGNBCn (ORCPT ); Thu, 13 Jul 2023 21:02:43 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D72802D69; Thu, 13 Jul 2023 18:02:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZmEY7TvI9bnz0cTMlwVyy2i9GRMvm/h7xNthtzeSHl9sFtCoaUgZukrLv0mx3DTtMuYpU/QqsciWG4iEs+cCPAgRfbo5Y3IqKwfGWlf65bNon+8W2h6dFOc3THu7sA3Mb+8IKHHfUQY5BaevdvqX37+Rf+pfOSi+cbIk5UxG2JwJprTLYcREDL6uIDUWJfhN1fiF4dnbLG5Mgu7FqFCvhngXeZiyFTjaALO7SIDHZPfP6EYzsPSOLrWQeOo400ygpNUtmoU4iiR7zYy0J6BFVVFYuuolEVKd5W/llH69Unvan0VQ7wh7UcljTmpRpLY52Cn1zS+ecpomBkt6wyyPUw== 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=+9tazuVe05QCK17nT3MvqQqUmm72WRzCSQgnqL1GZGM=; b=QZURTLfi6MOeCPNrtrAlEeFdhQn+UgZC3d9/zWKOu38Vm9w+oJziN/Zz+F9bzcDuOQ9cqWXZvP6cll0yBga7gSwsZjGBUo6Vo/fXtCsmnhq6NOrsJSPdTkvVbYkz+S7UYJw6vmYIIOFb9lQYlq9KZcaEDAb/gcijNmK37qx40xdWBeBeJDCuUR3Nxk+0JFRkYt8GJv4ZOkEcEj+OCc1Ipe8Au6Quw5QLE6XsHRsxd7r1S+ybBxkFwpNVoecaXAiURZ3BAhoPzLgZT2hPWF6GTMjpDk1WIf1V6u2/dMgpzQGxi7c3jBeSZY6B7ikNgAKhSeWEQW/+eTxUgFVf0vMg5w== 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=+9tazuVe05QCK17nT3MvqQqUmm72WRzCSQgnqL1GZGM=; b=afUr4LR8ytU7YvSkWMALrkgsykVssMNCu60GY3wme04hMlOoIFvXuZetjaaMDrTsLTr5zA+tBlFSfsnkR8I0g+nHcjMKeWuiZ+WOWEfRGQBgDZ7TvRB2xaZPMSHlGYTku+Ot1ITGl5GrxwI+XBCXlCW2OW6s4v0LdfRq1Gn38cU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) by BY3PR01MB6611.prod.exchangelabs.com (2603:10b6:a03:36a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.27; Fri, 14 Jul 2023 01:02:31 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::235a:622:9239:3963]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::235a:622:9239:3963%7]) with mapi id 15.20.6588.017; Fri, 14 Jul 2023 01:02:31 +0000 From: Ilkka Koskinen To: Will Deacon , Robin Murphy , Besar Wicaksono , Jonathan Cameron , Suzuki K Poulose , Mark Rutland , Jonathan Corbet Cc: Ilkka Koskinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v5 3/4] perf: arm_cspmu: Support implementation specific validation Date: Thu, 13 Jul 2023 18:01:40 -0700 Message-Id: <20230714010141.824226-4-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230714010141.824226-1-ilkka@os.amperecomputing.com> References: <20230714010141.824226-1-ilkka@os.amperecomputing.com> X-ClientProxiedBy: CH0P223CA0013.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:116::30) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|BY3PR01MB6611:EE_ X-MS-Office365-Filtering-Correlation-Id: dccc69be-d871-44f6-b83f-08db8406002d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kx4b5ouMq/YFSKJVYW96DTkOe9jF6CldRekkQKm52kNqaO++H9O2fRzB6urOBOGnt0KrE+L7vag3PcWwIVm3trG7makW8z0lydx6kB+eHTJssEypr83C+dRdPyImmVVl0ZGBjzNGYI120X5d4t1RBP6vka2T728BODh8XvjijQZ8xNkn3xtBEWTNUaRyg5WLkevBmf57nAtv5+BAzBjapbjho/uy0ssNeQkFJLKcXy+1PQBvwZAxSQ2lUMNl3V+1CYnawn0FDmHe0UPdBWwi0Cz/qdEXLXi1NA1hWkglSfGiJzgiF5qgSLfSCXzsaFptlcb/6DX2LBAgOQCJVpqwcLoKMg4DqU8EnTWwnbQRfoyBGzlpi6qNUX37iC2Jgt75Hb3BcpNLj9ZHBFSD00ZeycpmpRSAa1Coq5yYvTEwTufqrYXhwl1pM+Pn/9EIx2QAE5YRwTAHERO7AY3ttwyxrFu+YXYgY504IbpymbAbDJgFmP1TtHDAKj+ajs70SnX3Io3Ev1Ac1dV5Jo3SX2igYImce11/2FYE+SaiWwJcxqgskdf5Fw2iCGDXFc4Jiv19b+4SgmxESjH2JTb3m5AqKrLO+eTWjVsqC7sJymfu/3Za3048ijLLssiQl45rNLMO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR0102MB3590.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(366004)(346002)(136003)(39850400004)(376002)(451199021)(2906002)(38100700002)(38350700002)(6512007)(83380400001)(186003)(2616005)(26005)(1076003)(86362001)(6506007)(5660300002)(8676002)(8936002)(7416002)(110136005)(478600001)(6486002)(52116002)(6666004)(41300700001)(66946007)(66556008)(66476007)(316002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0c7sVpTBWFN2ChyTz119wBvWNXTXcmHh8Gw2ZD8NNrUH7E8USNnzjOAu99GyMfGESYnIFIxERTe9C+M8CZoA5/i5fPqSH0arszcb4w7BWcjy2+xaGvkZP5vwELziwTV9jHsCSDe44PRXAyac/GDjEqAL5fzMiG1tBKRTNhdCbBVgxvLlFZbK4+bDlOSZCacyQ9/krUjDXMY950epQPqJD9ACkagAd2jsiijK023FV2ej18vxzqSdADDHUgzOY24iRtROIE0oCqe7LKYivCx3BdB1Rcrx7T0kop6KsapquVNk2VJb+KyxsJzkhr8foW6ZvjHOYzI1gOQGWe3uc0JsUggLl/9nuMjsmUANgvSpjaKtIk4Vgg19utKjjNehUiwtaQwgzqkdSHHUl7tkMHy61NCgvyvH4b4KgvpkehImvwklsZf4UnF7FnnX5o8Hg/7JmuzNegzrOlClHlVvdpZZ8R56B2uBfKNyaPyulaj52CUZ3cmHJELtHPh8T/o35WTusqD49y9/Y9as6NULvy8BhTpSgH+7Uz78IxLbLBgGKcTqbxXZQGUxRnVeLtpSeqxeenb4oWma3HxVGLunl8TwBhrNumaizXHmJBohbUNQ2f2dvd4xFtMqizfSC4P2KZoN8ZyrdI3kHGrdXM/neBJzCgDvm7OSxJTMkj5+uIY0Mt1mht/KDQOTlj+QCFqukqgMr120avqsDwfxVDAy42zQB5inxqtzSTt/xUWpW4qEcaWl5JY/rF8CgxxyHEFO69bk2eJmhcl1zPvkTQnseE6OEFlQw4e7Z9U0AZGOZAeSUyMJHcJmmSRsCsdcfIfzGpVx9u5ugOvGHgyurAoU+7MwXYZv5nmWSWeAcTArjAhwYxgmI5dPNz3HctuaA1+4OeqZeH/TcLMNTlXdc+M7IbUuD2rzL78WoR4HNc8F49G58wrzqZ+NpoeTtj42nAAEzWFMfvmdHN0xILz+WZshcXx+ZCPdhncc6db8fn9GkXWgiIBq9z0fQdUMMTbobNvEuRkBTfwD/YpDD1Vb/dN/gq+DiXlgyHbShuj379daB3//FQZy2wQ/zC9vTX/xrd1sYQNjdRKB6gvCwSw/msGOHWcD4q4ZIKTLtxt0lwmst5076fJumoGoFSOT/nbM4pP36h6RtxRdj0JzjDUksct7JdfWY6AVoJj/zpnDx5JTdKE+3zaqv6S0OUEuHhNQEapkEfLc6LZa5HBS0/yAxRNniaPhDXv58J8llYL1Aj9Sh7eOTIupQAX+HZhGHqhQprE+oIljFCHzVH6/6E9461WmSZGs+NhLIGSJtLOQYYPMAIpa6nOGKOzA48A/mv750RQL7TofpylPu2qMrAFDihgvetzNBrjIHOPlBJf8C6wqefnio1niSmR+SLgIXcquBv/H9AfByEhslsxTvDggunW/KJsQOH4F2y+7KYJCtxmjTOZsBa8PHNX44AfSAB3MEZlDIjiIkEORO+VrcGKq/4n5jfPeQItGWMeM08YU3+YAv72BuCJu6Sb7E6U9IVSRFod5XG12p2vTDLabWn9+9AD82ZxuDEyZIMOsmrRqjc+dNRDaysUr0xU7+ofFdnE9inBc08hdVN/StZuPqW7UjL0XvDipkHr63EWi5Fe2j634bNpAhVw= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: dccc69be-d871-44f6-b83f-08db8406002d X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2023 01:02:31.2553 (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: FFNDnIvJ1DniGw68Z/UZMvSgbAKGw6z7nUAgguYeH8XR2Mq4SjFR6Xccx9dD/LD3tRWUMUB/MryvID/Ov3RDG0dpMMh7Gw3rkqAM41z4R1Sj5wbFDX/7dn4OImT5rT5Z X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR01MB6611 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771356204566283101 X-GMAIL-MSGID: 1771356204566283101 Some platforms may use e.g. different filtering mechanism and, thus, may need different way to validate the events and group. Signed-off-by: Ilkka Koskinen Reviewed-by: Jonathan Cameron --- drivers/perf/arm_cspmu/arm_cspmu.c | 8 +++++++- drivers/perf/arm_cspmu/arm_cspmu.h | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c index fafd734c3218..471d6d7ac81a 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.c +++ b/drivers/perf/arm_cspmu/arm_cspmu.c @@ -553,7 +553,7 @@ static void arm_cspmu_disable(struct pmu *pmu) static int arm_cspmu_get_event_idx(struct arm_cspmu_hw_events *hw_events, struct perf_event *event) { - int idx; + int idx, ret; struct arm_cspmu *cspmu = to_arm_cspmu(event->pmu); if (supports_cycle_counter(cspmu)) { @@ -587,6 +587,12 @@ static int arm_cspmu_get_event_idx(struct arm_cspmu_hw_events *hw_events, if (idx >= cspmu->num_logical_ctrs) return -EAGAIN; + if (cspmu->impl.ops.validate_event) { + ret = cspmu->impl.ops.validate_event(cspmu, event); + if (ret) + return ret; + } + set_bit(idx, hw_events->used_ctrs); return idx; diff --git a/drivers/perf/arm_cspmu/arm_cspmu.h b/drivers/perf/arm_cspmu/arm_cspmu.h index d6d88c246a23..5070d34c2285 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.h +++ b/drivers/perf/arm_cspmu/arm_cspmu.h @@ -104,6 +104,9 @@ struct arm_cspmu_impl_ops { /* Set event filter */ void (*set_ev_filter)(struct arm_cspmu *cspmu, struct hw_perf_event *hwc, u32 filter); + /* Implementation specific event validation */ + int (*validate_event)(struct arm_cspmu *cspmu, + struct perf_event *event); /* Hide/show unsupported events */ umode_t (*event_attr_is_visible)(struct kobject *kobj, struct attribute *attr, int unused); From patchwork Fri Jul 14 01:01:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilkka Koskinen X-Patchwork-Id: 120160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2203874vqm; Thu, 13 Jul 2023 18:34:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlHkNwyjQt/1v9lJIY4XIxDOxbG38lGJQdU7zNiOSVZtNGtFj7uqHHJS7aAlYf89i2aX/7+2 X-Received: by 2002:a5d:63c9:0:b0:313:e922:3941 with SMTP id c9-20020a5d63c9000000b00313e9223941mr3487463wrw.46.1689298497803; Thu, 13 Jul 2023 18:34:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689298497; cv=pass; d=google.com; s=arc-20160816; b=h65fnwf3Au5EZwoSOpQdRdWul4wnpuk+AjxgMX77k5Uzmk9TeqT9Fj7YVYxBN0OJyQ zZUBfMEbvmZTx+P5+rS+k/lJY4UrtijeI/0hOW4tELvxFSkIOKxvWznzCNlbK+ZgXVzX mbDtEraLRKpdxZrlKLrO4HUQD1Ta80i+jrWkE1VvIx4I5uYlMBsIAtdBj01J5K2FRqnE owVF8O2tv4dskrHiFQaicRdhQVjYOzfy2P7u7R2hVouC+NpMQEI396/0LoqdRws2kK8f zf3nqQ8P1GF54rqhhy8joCwb/28aLXmJaxSLQxHhX1LJq0UGwSyinb5YjFf+WBWCTdl5 R+YQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KIA3BobmIQp2sWJuWbi2lQbPJe7Nqnxq9l9pxYxcgAA=; fh=26GyE49KjSE4+CIbBX0WsKdZgEMElM+fJ8Bjkxk50VU=; b=cWUgSpUA8YBChLyGhZQSGpshOF3Nkdo2sZe+e8g+2iWMZzwcbeoeHsnt/1wcKlhLAX 5K2iz1cZHFvANgbkobhLfPGg74XtfC6wvJI/2edDAcH7Xc0hfaVufvEr8nnI2fUljexg 6Pn56xL1HNB3Q5IZ8p043rrMrMv3fW9Bn844eK07h7U3ruJuCwPfY/8cKgQMsKzX4y4F Xj/UpK59Irxwm+j7/0JXYLs118CgTdgJRTt4kRE+dPX8H5qgALkizn37TfjyNaP4enJu o5gSUQ9x9xFqFP6F1XkVCYhiB24yFgTthbNpd5IrLWMh20CVEFctp1E5tQ+LuxDDtMZB e6+Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=E8FSmHRw; 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::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u22-20020a056402065600b0051de11a08e9si8544682edx.246.2023.07.13.18.34.32; Thu, 13 Jul 2023 18:34:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=E8FSmHRw; 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::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amperecomputing.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234674AbjGNBCu (ORCPT + 99 others); Thu, 13 Jul 2023 21:02:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234642AbjGNBCq (ORCPT ); Thu, 13 Jul 2023 21:02:46 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 958102D66; Thu, 13 Jul 2023 18:02:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XIO2aaLgwdQjH7RjFcYSVSMzeETjDkeKNjy5RzIz+8SCs1zrGcyrJWcf4yUX1WY7Dle7wVyw1baUS4TLEE+22cYa7pJppUs4zCky0BZCkyUzAju43Pyie5/SVOty9k++W4nUpBhC1Ce2WoiowkUQ/KQpq17qZgTz7Hw2uUDyIu/WGjhZSR5I0opB8HDh0LkjElhV8/WB8U8G0fos6jppAIdLdfk9JFKeRaIwJnPy+8mcKJbHFmxtdxOQhTCH9LmRbC51eUu6UD65oTiFaHqaZz2Kp8O0dKxBxRBgtlECk94wCKnANpMAA2Xc8dUbUOF06iBkeeU3Q9UDu8INjL2D9w== 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=KIA3BobmIQp2sWJuWbi2lQbPJe7Nqnxq9l9pxYxcgAA=; b=GI4BLaMhw8OaKNlGi25uu75+PXqO1HjyY+iXSbcg2N+zGNr7B4DzRc8qoa74qgeaR8lGf2K57r05BqN1fX4Ul0gJvGITrxj+tazsrMj9/ri8rifg/PNPz4n7aLUT+61NNgWopwCCJjOYkQJFycMnnaZDuBZNTAUFwvzakKBPOnh9u0D5pKT0Gtlf/gAVs7IZK23AGhgZ9eMIGNw5MknOtCJcVXu3SvqotZ5tH4h+0vLggJdOJaci4MB/1TH2icdcnO6vN27caaFPXCHKMwZ3WLolIhiiJahGUxlMsSuHWFbqpAYPi2qvz7PwsPOloP0TpkiU6esoq2EU21MfwBwsxQ== 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=KIA3BobmIQp2sWJuWbi2lQbPJe7Nqnxq9l9pxYxcgAA=; b=E8FSmHRwwtmeXmgmTm7Q8GZ7F10qK/ILE81yjRsZ6vYgW0YUSsKzHmqTpKgXyna9onK0CiEhyD4C4tD48RjAcKHHBY6QCAchpR1QJ2Q3GuagawPpXCr76g6rGUBsEG0a9SAkIr3sfcYafPzS9QoWnuvYT7xpatHf0YxBVGfz4Jk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) by BY3PR01MB6611.prod.exchangelabs.com (2603:10b6:a03:36a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.27; Fri, 14 Jul 2023 01:02:35 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::235a:622:9239:3963]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::235a:622:9239:3963%7]) with mapi id 15.20.6588.017; Fri, 14 Jul 2023 01:02:35 +0000 From: Ilkka Koskinen To: Will Deacon , Robin Murphy , Besar Wicaksono , Jonathan Cameron , Suzuki K Poulose , Mark Rutland , Jonathan Corbet Cc: Ilkka Koskinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v5 4/4] perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU Date: Thu, 13 Jul 2023 18:01:41 -0700 Message-Id: <20230714010141.824226-5-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230714010141.824226-1-ilkka@os.amperecomputing.com> References: <20230714010141.824226-1-ilkka@os.amperecomputing.com> X-ClientProxiedBy: CH0P223CA0013.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:116::30) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|BY3PR01MB6611:EE_ X-MS-Office365-Filtering-Correlation-Id: c243c8a1-345e-41be-5b22-08db84060260 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bsNT27R3ZCnXzHg/J8CZewj68WhbnaeNwXe5W6BrsmAZAue5trt/+63Wvi+T77fNun+SyGWAbijas8of/Szka4I9yoFljgXWZ2Hee9ZpCt3lnJzltK1zWr1D9HIx3oVGoorcOKdGcu3ukGwzmZpKQqnZn8hCoW/pZpO+aBziN1uin8njem9BJgz26Yf2EZKtNxKCUK4H9gyh6iUPaeV1Gq3LVUxwlOlwKsEtv8rthNyPnzsLHptbHYOQIacBpCKVDLPGN8GwF+oTqH/M2swUgf2Gq7xGH6lK2A1tRJ+uCPzlH0g4xLd4d2ab5+Ap4EqpFrgAMNsle+Hu4yyCpe2hvjF017FwQwjMM2sKV1xlDiLixepww4i3vTR9FTTJhEnBvrSlVU2LzLhlfNgbqW1tBBFktXbU22GD33ii1SFCiHr4lOgu4bxk7XZxGu0Nwop1eJVqTnwxdhgk+FowTwE412MDNX0jh2MzyqMJy3+GIDksD05QPAfNdfEVfAwjO/KCHzVHiy+jb/5Kh0Ug3fugaFmZfozV4WTP704IXZHQj1KM6IUrLy+gJqLMPnza0RfXD7qrFgBzreRlnodLWuyMXFMr2vOz/KXFCOsyMZ6jNfqCMeI6KSNNLAFGBHYjBFg3 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR0102MB3590.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(366004)(346002)(136003)(39850400004)(376002)(451199021)(2906002)(38100700002)(38350700002)(6512007)(83380400001)(186003)(2616005)(26005)(1076003)(86362001)(6506007)(5660300002)(8676002)(8936002)(7416002)(30864003)(110136005)(478600001)(6486002)(52116002)(6666004)(41300700001)(66946007)(66556008)(66476007)(316002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uublSBsIM4nP6ZhIxeaptklNeh1NVnmHR/tVyPJyuxPuFYvONbRmiuok01XWBjZbmy8g0Grz90wDp1UQvRuKG9wVDc08mk6S95TCY/mSgO0BrvOI4FRsTwNOXsSJlQg+GNowGrfQ3GcVi5aJfp0aeWzrQQICvFivpZD3186X1A8BYvNmAdv+pcuKzwBCpE3yYl9y/jPOBj6JqbYtvLQX5Ws7MVRD1xD/6AzUs+lX4BeH6wMebCBwUwEZlATx8fHZwvhKsHmDigj+inJLx6ULzmXKE8LD+ZDsdswFk/Anne/DkSYNn7d8AQOTu7Xu1LomPp/vjmkhatuzXtVMbbNRDseFf2FBSPJwtwJLaOhsNUuQrtnnr/Vaa7jMLYJvtM8jw6DywIMiv9Tn36WIwvcyB/YHHB7y0mGV+CSx4mDA57WRnk8azKZu1RylgsGLEOaPbF6xhd7ZwjwLa0TU+CzoW1ak7aAUmHLPlI5KmVs5iDsPdwknivLu8PHQYow5k9KxNgFqwZJDXJYavXr2WY+mQEI17vkavdG0/qqsFH/VbsTBaymLIzvYlfOdNejTxrnql8LZHfQ194aFbnO/Dd/x0sM2aKYzJysZscnLGW4v+sodpoV2dkfXpxcuEiDI3Ih+Bb84twlBXJHdSuG7CaC7xdPq5Bq93Pgqlrpf7qn2v0C7yT75zCLED2qNrEJTMEp060Y4iDuDASOfEomqjhZfjiuNT0hSu7qqAe3eKQcT74jYHTIWBkmjpF433UjnKm+ooOdFl8aUeYBh+tAb8Jh/Wzsmu/HiXQ3L6c9OyiBGXSUfGudbdZSzTDUHUZIL6+1tGfbtVrT72AmM/UoaYcQUPWGCp9l8cacS/ic6r0LDx/wCu+46jfivjU0dlvJHnQLnKf4ZJXdITMP0hIWwbZ6NbbrCELjTvyrFrXnbPqcMdtWE5cozCmKdB5Sg/6A2m12kPHIue/ksVA1OSN3b6nXvodX3IZeW582UFlnx4gzY8UwsJ2pgV35AjrpGZOAD+ZRx4bEqm0SO+KCuc711a7FeoaYcTlbIqbcWVBRlSQ42505gQEkT0JyCcT/6jgwqGjtnZmTkNsY8vIf3OkZWAf6nGXYHb9CQuYaPGmKW1UZ6jazDNEo7so4NMvjsfC//EYySpms6FGk/WLDYZFZcFD+96VRR9zUqMzPzQNSV9+4aQwjb2QXJRfstl+0vTmcZct1dYTYuZ6Ht6sPdyZN0d3oWnMM2WGQfqH3Oq6SAu8BjuafGDGTw7+/xpQRZBzOxxJk/0k5lARK60XvMmr3w5Q1IE8LRE+WJgUIQmRLUSFojFW25aAGbc4xcCYg22Sr53765YGHAjzJSR/aWGKyMAG0VtP9yaXAbfxPoAAEqK/zdN80je1TuvOosEdainbu4Vn4kZuLkgDnChjhx4LBB/IINblSji3GsOFOguFrN2KrVpPZIVe2vRy9KfKXe8QYiAFenuP5yEbCdZSWkfU6RgilHiwzKrAV9cQ0AF5xvCM4iRujVMVtDs+u+/MxpPeyJ0YLU6q3VKbG6WqGl5ipUn+GQKbKAHu3w1vxbQhD/wtAsk8iYe/68xX1sjZGAkuvhEjKT7+llDDXA0olWq781Ycb4+Q== X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: c243c8a1-345e-41be-5b22-08db84060260 X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2023 01:02:34.9309 (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: kMki6SCdhjcaS+cU5TrfgGwzuf4zL46po50ZpIFOmbGSJK3XU8VQ3ho2x0Ou8b0C0ZkPSCDfap7Drg3pFQSt1EQohU7AEUjO5kZw5qi0EiJRnUmIJHlo3CcTWA8+RZkA X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR01MB6611 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771357861675748909 X-GMAIL-MSGID: 1771357861675748909 Ampere SoC PMU follows CoreSight PMU architecture. It uses implementation specific registers to filter events rather than PMEVFILTnR registers. Signed-off-by: Ilkka Koskinen --- .../admin-guide/perf/ampere_cspmu.rst | 29 +++ drivers/perf/arm_cspmu/Makefile | 2 +- drivers/perf/arm_cspmu/ampere_cspmu.c | 243 ++++++++++++++++++ drivers/perf/arm_cspmu/ampere_cspmu.h | 17 ++ drivers/perf/arm_cspmu/arm_cspmu.c | 8 + 5 files changed, 298 insertions(+), 1 deletion(-) create mode 100644 Documentation/admin-guide/perf/ampere_cspmu.rst create mode 100644 drivers/perf/arm_cspmu/ampere_cspmu.c create mode 100644 drivers/perf/arm_cspmu/ampere_cspmu.h diff --git a/Documentation/admin-guide/perf/ampere_cspmu.rst b/Documentation/admin-guide/perf/ampere_cspmu.rst new file mode 100644 index 000000000000..94f93f5aee6c --- /dev/null +++ b/Documentation/admin-guide/perf/ampere_cspmu.rst @@ -0,0 +1,29 @@ +.. SPDX-License-Identifier: GPL-2.0 + +============================================ +Ampere SoC Performance Monitoring Unit (PMU) +============================================ + +Ampere SoC PMU is a generic PMU IP that follows Arm CoreSight PMU architecture. +Therefore, the driver is implemented as a submodule of arm_cspmu driver. At the +first phase it's used for counting MCU events on AmpereOne. + + +MCU PMU events +-------------- + +The PMU driver supports setting filters for "rank", "bank", and "threshold". +Note, that the filters are per PMU instance rather than per event. + + +Example for perf tool use:: + + / # perf list ampere + + ampere_mcu_pmu_0/act_sent/ [Kernel PMU event] + <...> + ampere_mcu_pmu_1/rd_sent/ [Kernel PMU event] + <...> + + / # perf stat -a -e ampere_mcu_pmu_0/act_sent,bank=5,rank=3,threshold=2/,ampere_mcu_pmu_1/rd_sent/ \ + sleep 1 diff --git a/drivers/perf/arm_cspmu/Makefile b/drivers/perf/arm_cspmu/Makefile index fedb17df982d..b80a8bd8da54 100644 --- a/drivers/perf/arm_cspmu/Makefile +++ b/drivers/perf/arm_cspmu/Makefile @@ -3,4 +3,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU) += arm_cspmu_module.o -arm_cspmu_module-y := arm_cspmu.o nvidia_cspmu.o +arm_cspmu_module-y := arm_cspmu.o nvidia_cspmu.o ampere_cspmu.o diff --git a/drivers/perf/arm_cspmu/ampere_cspmu.c b/drivers/perf/arm_cspmu/ampere_cspmu.c new file mode 100644 index 000000000000..cfafc093b694 --- /dev/null +++ b/drivers/perf/arm_cspmu/ampere_cspmu.c @@ -0,0 +1,243 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Ampere SoC PMU (Performance Monitor Unit) + * + * Copyright (c) 2023, Ampere Computing LLC + */ + +#include "ampere_cspmu.h" + +#define PMAUXR0 0xD80 +#define PMAUXR1 0xD84 +#define PMAUXR2 0xD88 +#define PMAUXR3 0xD8C + +#define to_ampere_cspmu_ctx(cspmu) ((struct ampere_cspmu_ctx *)(cspmu->impl.ctx)) + +struct ampere_cspmu_ctx { + const char *name; + struct attribute **event_attr; + struct attribute **format_attr; +}; + +static DEFINE_IDR(mcu_pmu_idr); + +#define SOC_PMU_EVENT_ATTR_EXTRACTOR(_name, _config, _start, _end) \ + static inline u32 get_##_name(const struct perf_event *event) \ + { \ + return FIELD_GET(GENMASK_ULL(_end, _start), \ + event->attr._config); \ + } \ + +SOC_PMU_EVENT_ATTR_EXTRACTOR(event, config, 0, 8); +SOC_PMU_EVENT_ATTR_EXTRACTOR(threshold, config1, 0, 7); +SOC_PMU_EVENT_ATTR_EXTRACTOR(rank, config1, 8, 23); +SOC_PMU_EVENT_ATTR_EXTRACTOR(bank, config1, 24, 55); + +static struct attribute *ampereone_mcu_pmu_event_attrs[] = { + ARM_CSPMU_EVENT_ATTR(cycle_count, 0x00), + ARM_CSPMU_EVENT_ATTR(act_sent, 0x01), + ARM_CSPMU_EVENT_ATTR(pre_sent, 0x02), + ARM_CSPMU_EVENT_ATTR(rd_sent, 0x03), + ARM_CSPMU_EVENT_ATTR(rda_sent, 0x04), + ARM_CSPMU_EVENT_ATTR(wr_sent, 0x05), + ARM_CSPMU_EVENT_ATTR(wra_sent, 0x06), + ARM_CSPMU_EVENT_ATTR(pd_entry_vld, 0x07), + ARM_CSPMU_EVENT_ATTR(sref_entry_vld, 0x08), + ARM_CSPMU_EVENT_ATTR(prea_sent, 0x09), + ARM_CSPMU_EVENT_ATTR(pre_sb_sent, 0x0a), + ARM_CSPMU_EVENT_ATTR(ref_sent, 0x0b), + ARM_CSPMU_EVENT_ATTR(rfm_sent, 0x0c), + ARM_CSPMU_EVENT_ATTR(ref_sb_sent, 0x0d), + ARM_CSPMU_EVENT_ATTR(rfm_sb_sent, 0x0e), + ARM_CSPMU_EVENT_ATTR(rd_rda_sent, 0x0f), + ARM_CSPMU_EVENT_ATTR(wr_wra_sent, 0x10), + ARM_CSPMU_EVENT_ATTR(raw_hazard, 0x11), + ARM_CSPMU_EVENT_ATTR(war_hazard, 0x12), + ARM_CSPMU_EVENT_ATTR(waw_hazard, 0x13), + ARM_CSPMU_EVENT_ATTR(rar_hazard, 0x14), + ARM_CSPMU_EVENT_ATTR(raw_war_waw_hazard, 0x15), + ARM_CSPMU_EVENT_ATTR(hprd_lprd_wr_req_vld, 0x16), + ARM_CSPMU_EVENT_ATTR(lprd_req_vld, 0x17), + ARM_CSPMU_EVENT_ATTR(hprd_req_vld, 0x18), + ARM_CSPMU_EVENT_ATTR(hprd_lprd_req_vld, 0x19), + ARM_CSPMU_EVENT_ATTR(prefetch_tgt, 0x1a), + ARM_CSPMU_EVENT_ATTR(wr_req_vld, 0x1b), + ARM_CSPMU_EVENT_ATTR(partial_wr_req_vld, 0x1c), + ARM_CSPMU_EVENT_ATTR(rd_retry, 0x1d), + ARM_CSPMU_EVENT_ATTR(wr_retry, 0x1e), + ARM_CSPMU_EVENT_ATTR(retry_gnt, 0x1f), + ARM_CSPMU_EVENT_ATTR(rank_change, 0x20), + ARM_CSPMU_EVENT_ATTR(dir_change, 0x21), + ARM_CSPMU_EVENT_ATTR(rank_dir_change, 0x22), + ARM_CSPMU_EVENT_ATTR(rank_active, 0x23), + ARM_CSPMU_EVENT_ATTR(rank_idle, 0x24), + ARM_CSPMU_EVENT_ATTR(rank_pd, 0x25), + ARM_CSPMU_EVENT_ATTR(rank_sref, 0x26), + ARM_CSPMU_EVENT_ATTR(queue_fill_gt_thresh, 0x27), + ARM_CSPMU_EVENT_ATTR(queue_rds_gt_thresh, 0x28), + ARM_CSPMU_EVENT_ATTR(queue_wrs_gt_thresh, 0x29), + ARM_CSPMU_EVENT_ATTR(phy_updt_complt, 0x2a), + ARM_CSPMU_EVENT_ATTR(tz_fail, 0x2b), + ARM_CSPMU_EVENT_ATTR(dram_errc, 0x2c), + ARM_CSPMU_EVENT_ATTR(dram_errd, 0x2d), + ARM_CSPMU_EVENT_ATTR(read_data_return, 0x32), + ARM_CSPMU_EVENT_ATTR(chi_wr_data_delta, 0x33), + ARM_CSPMU_EVENT_ATTR(zq_start, 0x34), + ARM_CSPMU_EVENT_ATTR(zq_latch, 0x35), + ARM_CSPMU_EVENT_ATTR(wr_fifo_full, 0x36), + ARM_CSPMU_EVENT_ATTR(info_fifo_full, 0x37), + ARM_CSPMU_EVENT_ATTR(cmd_fifo_full, 0x38), + ARM_CSPMU_EVENT_ATTR(dfi_nop, 0x39), + ARM_CSPMU_EVENT_ATTR(dfi_cmd, 0x3a), + ARM_CSPMU_EVENT_ATTR(rd_run_len, 0x3b), + ARM_CSPMU_EVENT_ATTR(wr_run_len, 0x3c), + + ARM_CSPMU_EVENT_ATTR(cycles, ARM_CSPMU_EVT_CYCLES_DEFAULT), + NULL, +}; + +static struct attribute *ampereone_mcu_format_attrs[] = { + ARM_CSPMU_FORMAT_EVENT_ATTR, + ARM_CSPMU_FORMAT_ATTR(threshold, "config1:0-7"), + ARM_CSPMU_FORMAT_ATTR(rank, "config1:8-23"), + ARM_CSPMU_FORMAT_ATTR(bank, "config1:24-55"), + NULL, +}; + +static struct attribute ** +ampere_cspmu_get_event_attrs(const struct arm_cspmu *cspmu) +{ + const struct ampere_cspmu_ctx *ctx = to_ampere_cspmu_ctx(cspmu); + + return ctx->event_attr; +} + +static struct attribute ** +ampere_cspmu_get_format_attrs(const struct arm_cspmu *cspmu) +{ + const struct ampere_cspmu_ctx *ctx = to_ampere_cspmu_ctx(cspmu); + + return ctx->format_attr; +} + +static const char * +ampere_cspmu_get_name(const struct arm_cspmu *cspmu) +{ + const struct ampere_cspmu_ctx *ctx = to_ampere_cspmu_ctx(cspmu); + + return ctx->name; +} + +static u32 ampere_cspmu_event_filter(const struct perf_event *event) +{ + /* + * PMEVFILTR or PMCCFILTR aren't used in Ampere SoC PMU but are marked + * as RES0. Make sure, PMCCFILTR is written zero. + */ + return 0; +} + +static void ampere_cspmu_set_ev_filter(struct arm_cspmu *cspmu, + struct hw_perf_event *hwc, + u32 filter) +{ + struct perf_event *event; + unsigned int idx; + u32 threshold, rank, bank; + + /* + * At this point, all the events have the same filter settings. + * Therefore, take the first event and use its configuration. + */ + idx = find_first_bit(cspmu->hw_events.used_ctrs, + cspmu->cycle_counter_logical_idx); + + event = cspmu->hw_events.events[idx]; + + threshold = get_threshold(event); + rank = get_rank(event); + bank = get_bank(event); + + writel(threshold, cspmu->base0 + PMAUXR0); + writel(rank, cspmu->base0 + PMAUXR1); + writel(bank, cspmu->base0 + PMAUXR2); +} + +static int ampere_cspmu_validate_configs(struct perf_event *event, + struct perf_event *event2) +{ + if (get_threshold(event) != get_threshold(event2) || + get_rank(event) != get_rank(event2) || + get_bank(event) != get_bank(event2)) + return -EINVAL; + + return 0; +} + +static int ampere_cspmu_validate_event(struct arm_cspmu *cspmu, + struct perf_event *new) +{ + struct perf_event *curr, *leader = new->group_leader; + unsigned int idx; + int ret; + + ret = ampere_cspmu_validate_configs(new, leader); + if (ret) + return ret; + + /* We compare the global filter settings to the existing events */ + idx = find_first_bit(cspmu->hw_events.used_ctrs, + cspmu->cycle_counter_logical_idx); + + /* This is the first event, thus any configuration is fine */ + if (idx == cspmu->cycle_counter_logical_idx) + return 0; + + curr = cspmu->hw_events.events[idx]; + + return ampere_cspmu_validate_configs(curr, new); +} + +static char *ampere_cspmu_format_name(const struct arm_cspmu *cspmu, + const char *name_pattern) +{ + struct device *dev = cspmu->dev; + int id; + + id = idr_alloc(&mcu_pmu_idr, NULL, 0, 0, GFP_KERNEL); + if (id < 0) + return ERR_PTR(id); + + return devm_kasprintf(dev, GFP_KERNEL, name_pattern, id); +} + +int ampere_cspmu_init_ops(struct arm_cspmu *cspmu) +{ + struct device *dev = cspmu->dev; + struct ampere_cspmu_ctx *ctx; + struct arm_cspmu_impl_ops *impl_ops = &cspmu->impl.ops; + + ctx = devm_kzalloc(dev, sizeof(struct ampere_cspmu_ctx), GFP_KERNEL); + if (!ctx) + return -ENOMEM; + + ctx->event_attr = ampereone_mcu_pmu_event_attrs; + ctx->format_attr = ampereone_mcu_format_attrs; + ctx->name = ampere_cspmu_format_name(cspmu, "ampere_mcu_pmu_%d"); + if (IS_ERR_OR_NULL(ctx->name)) + return ctx->name ? PTR_ERR(ctx->name) : -ENOMEM; + + cspmu->impl.ctx = ctx; + + impl_ops->event_filter = ampere_cspmu_event_filter; + impl_ops->set_ev_filter = ampere_cspmu_set_ev_filter; + impl_ops->validate_event = ampere_cspmu_validate_event; + impl_ops->get_name = ampere_cspmu_get_name; + impl_ops->get_event_attrs = ampere_cspmu_get_event_attrs; + impl_ops->get_format_attrs = ampere_cspmu_get_format_attrs; + + return 0; +} + +MODULE_LICENSE("GPL"); diff --git a/drivers/perf/arm_cspmu/ampere_cspmu.h b/drivers/perf/arm_cspmu/ampere_cspmu.h new file mode 100644 index 000000000000..9b3e1628d1d6 --- /dev/null +++ b/drivers/perf/arm_cspmu/ampere_cspmu.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * Ampere SoC PMU (Performance Monitor Unit) + * + * Copyright (c) 2023, Ampere Computing LLC + */ + +#ifndef __AMPERE_CSPMU_H__ +#define __AMPERE_CSPMU_H__ + +#include "arm_cspmu.h" + +/* Allocate AMPERE descriptor. */ +int ampere_cspmu_init_ops(struct arm_cspmu *cspmu); + +#endif /* __AMPERE_CSPMU_H__ */ diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c index 471d6d7ac81a..579f2697b419 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.c +++ b/drivers/perf/arm_cspmu/arm_cspmu.c @@ -30,6 +30,8 @@ #include #include "arm_cspmu.h" + +#include "ampere_cspmu.h" #include "nvidia_cspmu.h" #define PMUNAME "arm_cspmu" @@ -114,6 +116,7 @@ /* JEDEC-assigned JEP106 identification code */ #define ARM_CSPMU_IMPL_ID_NVIDIA 0x36B +#define ARM_CSPMU_IMPL_ID_AMPERE 0xA16 static unsigned long arm_cspmu_cpuhp_state; @@ -388,6 +391,11 @@ static const struct impl_match impl_match[] = { .mask = ARM_CSPMU_PMIIDR_IMPLEMENTER, .impl_init_ops = nv_cspmu_init_ops }, + { + .pmiidr = ARM_CSPMU_IMPL_ID_AMPERE, + .mask = ARM_CSPMU_PMIIDR_IMPLEMENTER, + .impl_init_ops = ampere_cspmu_init_ops + }, {} };