From patchwork Thu Jun 22 01:11: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: 13288106 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 C3BD3EB64DD for ; Thu, 22 Jun 2023 01:13:04 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sobsPkHRB/vGAgJ7rVxzCh7TeSRQAIM7Z1vj1xHABfQ=; b=KJiRqpXO20HWkJ hxCobpkjokh1zvJtN5WseviDEzsLGM03q51Rlq8aYFGaDpScNyYqunr+SCjQdncqNUps624szqO6O Q430OpX320QXVQEcIAaNLHyRxvTZ6aewLBem3bngJt7+kYJ3YQiB34cfFxfSrpOr+iwgz8htbyuNL EPDOjHJ4DgtY4rwTxTt5pHVok2eubpRIJOCZekfSmQcLEexlRdDjyv4ME4/tuD6G4LWlJryrdUTg4 pZQJ82Lx2pxHojVl48yNlBTOKMM+GQUpQrd4uatO/F6N6a3UbmdRnvJxtPGHndYkd/3xtEUvBca+M KuYeMP7mWQLmx/eJHtVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qC8sM-00GHL6-1s; Thu, 22 Jun 2023 01:12:42 +0000 Received: from mail-dm3nam02on2070a.outbound.protection.outlook.com ([2a01:111:f400:7e83::70a] helo=NAM02-DM3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qC8sE-00GHGp-0t for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2023 01:12:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dRuklgT6U014cvzJofzj7ZjO2yYZu7m8u1xtH54MrzD2mH/bTE1w0fl2d/EL+tbS1nOvs93PiDLip3R+HvZRJDlEQ14updBDZIPD0keHU9lo0jM+n0d1FmGWAqZsDf53S12Un1vKRfiGGA4F6xVsY/mtQQnVFVXZF1V+b9BRNVD6oB4hjgCL6hsUI/mDjvKMgeLcphP4UDasLLE+vfNafHBWC3LA6Ga2FdNVnYZTnxwnmjF2GYqc7ZSLYhMK4FJ/iaFfQUT7uVjYBHftOkzRVLv0dtBocXqi7UoHBX3mBSyJs95P2UILCe3Cbdq6GTGuWC8wcvmNKM7qViNIq/r4CQ== 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=EyMeNQ8VaSBnknESOsgXFmP1HiOq2LuciqZ4VQX0NLQ=; b=AaOZ2ULwX+KCCPqv4mi7p5g9YJ+1OZNgJwmyKIJEpHdRc+GEzEbok2s7tl7JN8N+xBYaRtWc/lt0gSRx73S6ZyH0k0j5Th7xdJT5WCu4ZhQy6AO5xIDPffD07qrFI2vwnb2tZhQqYxwRty1dQ/61gkjz+2WO29imTNa2NwGKAKhEZGNVL4UXTlaQMyBV7G83aXtLJeKVC9WmnGoJh5abq4QFNOfAPUs0lXZw8nPPaKkM1EM0llAIRa6SZE17CM/sINbxSgvZE4bVMhQi8o3HKgHiXIl7zfhc4fL7+n8gTUeeE3NLfgByQs6a6u6zDvdioQ+hzHP3ad8ZwFxOC9jjnA== 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=EyMeNQ8VaSBnknESOsgXFmP1HiOq2LuciqZ4VQX0NLQ=; b=pibXVK4H/pVSDY5CjuvGRTlj3nHRiTelAvX604C9x5tJiTVzzyGb30FkwGqYAz4b8vf2cAx68YNuWVmGlA9gVYGfGHVhg4FmJDuORAryPC0+bqnUYd7aMDwspl+XAlvFO9xwBu85MZ/fDRYNw2+Ek3XX7WXynynC/BLm8/QYCJc= 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 DS7PR01MB7805.prod.exchangelabs.com (2603:10b6:8:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.21; Thu, 22 Jun 2023 01:12:29 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::a323:29a7:2fd7:621]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::a323:29a7:2fd7:621%4]) with mapi id 15.20.6500.036; Thu, 22 Jun 2023 01:12:29 +0000 From: Ilkka Koskinen To: Will Deacon , Robin Murphy , Besar Wicaksono , Suzuki K Poulose , Mark Rutland Cc: Ilkka Koskinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] perf: arm_cspmu: Split 64-bit write to 32-bit writes Date: Wed, 21 Jun 2023 18:11:38 -0700 Message-Id: <20230622011141.328029-2-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622011141.328029-1-ilkka@os.amperecomputing.com> References: <20230622011141.328029-1-ilkka@os.amperecomputing.com> X-ClientProxiedBy: CH0PR13CA0017.namprd13.prod.outlook.com (2603:10b6:610:b1::22) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|DS7PR01MB7805:EE_ X-MS-Office365-Filtering-Correlation-Id: 794599c0-eb21-4ec2-4806-08db72bdbf80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3T/ANUbScoYp5dWglgH9lY2+1DAL5BGiZYCGOjEdxt1txH4u+1QVuBl9oOM4z1yS9dlQKaOMM2VQ1464VojjfQJOn5RjdQ3ZX5cCBGxzsyrxzkR+PqizZfTRFbbvzeg+/O6VIh5d9whLUtOeqPIXIs0V05qhrM65AzXysWNLMmlz5nUVwWHBzSHJ6jU/Ax5zGLPchWfChSf4j3p1yEMv/p9jtsAt4J3QRCYQ2h+3bTwEDAkO/m2QhI3jmIMHFJMhhvKlDSENCyBh8jk+9t+l/iLs+CQCb1OOzRGmiZyp0wA2Wnveul7Rd4tMzXAOvLmfZ/bVGLxhqyylCKzAk9ASiULrnhMjW72UypHZJMWjGRz3Ic1veVfVsmHVQDySmC508sdfLlk99M5HsAJEotpoGdXdLasZQXm+a+3p+2SkItK4kBGAXZghDKzwob5cRpG/T25vA3uX3e7C5s/FIfTGqIkDBUY6sHelVKiojkJdDTBg/VQUc9MquU1ZOTgwk3P2tChq6YgiNRkwdQxbjiXOtGQd6OrO+Xo4Xo8UjvbyNCb5YmthwsgUuujWu5L1mQZcyaC0kEOn6kPosYO2YgpabLW06OfhcTVZPWKjgDwN9LKJPmuDOENJfNd+QNENqZAE 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)(376002)(39850400004)(346002)(136003)(366004)(396003)(451199021)(8936002)(41300700001)(186003)(8676002)(26005)(1076003)(6506007)(2906002)(6512007)(86362001)(110136005)(66476007)(66556008)(4326008)(66946007)(6486002)(6666004)(316002)(38350700002)(38100700002)(478600001)(52116002)(2616005)(83380400001)(4744005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1SyzApxP7MosD/4QAC9nqppPDFrk1fGiaWPrJBrPfXwnCv47s5ITOc4Z4330uywpzR9sEOOjDIJWwoMVjm3ijlaDZ7v7xXT6kyIT9b5jC81lTbHsOd5p+EMexmEehoWmWFPxVbrt0JXhRLfD6fkfaNKL1FG+KfDaw55G02R5GkqshVMhHZRz2IZb7tlzF5rrN9JXPFc6XBk48/k8p1mpEGAJsb3/VS+Igbx+j2pFJS5hm0YKG3DITJ1aAg+r/Z762t6Hcp1rAUDOllPJB3JaaJ0LFk8D95QVveGqjusvIF63utSDT22/nIn3kMDH53DCENyIa/ebs8SH3hLOv0PkpdnD59XrtCJ/M9cKccL8rbuCiB1LcnCkq1TvgzdHoAsDzcm69vPUJkspka+I5cgHo7wOzVFsv4I6hJ65ta7kZqIJKsOVS3W6irHLSMlO9xukyoERwgRE5AzIzqFG+nVG/9xNACF7WX/rwqu5pH+n8c933bziVNB+Y3CkSHe0R3xMiSZdKvUOygYSWq5+82/z2ggqQi4VxWavJPEU5mW8V+o5UqHJLzEr4XQa/G/Rqc4LfequswwlvnzQRq0a+Vy05qWNfxt8er3FyA27ABVC81UK+MqU1WIn8VCgSGk0uVHMN7bWxLy0A3xvq3/JqTyvBeeUmvXqksPumQqBxYCWDSFdhMghwpTl7IokZOAuNCE0gNWBYFfnAocYUyXESgqX7UBIw6JoAtc+lmoA0RppMxQA0Oi5ynlld86oJP+YL1Y0OyK++wJAyLSKYexg9SCa5U6Eh3xjNiyrZFD0mDILFeNMKIHcjzXCIFsdNca8FLR5OcP7cWYYg1CVwcoedJeDdJA+iMItjqRX1PkEGRLzkcyk0KrcV2IFytU08g+H6QCXMOgTjb6E//8oxASF/qrPK0bjZbPjOCiY7my/PlFumDxz8zhknUDA5w/2DqT3GpwQzOprVhdVRvdE1kPr4g5mfIgE7MzPLe7CX+rbxt7kbg5lPFB5v7pStOI9IpT117gLkBz7Q+jCn0bj8k2WrxEjeEuUmHzf9dzgFzXUtDcNqfNLfs40+7hkOK7IEpVn2/Mo45htn3S/fOJhuJwe8eTlyGktJnzS3fmUXzKfu1vUsRloDnx+MNqjn1KME4JRH97R0QwuIdg4+D11p8ePRysTO+OkHV9QbkmckwlVI15L73dfV0stgyAjHzGjCjRqt7Z3DpbK1XrVw2JMiUaaEqPDK2GUJaWLlQqVALKnXFbbV+NNtvOfOoFrADBBL8smjR0H0qvwOafOF+Tw2G84JIVbDKmVMheUm0TDcxUtmESOm8JSlpPWJeMeE0Np+Q9tEzhwlpL/HctWLc7JvA4NaTiWiYcuN0i5IJ/cRdBly06lYn1e466f/2t67N5lk6R7Q1NGYxUTH0Pu8ztqXetJdtv4tJQOAHnPOwbPV2ErSlTwdhHr9MbWSLcpp9pShhs9pU5AhKbBOTtGJd+0McRSewbnrQJvgL1k8fLy+XmJpJ3P5zqdhldJtPB4K7XJXpt2qNDmrIT67UskHraGAj+UcVCGgqk9qyi3OM14ICHVt+gQgs9P0Dw5D79MCAzV1HWAa3qzbclDWVDZRkWMJf1FW4l0KaOWQYI0j3wIzN1eE+mmlzQ= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 794599c0-eb21-4ec2-4806-08db72bdbf80 X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2023 01:12:29.1639 (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: rzPN8FWw1q3iLGW6+tSVy0WDur8CY2zNXlTvcxIvD4s6JGGE58UzVjB2lErCUbUQFucZmjfDh+Md12diMRqJDRS7AGbE7P2TnMLozp2LgZJvwxO2ZgOpxmIDBla93Iyj X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR01MB7805 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230621_181234_314130_126990F7 X-CRM114-Status: GOOD ( 12.32 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Thu Jun 22 01:11: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: 13288105 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 24D32EB64DC for ; Thu, 22 Jun 2023 01:13:03 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yYlgt9WxF17q/o5dK7HQO4HyrSCwtKITy9cQaUkUU7U=; b=e11szv/xZv/yxV AjjfhIAU0Wz+6xHwLZllZhSkNbM7poRoC6wMjW+LiUUSUishFw1Kih1fJD4ahnHjCXY2Hfo3C6jiW ZpZE7yeCYSD2kIKk02RXcltTYiFIhn8WnjAEMz6tyqu9mwhCFkEE/hHxNKKL7UIz9tPAggR5W0grS scU5VCQYTIrUB8GVXSy3DVr36lhImdzo4X2LPqG052JQv4kqmC0y1FNrI+n2JWQE13TEqF+jiVFGn E3Fp4iullF4tOQomin6EmjezzIx1EBeO1mjwfSYHUbGjUxKku1LjPdspv5wGfb2yHv63EqBgvOG0+ Q45iMRaxYJoQUtcZnufw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qC8sN-00GHLj-0T; Thu, 22 Jun 2023 01:12:43 +0000 Received: from mail-dm3nam02on2070a.outbound.protection.outlook.com ([2a01:111:f400:7e83::70a] helo=NAM02-DM3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qC8sF-00GHGp-1k for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2023 01:12:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LN+f+7FEwKNVKvk8eLAcDQrO/2lAWqLgNGoh40dpGzROglh1UHib2VfRrmz8cFAokO9ljadh3xtHl5e96NIWU7J/TjUEDp2CT2CbVX8oJQhIjxP/hV7f98Kd1Y1hIp3PCkQuQj+Us7d+ZQ4yK3LuZ9KbddEm7JaD8/trm4Ytmabi8R6VoJU/DbQVqJzEVigi/Apa7Ok29nD96/MgqkemxwJ0iKeKL46MhLpm0XO7j/Ba9guGoku3K8/7lPTaQR9Tx1fsRnpjUGTpPfdsjRaV5yBaUztSa8TDd9PmBWhWMit+UPUlcIA2CRh1mQcIty7WhShtvQgfJ3UTLBdMmcAHQQ== 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=TUW8DdEbZGpX9/HSB5buvJTgiz7tmh4Y8yrkYhFvdys=; b=KdiIDo1W0JnuRfWmDGUFNSk4dXKs3r7s4VBLSLwPQkpZXsB8Jnava03wCQXIV3/9N9OMDIU1yi43/TXASUED+CiFeIWzimQD/TY9rq59eAROvATEy4PNRJLdhTM0aQy4nIwHtRiS4srMr5iLSYJRaQpUSgMlsdosHaRWf8pTrwa7RRYAtzy01b4zW11z0lATF6elSKcNLofqFor4d5X0FR3lhujvjVhYMhUVdTgicIYizDVvaXn586j/61yirR2iY5VuDem4Ump2jbJE+0YsJuWyU3BjqouqdbNP6C2zdm+BaRnOhmy00d0tY2Sishtw593V9WOTD2TfCNKuRBT8Ug== 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=TUW8DdEbZGpX9/HSB5buvJTgiz7tmh4Y8yrkYhFvdys=; b=Ru2xvST8vSaE6eAPAuc5VO9EFMIZeiICVHZYXhxQPPSW7P5Z+0nlECEW5hwf6VqK918yvNAA6OVP/PyRmTXqED4sDzO3Hw3OStQbb0J2E9p7ottWw+gPBVkURAEua/qvgjPyR0WbjdohitnbNmdwQJoYROQbaI72t+mSkN8epzs= 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 DS7PR01MB7805.prod.exchangelabs.com (2603:10b6:8:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.21; Thu, 22 Jun 2023 01:12:33 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::a323:29a7:2fd7:621]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::a323:29a7:2fd7:621%4]) with mapi id 15.20.6500.036; Thu, 22 Jun 2023 01:12:33 +0000 From: Ilkka Koskinen To: Will Deacon , Robin Murphy , Besar Wicaksono , Suzuki K Poulose , Mark Rutland Cc: Ilkka Koskinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] perf: arm_cspmu: Support implementation specific filters Date: Wed, 21 Jun 2023 18:11:39 -0700 Message-Id: <20230622011141.328029-3-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622011141.328029-1-ilkka@os.amperecomputing.com> References: <20230622011141.328029-1-ilkka@os.amperecomputing.com> X-ClientProxiedBy: CH0PR13CA0017.namprd13.prod.outlook.com (2603:10b6:610:b1::22) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|DS7PR01MB7805:EE_ X-MS-Office365-Filtering-Correlation-Id: a9518d6d-9893-4859-586b-08db72bdc244 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xVY61FUD5ltH0pLckkpZCp42l5iq/edZshy52EYpcVSkqyELajnr4oMkPuYGJudwBGp78VZBSJB9K15KtMpKouy+vrxh+6kxhrub7YjSX55dSUmmUYgZPLeizYfVgr2kk1V5lmUMio9/aqmtRIjNiGjzoA1ZyvudsaRnPyy6SieXasxbR/2vc9y5HrilBMxqtic4+1vySLCoDFhrRp0gR+CydQ5/ZEo9a7O86OEv8tII8SBQAKg+EQxJqZ715eeQ45mgOVpdAVoqUxAx46MPU4KdwzMCz9vGNIUv8ThDGTdKnmdjFO+chcVSmbaKzk+YItllO19Y2m6YMFytEQnOxMzV3S91lrXRFsUKWlJKTgHI/Z6mUqRu8dXeXOuv5y04GuJZwxXDvPjIYACFOeBRSQZWi0kiIzd9KeUVzz6xwcIhjjUKyLxBIqBI1zOZ81zvwkLsiWHHPxEyWATLS410/nbR53N4gjbDrtgQxAOFkAESwf5ZMeOxmnW+UiCHRLUrHDx9uxFyRBgebqhmCYxZ+kVHCEnWdxWiNSnQAbGusZ5DME8R/rumuAfZ3QU6RZn45ItL4vXvZs5QCXqUOjQ6nD062t4L5ovK5vVV5u6g4w+bMic2imWO3CaN6wW7jIC/ 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)(376002)(39850400004)(346002)(136003)(366004)(396003)(451199021)(8936002)(41300700001)(186003)(8676002)(26005)(1076003)(6506007)(2906002)(6512007)(86362001)(110136005)(66476007)(66556008)(4326008)(66946007)(6486002)(316002)(38350700002)(38100700002)(478600001)(52116002)(2616005)(83380400001)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pkuPsPkdfHTIPp1JCqsfhkeh9TwBRcUS6FbgYHCG4WdygQh5nU+9hhROIgB8IhTcVqNW72yWhPOB0MjY0BXehW0mIh7dPi1aIaL/JNAJSuDNWSQSIl+rIyKDIvilcu5btfXSmyfvsG00vAPDBOGv8vZEseDCd0N+R+LjV3qRlrekKCuthBLuPAFQGAlmORstrBde6SFjgDbnHLTTxQfKvVhqNUxvgsRmTFT7Z4ESLBamoKUli/qxznYcgKo/kowVSYqqJCcO97qnsY6HMlYKJCW0+vLnPchIfvJLkvo67041npd07nkCqDOb6yYZatz4asIHuyHQUR1vVS+6GTlcnOt0W0CoqQS/PAQ+xHfV7lDzMBA6iBLLLx/vsb8osNkJ+Pi3HiWUXzZjb48jTtQJKEbsLFh/NTSo9K7UCzX72TL6YijZUM0r6+lgVDdEym4+ytXCN5BW4mk7oIXC9xzpLiHskl3H3DAIS/Mfzhkz0bLchYNM0a4dWwuObCyitj2oESVgyeO5JKrmfymg7UUwujhDmz1SF1fNHS6Sh7PoXgEaCEGAfwG+yyTXS3B+pC7UOwqjIYaSdk4bRZCk+/jORfJHROsDZjg0TIaT4d9tOo6jBP8QRBU1DNKeb5UQwQnf/voD8EivXPOWdi3bNTewJp1dBEk17EV2UV36Olc5g4+FFoVt9R/LIybG+dNC5zZgUETvZfc03TU0GXnBwDvN5nf9RnpHXDA9/v4mO1T8a/yQ3KL2JqAgM/qX5KHX73oqc13U98XrB5PotOOBh9wcLUMFtqQoE05Yye+ZiCvpU3mOfRc6/CXOFiW89VOz1NB/cR1Oz2msDauLOVMXJiYfj1gk5ZQynK5epT0vObUuSR2lOi57HcOl5CjpEo0oCko4XNrvJ9gmDTcdLDKBn3rQ0PTeNVdMKufCcCvEXD+wuUy9n1nmrdwEmGKUoNqUY/N3psH3S0SNg2ltC8BsRRFgHX6HqBTMAAAKs1Xv+2pbRFGLxvw3j4UQh82vzHo2ovWdsHZfH7aKwVdAMZKfB3oSyyFFGHncNkSCdWJeBPQHkQWWB7mdZ9s2JT2WF02hVkGLWQIL5j6bS8AJ+YVRQ/6/DkxhgopNS+svfaBhl7muI0/at5YLEBK2XjA8M1iZ3OX9u3Dh5auL28C/JInCDm4yMvp4cxMci08osVpbAfFgaPuL8Mz4Mc8Z2I4/CFUB6d4Q3RWNuiFKgYSqvFcvukSlJWRbuMEDDbcThp+vUym23fcXJxZJJXWOEj0yU7VxUt7/tf0IGglXNr5XE/c0NFg2AkBcOBybs+sNNrjkAM3Pj7cCnWFQl7OaiDlr3nZK6StolmHX6iX5x6AfIYt8raRYDaarv/t+LiwEyHDK8Cii/guNDSdtNnmOD1Ya4lk0FeZh39kDf/AYGIeyEpLVWDlt8Az+6SlIGeXev9bnT1h/jFyfqXVvAQ3HknfJGqj+N7IdI4gum/6p4D4Q1YYCCGNeJatYNKErFkCSpfMdvvYbIZQbNSTIQHZlPS4L7nMMpGs3/9dSfkTdq95gjnMlZ5pFHnv2JMRgm61qZQwnPIJy8h6KhzaBeGTS/YJDWZmioTzJk5xWmrg8hL/IGp///8zWbXq94brsjr/SDR6H9KSTVt4= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9518d6d-9893-4859-586b-08db72bdc244 X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2023 01:12:33.8197 (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: +gR3n2WQPHFt219mW6tdgwqEb/sZm7z6wDWZCtK+MqaKrlDI9rbKxmHkj4/VJ2U9YxQLZt9ovzI0MgbIijIUr9Ntsn2OPNyZeMWenpaJpviYgRAGF/tD/0QTpCHPV31W X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR01MB7805 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230621_181235_586053_095CBDC4 X-CRM114-Status: GOOD ( 13.81 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Generic filters aren't used in all the platforms. Instead, the platforms may use different means to filter events. Add support for implementation specific filters. Reviewed-by: Besar Wicaksono Signed-off-by: Ilkka Koskinen --- 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 Thu Jun 22 01:11: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: 13288108 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 23F92EB64D8 for ; Thu, 22 Jun 2023 01:13:19 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tP9Tva19Wy/uo1PqKzRiR4+aA+q3oZBLsxTUR1TZGEA=; b=ycOLqnBy5EUHkL e97sDmJL0iksZAIc72ZOFYFsEPskdz6XHEcdUsjQUaL0VWriXXv7JAkUYpoMJ3AkvYxPwOKp9we+h f9QTnPKX0eCZgDVYNI8xgn1U3Wggb58Jyt4FDK8XeQRtaYF1a1NAVwgZmks8hwcbeLvLdmV6sX1SU grBRlryuNO7cJ95ylrdklqARrdWt317FA/KJUedl8QSHAXRlZymjnNvxmOxNYNe0WJ1Cja3yQAtb2 atMqlDQKN7obiMD6T+ME9VStlJerrW19VpR7v9R8WF/3LI3ZjV3SdWL5csiJfifZiHmhrsMs9oKCW ssnNDzQtTTkb1qKyqmyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qC8sa-00GHR0-06; Thu, 22 Jun 2023 01:12:56 +0000 Received: from mail-dm3nam02on20715.outbound.protection.outlook.com ([2a01:111:f400:7e83::715] helo=NAM02-DM3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qC8sL-00GHKa-0y for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2023 01:12:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WvT84yydpXI6FjX1/bCSC8vhLO/uKVQ5kuP+ti1hng/SGUm855FIc/Chbas9u292e8gUorcpRfAZSPdjn9VeVDkOVYwxIjPJdjJRfT2TVRQ5dMzyNZf+6etoXZPodj3+F9rRAUsPvNjGjAZb40xBbiabFjXRTuskcA1DgRl9ypOR9zRrqKZ1iPehT5ZFzMcstVt8KlbQtO0wa9V3MNS4IjCYykL+doPKGEe1XtTON8yi8GMwUOrz3BwbdZ8wAwkb3dDaV0h6Yta7xuGFBxENqw4T10sIqiwh2OAPyejgfqKtKx0a1DzlZuFu5bHmuL07ieB/e+6B1brkvJQ9MOab4g== 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=j1Np9axgFb3diOIO8yZgWlgDmY3jjcwVHh+rWeAvk3s=; b=CQUffigQLuCmFmJ5jIIWBOp01zQL2hrVtnMVwiqG4k12Lz4LUHisQwDm8oXYzH5KcERIOFz4WUpmaddv23w88RSQYQ0flAf1HnW2aW+sqYLsd5aGmoPf5GJPqQcZxpwUfQUQ/Ef46Zz+rVY2QWpZjNsPDOPtW4rJD3BPx1uLGdE5ZfhpsPAA8hencd7rJEtN4uWH04LDDgSQIggHq9slM0LB1K0lMJyV78gZph0aZfNtV/vnbDdk4DgwtOYsa/7DfqyNR/sW/kMhT1hTveH+NWAE0R3S38A14MwIYdSZ3sXtI11VgwetAcLuPqv0q+O1CS5h3R44CWLweDmaJ2acMw== 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=j1Np9axgFb3diOIO8yZgWlgDmY3jjcwVHh+rWeAvk3s=; b=Y1bXb8Qfv6xSh5yrH92rmEx9/4SZDucnnVJoHFHUlBLrh4lOpqF3OxrCfmde66+4u4BCfqZTYufkVKntprJUnScylLbRomIXyl9i+7lJyfuv6bx3h59P5kZIaQfx3CIxRcPNNnyfQMQeNowIKg6F+XNJBXnYoCQYuEwt9d8lA90= 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 DS7PR01MB7805.prod.exchangelabs.com (2603:10b6:8:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.21; Thu, 22 Jun 2023 01:12:36 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::a323:29a7:2fd7:621]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::a323:29a7:2fd7:621%4]) with mapi id 15.20.6500.036; Thu, 22 Jun 2023 01:12:36 +0000 From: Ilkka Koskinen To: Will Deacon , Robin Murphy , Besar Wicaksono , Suzuki K Poulose , Mark Rutland Cc: Ilkka Koskinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] perf: arm_cspmu: Support implementation specific validation Date: Wed, 21 Jun 2023 18:11:40 -0700 Message-Id: <20230622011141.328029-4-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622011141.328029-1-ilkka@os.amperecomputing.com> References: <20230622011141.328029-1-ilkka@os.amperecomputing.com> X-ClientProxiedBy: CH0PR13CA0017.namprd13.prod.outlook.com (2603:10b6:610:b1::22) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|DS7PR01MB7805:EE_ X-MS-Office365-Filtering-Correlation-Id: 58d710fb-c0aa-450b-8c29-08db72bdc404 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HeKi/zMF7y0QTVMmtGnfVgXkbnupKL73vwe9dqVoAWvAsBv+fveHiFDxDW3F8gSTDb6Zch5Kd0WzMFxyYgusnkXyo1O9EUM60zRnaQaE1U/ijSd792acEyPK7LtEhN8JdV3b7WPgOiyobVpM+XuCFmuKLoVKaZPiJjajdnQKros7K+f0oDWGtOs/qiEXFllwIyX5R0Gxlj1lgol5HwTCIKdGPLeosP69Ew/FGsLe6nyxeQSkOSg+8Uvb0U3vnkshgkKrhRJYFcJEf4LALEoH78rg/gditgLDE07axzokpZfIjwG4BCdLZRCXnsP1qmtyDwGNt7o7bsW5p4Sh1Wq7RCida+d/s7R+2R1YAYI0DLnDKWg/8Bjoii0bxD2u9xM6KAvLh9X04zXHY6/MCoe/Dl9woq94QbpTb6tqI63e3ldOH4cBtnm9l1BOPlUlC/q85De219EExXhdnt4adkPZ1zbevmOKw2ecM3Mug4M1yIzse0LFJCHaz+DqDvh8UR4EVc/Rz1qVy2tY+Kym1Y9SjTJu71Bu4YFIb0oFYSnxA1FHsh5Ti7AGlQplHFFBfP9Oe/fXDUpjwmvAgnDwMFcjWMFF0oRM7rLD4aFvp/LOKhBuMq12GEpAhgmYXxoJHZcl 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)(376002)(39850400004)(346002)(136003)(366004)(396003)(451199021)(8936002)(41300700001)(186003)(8676002)(26005)(1076003)(6506007)(2906002)(6512007)(86362001)(110136005)(66476007)(66556008)(4326008)(66946007)(6486002)(6666004)(316002)(38350700002)(38100700002)(478600001)(52116002)(2616005)(83380400001)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EBLSFT27DV2Zes68rL0GL3RYrznhxz8rFs8QzKbnKiUF28EdWrIm01AbsiZgsk3IzEoHehl/8Tis8788m7sDGRi0RpdN5BsVbDSDGxeFQpIgdOtn8TcmBXFj5sq7pIfItFGjKf1YdH+5RFQWVvMz6astFBOT+lwvBuSPc7Lz6vWNS6uLuxYAoHcD+YUyWnSpp+/Peoi+R/ZiBcvHSvDwGe7IykSdkW6HgFdFHy/KDDJNwjQNIkXxgsf42QZGx9D35LqKQF4nSDkjuXNBXEOYIJIolEU16CStXvID4uRMf4wPJjqNMnl+kwG3ULgtEu8zz+7lw08COYjD2+gLaktExlmVN4Vtr7QJR2Ap5u6QUQo6BuyW/Uav8FX+AnGib7Dia0KGNJO36JrS944hX7aubXfSZhQls3DJ7XdI1cVYWffrK0X/t+cJxrc0TiRYm7nLQ1ZrnNrTFe/uNGTLJk/Kzw87EZLfYwtA/lMfFeEj0sX+4VcLNLH8aCD8KyCXSCZHUeiorz8UbZOos3EsV3tWuKSnmvmn82//dT0NWUePr/rYTXECuqtxWzMPuZNztgfqz7HsLtCD4B8YwOlEAEoLTN+ZK1sNMDJaRMHuxPw/W+ZuB5kCKFfc0XfTKh3irdI65XHHXzhLZE2VTx4xAL5DNWA8MTsKhbJ8LkAwpCuljFULOHI/HoWZP/+ukbMl9wjzhQ40H+85sWq5nzvVhZMm1HtkepPcYdQp85C478Ps7DnzOwp3XYZLx/zKGhd7wamh6L5YslIjkQKaXKL418rKNf+dNDsc/2La1Fn4s9CXPSRLv3yRInbvPhM0wJDv7UCjjRPOz/bt6SsLPMOH9Y3tHxLA7Vasy5aJ6Ci+gCh/eW1OawNs7NIaXuEjUKhnBXSzdyzrfH30IG/VfPsJY3tBjkHCpoePIVp1+s4Mu3KaEczMR0bCoTORSpt2pn3eQKJDL8M9+8ORfU2XoScVoeAlWzKgxsx/txdlO0kucEOru6xwEMWaRKHuUZaqIEZokVcDJY+qkdVFJyVNnP8SuFernLFtEz2fJb1n+FwSMl7kcN+ELWiW4f6Fw8kT3nPM0EiSysAm2SrrKKzey2mUh6LJb6OShC0S52tUPK2dx8cUiIRfuBn+nN4lnFLFXYXIiL9TmH8B3VaIFsEo68TXyFP7Qe2rlU0RCUX/HI2isAk21XB5ks1Y7iqwMyDT/Xr3aIeGHbHm+xsR5/j/njf1zFjgIoxHNSp8f+RoWgRJ9GSenM7dyDNcdT/rbfMxhVzZrerGpYias39RKNSJN7iC4EYARlJSylcZ4Ye6qJ2KSnHgCBNc1yGlWZL3ySxDNNUgfOt+fQcdqeKEPmf6kliYo7Ng6dLUoVPU50fZWido7Pezz/rlGPM1hcYbCiE6biPX+iI0UwEgHxw9NDCEYt4LhW7E6zw9XMf8C9anIVyP88VqhPMPzfnrOi0Mqp4s9v5lg5s11NrZgSh0alZDKeL3jvZUCEdei2Azz3dWmB8Zzd9dbuQZEuLh6KsfUENk3BDfKgMYK1IpI5UyGwV7f7MdE67yoydnylXXgkMCIGw6DeLGkDCtY9adjdzvOkr9rl/12FCLaKL0wNki1I2+zkAMYOREX/o9imAgjAKH1bHjdUXzhw0= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58d710fb-c0aa-450b-8c29-08db72bdc404 X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2023 01:12:36.7319 (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: mlKnYQeJQOZySLBJqrVe5XPQZ39uYyfPnUfhVhEXTYF7oKeX0ThA9ah+0vqxf0XuetNrRvNeh0BTUaBKbhXGozwP3Q1fu6KZRWTpDI3uVx6VvYJGpTo+FNCTZulI6otR X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR01MB7805 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230621_181241_341092_CF311F1E X-CRM114-Status: GOOD ( 14.33 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Thu Jun 22 01:11: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: 13288107 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 7FAD1EB64D7 for ; Thu, 22 Jun 2023 01:13:18 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y0GFQdQCZpzhfFy9IdgP81yfjZFmHUgSxjyi6PdLuAQ=; b=usxfQJb8OY+e5o 4Rt7l6KxMsSY1tfEaEDM7TOQ41cunqFqh8I93SUY+OV4bc4wB416980RyiDxrAWTNh8Ugfo7+Kw2p 2oNfoPO6LzVuLqPuDHoWcWXpGv+MmfS643EMI9wfcIHghRSajq6CHtuOXYOyZ+O6cp0LFOA01NTFC br4ogUYlzcJVD9JG+vjYh4Jfxfj3nOJpxGmkzFvJ1L+mzfBtgH9Vvn/B+8BL+j2oy5y7KHCym1iic tQyMUvSJgr4dNPY1/n0PhFebdCPdZgasp8REFAkV0/hgNWlCtpXLu77xNXl9019EUD6e9cYgWITIP HHvVXpi1eDAJsry+AjHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qC8sa-00GHRg-1v; Thu, 22 Jun 2023 01:12:56 +0000 Received: from mail-dm3nam02on20715.outbound.protection.outlook.com ([2a01:111:f400:7e83::715] helo=NAM02-DM3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qC8sM-00GHKa-2B for linux-arm-kernel@lists.infradead.org; Thu, 22 Jun 2023 01:12:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WL/pf9TTPuUaEze8YYGOkuMyRIcPFEdIohwPIOlscNIsLIEez5Yzx8x6JSjDIIaJMDAOpyqJWPxVrACr44d12TU+JlDMxm4KCHq98GmOsYuovAtVFV5L0NwbkjdlKEDCdPpWb36b2Bm3Qp45ISy7xK29gpYzhGvxZVh396TUmM4azBoud1L+v7Ka72J4AqGoM3IaGRrsLK4oAEiwYgNmjc8LaaWSqqiakPiiDpBv1GlnZ2D8t34B0sg6xMhHBOoadfHI8xnaJj8pUu/Xz4kzeslC3vB87/s0+Ju4Q0j280EqVg+ABouzJEigyy0+BtB4hAasrRJp8a6bJilFyro2+Q== 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=Ty7h61NH/aqjod1K1j+vBv8EmKWo6p+iMP5xswS5Pic=; b=gMdSUJ+bZhZ3bDa/oJTH/+m7NTmdyqmuAdTui/JrefojlFGdjY6g49RQyUAqD/7fpEI02MaEGv66rm3LF/8ff9MTGkP/0M4+EI9CsGQqLdZvTnPQB4hdVnSEfJueJZPXBcXM6YxT5zr8NT5wq+2snFkLn5XuOEnDu2TMY8171gEk9klQtiW+Q6RTAQBB1bwrqB1Dy1WgJfwHhwoqCMMLMS9ucyu+QsyQXV+wCruv3fk6pPcRtK6EMqFqLuwm4PjoXXZ7viSdLVUED5OyLkY8oEPCdMocLyfgkRD1l5XVhCu0AAbWqeaUGR9dTFBR4qJhQv80huEL2CoZ7lyULske2Q== 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=Ty7h61NH/aqjod1K1j+vBv8EmKWo6p+iMP5xswS5Pic=; b=iX350sP+jZ6mZnoJKrK1Z/LnEAS2z5xL4dJqvwwd38ZQ8I3RcUBq6iDs+qqb78BpXJnI0C+meJ4RgjsDc/fmcGZqkklUGMqAPMVbHrqzffDDeac6S086XJIIo04KJtMjGFYymTevf4Hm3H7KrRAh0f31ZHRg9jqG0UQbpnQH9r4= 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 DS7PR01MB7805.prod.exchangelabs.com (2603:10b6:8:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.21; Thu, 22 Jun 2023 01:12:39 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::a323:29a7:2fd7:621]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::a323:29a7:2fd7:621%4]) with mapi id 15.20.6500.036; Thu, 22 Jun 2023 01:12:39 +0000 From: Ilkka Koskinen To: Will Deacon , Robin Murphy , Besar Wicaksono , Suzuki K Poulose , Mark Rutland Cc: Ilkka Koskinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU Date: Wed, 21 Jun 2023 18:11:41 -0700 Message-Id: <20230622011141.328029-5-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622011141.328029-1-ilkka@os.amperecomputing.com> References: <20230622011141.328029-1-ilkka@os.amperecomputing.com> X-ClientProxiedBy: CH0PR13CA0017.namprd13.prod.outlook.com (2603:10b6:610:b1::22) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|DS7PR01MB7805:EE_ X-MS-Office365-Filtering-Correlation-Id: a9da79b9-ecb1-470f-8486-08db72bdc5c9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zVAybRCmso13uuuEZDoP8f5bc7w2rZ1P/HkUEjDYF61sD5QVcwhh6mh/Y8sHtJ81eYtWg6Bv+TqCrbSWGt8Cj/nbBBY6GBFjT3fbi4YK2hTCqsQ98h11K2WOupESv7aLhLZlLTuTvu12EaKF0nTHxHGIxgYrbXDrMHZWKn6n1hQT7RpUoq0mkq6kQdsMymrou0HQnnyVNbVHTIX3IDZF4D5TS4OZ3KRvo9oModvZna6ujkGHzuKc1itusNiy/98qva+86JRvOs2LrmRS3+oMShToWkiSzUUgMvstnNKWsrs78hgJOKEU8nBQGw99PRguIpNnxR4kj4XK7qIld/Jc1OwoRbPbWafo9y5RhepXJvTByPltLAZpy5F/YkOVDr5PLzvHm4/zbWSTxHcvn0BHJwRh1M9ebkNeeh5sBqnoJKGD432zkyI+sexVL0fG2aHsFngM7kJDafD7CookGxCJREr5QtV/bpBrKZjUvDMMQ6JelxRjp6tRzr3HDM6k+pm36ZwGQxz8x5Kau/ewmLOFyJ8RThuhcjuihhYkVnXaBlmleIH/4Jgpek1pRb7ik0nN0A3xNghhNlQQ/JjGUaRCJ4CSIJ3G0C+eRBc/ggdIoj6TFPVgTZexnmjJHkrilKpj 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)(376002)(39850400004)(346002)(136003)(366004)(396003)(451199021)(8936002)(41300700001)(186003)(8676002)(26005)(1076003)(6506007)(2906002)(6512007)(86362001)(110136005)(66476007)(66556008)(4326008)(66946007)(6486002)(6666004)(316002)(38350700002)(38100700002)(478600001)(52116002)(2616005)(83380400001)(30864003)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: USw9BD6nzBn8P9ApKp37Rvkg7ewLO540zN9RfhdWq+AwI/wQ0VgaOWBrtP+DNU8O/jkvcJF3OSvmnYXRNgXMXUUwEcSH0vD8o0Iyrj09aCpmujNawnhwjJGhvF8Aw52HeXajjF0WjN80wpsuqM/pJI4Pn2rSID41wd7Qry6v/6apBgDP/LiGPfYEJBnxJYZNW3mXfUIeMprj4s9jhvoVyj74Oh7diIR8QiUFDz+ccm7LxqBq+F1MIGAeH3zLM/2DRJ8o7RJ2lCsj4PM/XAo5kxUaMxdXWO8tvTf4U4V0RciHQzGltQ0YAjuoCu3qITQQYMWhXWWMbl70DWvf3Kf1bNPwG461V9oV3+/Kn/aHABiycriqrDque5X4MmR8uVuf0yRrFtjQIJCFnttYDC3STd2q4bGz5ura6cOi4VnTvvD/2IddD78i8OJEqyZ1yxp3ggsa3Rw6On8f+LhgIHcduMkChFMUpUo2E4frdp1sSJzQ9MFrKqJySG8goMLn5nfLXA8RuvSMYTixPfQd4FA4SLnn5T+io83YgzEFfhfCiaze0J9VCMYBqXTVUDSObaqbbskI+MCm2Krf1LiyydEd+V0swrvxn5txJ9v+jzmQCF58PTbutwMdug9jlnA5NN2FXLl5mhgQlKtE3NSHJaduIslyxdLYN9bOO4pRa384UqfKhNO7IMs9mXh2oRyShyvDVA7iR8hVcR05bdyaLX3ow6mS75Es8qtwhfrXwiQwejnkE/oJSC89cXZ1iV1DM0QfFLQgFkV2RthJYw8fGcZXdfAIuO/jBvbF9zIZH36VOLYjJuQyM7lFQE6o5RYGc9Y7ZMqDeTC1iEV9p8xP2ayrpm/T0a3LuaBmIDyMJyNt4OD69f2ekyMmo9jGz++FX2dhOZVt8IIxPsWf+DryCK2tMcISIk6tfMLOhYvWyNEa2aJiBlsKdlz0snU8RnW25Zyj746NnzgT5VFiWFi9cn/Vzsk2hx1RFrSWtePuYASuKvItBujFVH4TfhiKoXU7BftSC9wbl6Mr1i9lcHufnwXZBZMRcoNHkkqV+bLXWexoU7LmMauWs0QWbQ2ho3vRkXv9xZCL9I563SfnjMBdT0fXSAfIzbjQu9yXyfPWburupMWNDcux+IviqrErV+2S36GWeE6RkuKxoBkv4jGy391yK1vYaFq6frgWvqfwbibJPgsR+6K9oorFYik0bvg90jkxsQmwTACxupflaVG+OGuRWV3FQ2VR2o7rKp+Up2sU0s74mkYWgSl4ZmefQ8m1WHad4WMaQ8+Kb6nePNRLwwJatjrDwKDfo+qMIhDYz5XSg51/6rrvgBWHsR6PYXon2Cw1WOLxtt1P1Q4ywoCfVw/4HgQNTmLwfHM4IsM/RawhfbQBrUzUVszJa55ymQ+1l2UDKUx32yLGBzzuOM3KwQbPNo0jMdeXVoHkcJ6nFtlYLfjXXz92kl2a0wGAL03FJEQDaC8kAHe1wj+spSoysWyfI3+OLBr/k7F2wQEfbDEYU+M0k+idRzA+LEWoYIblJsdabNh8oFXZVJd24gztSGDDztCsYeNIqYj8mK9KZC0AvbQXfFGv4wwdz48bY9Y59v3ecp3ARywGsm9fe8ybMaEJB7AMYgf1FfPoH0q1g9RzygY= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9da79b9-ecb1-470f-8486-08db72bdc5c9 X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2023 01:12:39.7275 (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: SWIaxcTQp/5PQgwSNTeKftj3eeo26Vx7+sn52+m745vtWrSvMUo8eOVyZYMnPyU/9tSk24HsyliH97kB8eRTBV06YigYR1t3QPL+QNLG8W6WvMZm99MH+LxFSJavHXXO X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR01MB7805 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230621_181242_722462_31FD2FE4 X-CRM114-Status: GOOD ( 18.84 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 | 232 ++++++++++++++++++ drivers/perf/arm_cspmu/ampere_cspmu.h | 17 ++ drivers/perf/arm_cspmu/arm_cspmu.c | 7 + 5 files changed, 286 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..bf86bffeef63 --- /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,filter_enable=3,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..62dc893c94c1 --- /dev/null +++ b/drivers/perf/arm_cspmu/ampere_cspmu.c @@ -0,0 +1,232 @@ +// 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; +}; + +#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, config2, 0, 31); + +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, "config2:0-31"), + 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) +{ + 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 existing events */ + idx = find_first_bit(cspmu->hw_events.used_ctrs, + cspmu->cycle_counter_logical_idx); + + /* This is the first event */ + 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; + static atomic_t pmu_generic_idx = {0}; + + return devm_kasprintf(dev, GFP_KERNEL, name_pattern, + atomic_fetch_inc(&pmu_generic_idx)); +} + +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_%u"); + 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 v2"); 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..587515eea0b4 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.c +++ b/drivers/perf/arm_cspmu/arm_cspmu.c @@ -29,6 +29,7 @@ #include #include +#include "ampere_cspmu.h" #include "arm_cspmu.h" #include "nvidia_cspmu.h" @@ -114,6 +115,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 +390,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 + }, {} };