From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0C93C433F5 for ; Thu, 21 Apr 2022 07:27: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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:Message-ID:In-Reply-To: Subject:cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8GT28ftmcFZkl2Axkst83YdzwlyowWqLTeGrdtx/sjs=; b=2jSe5ML27tMbAaS2OeLU6wcgm6 7xFUQkEtCcqZUdXj7Syl7ErAnMsfZ4C63RJoXbet0TxeVRNBnuQtbCJQtA6CoJXRepo1ckiGe+rPT ZHA0my3QP+kDQ6fcdKHtAZUvguxgbn5Pgb1mo2DrReY9N68vTS6UiYrQzN6cCgRA/jtjLUcXdMN/W YFcfPtr94ZxKsxQvwkn1rZvck4V2Trc+LBRGLwmpldUfKO/uMRPxJHM6I6K/84aw1ZmMwrw6OLcNZ q5HqFNt/tMHAyDbZAVyZj3K2T7eoffTI9fsZtIX7mfoVk7ym3A6R3+DHPhbr3FPN3WNe397bfKOJK inxf+NUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nhRCR-00C1A7-5N; Thu, 21 Apr 2022 07:25:59 +0000 Received: from mail-dm6nam10on20722.outbound.protection.outlook.com ([2a01:111:f400:7e88::722] helo=NAM10-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nhRCO-00C193-0n for linux-arm-kernel@lists.infradead.org; Thu, 21 Apr 2022 07:25:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GJalejTbzBELSUtPRILeyEoiXUy3YGxPbjPS/PGS5/Zc7tA/85ZqqX7CITJuwOpxSUC9GDOdmP5rBAJo5Yn2SeqoZZA1fTbvrHdB7n8tSVGs1Nv1Fnic0pqXdUT60MEklX8/9nDJEfQKmJnanRMLk1Lr+W1GtJiOn4nW9fs1YEOGzhf8kfGCzMm3W4czxHqiZsgS0eh/fz1631HnYw0nXzGIQRL2scepMLA2sVFzESAMUicN9RfApgw+Lw+t53AlRvvO26W5Ix5dHbYonrw8vzC9P0E91Q8RUm8havsSXWb/N5zWJibvpVC/3G24IGIBxu6gBpvPShnwIQA+AER+bQ== 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=ivJX5yVlMTNJ0VRt2lgWobEPhCh0IASxaGdMi5MPUa0=; b=V14ipjbx4X8RLiOB84TS9mRnIa+DlHmvoUjO3KA3wtL7y4zSx/Kze/xSs2jeEFlB2y5wKp6nGMFOC5elx8an29R6w+EMVh8XZsF3Nf1/aG73OCTQLVDihL1jsmY3SCqCNcpFb3oQ5z17tMc0gt26dYhkHdUhZcOyuDxzcl825vmhGZfO3XMy6edeEI0wbnP0VnDbpexe6Yta7x8kVu3PPOsW3yE1ARzLUW0hjPrxyZS6BXF/ZRnuLNli2vW88XiRl/NQKUc2j7rxV7JRhzTpibfGJR6OxBAl8yt+HXmpUAydWE67ny5WhWg37JAFEwpmMJdeckqNV8E3zcmQHDfBBg== 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=ivJX5yVlMTNJ0VRt2lgWobEPhCh0IASxaGdMi5MPUa0=; b=YgEYRk7y1+jmc3gGnovwmbTVMt8zny++UIV3T3WagId4GPXHUOtb6WXAcBb7ZwJV2oljvZ14qyJEbPWky/OLwAvhCPLHW2a+AsvG5BTG34hNvKalR/FmytOumtS2OTKCHRKCiTSIhfgn9LVo0OHj8cfblAvTVS0VKaH5TzS/Qn8= 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 MN2PR01MB5501.prod.exchangelabs.com (2603:10b6:208:110::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14; Thu, 21 Apr 2022 07:25:48 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::5015:1ef4:46b6:5b34]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::5015:1ef4:46b6:5b34%7]) with mapi id 15.20.5164.025; Thu, 21 Apr 2022 07:25:48 +0000 Date: Thu, 21 Apr 2022 00:25:35 -0700 (PDT) From: Ilkka Koskinen X-X-Sender: ikoskine@ubuntu200401 To: Robin Murphy cc: will@kernel.org, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 2/4] perf/arm-cmn: Add CMN-650 support In-Reply-To: Message-ID: References: User-Agent: Alpine 2.22 (DEB 394 2020-01-19) X-ClientProxiedBy: MWH0EPF00056D06.namprd21.prod.outlook.com (2603:10b6:30f:fff2:0:1:0:10) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 080403df-b0d6-4b76-01ab-08da236827f7 X-MS-TrafficTypeDiagnostic: MN2PR01MB5501:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B9l7U7nwNo9n/dnfVBN93ReiMRb0hCCNP/OdcSXyVfB9vAfagld2i5rx9LE8aE/tKSlNQjdNYyw8qbFWYL5ek3lYfYOsLm/ZZTiEOFHssQjp5UlL82uw6zeK20X8UL+57EswbM1CPDgGFT7m7k//14vUTDtQL6f9xGdmeETn/7CUesz28+4/Qo0oF/29yltlBAwvOwosgXvksEo5tt9/I5iFVlaSr2SQIuLDHUMSaDQ0/DZ/PQaGN863B1bfgM6pa3u5CnxUX0ua1PPF1PFhe6mihsAo3yg2INc9KOih72/1a6XM2OfssS0rmX7DjVz36Zp0BBO+/wSXwr0vfDmvdO+2QY6Aro1GBmYZlZt0yFhz6ueA5e4CznN92cD8o0V9fzmnyvE+Dp4hDfFJH3X8sjm3lIWs4TRAEei+aoAkaHxgpjTFQhNXvPrpTYORuynEKnnFgOk+uv08AD/dAtZGM9icrI3ZYVAP/xJDALhDH8zCi09DBKysqT1S6BkVxUlpCY2NsdToAnI4CmNEE47rvREe0dl/4t+Ko6Z/OgMu0mqnwwXR0QXrorjcsnTqYQ3NDYnZa/wphXMRkvxgLV1f2hkR9FDoglLVzuHzjT2pQkxHI/8XHkKACq9ShAdVqOIpybqpZFUpFiksMlJ+e9ZRwk56htoyjRKZsQ6Rff2Vlm8s4RVtTmXo8wDrJunLa2rzzmHaqQnfdYdXj89pr3A4AA== 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:(13230001)(7916004)(4636009)(366004)(86362001)(83380400001)(38100700002)(38350700002)(316002)(6916009)(33716001)(2906002)(8936002)(8676002)(4326008)(5660300002)(66556008)(66476007)(66946007)(186003)(26005)(6512007)(6506007)(508600001)(9686003)(6486002)(6666004)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aXnc5Dp5eBeuEM8gIerLDBHucPNQI+IQMCsLVfWgJlIRADT0tj5U4jwZf118?= =?us-ascii?Q?MaKdunc0s6HPdTxWtFloukun5c246bqVRzM8/7vkfJUWb8brVaQ2kIZIqNSC?= =?us-ascii?Q?w/WQpk5JWSjIM91ZZSIUeHn7/A+ZPQ5av9Y8uYqkhSyOevoage5oXHURRKA2?= =?us-ascii?Q?xodhKjmxWLDPu7XUvByAqem/qUtA8ou+nLXsfFCBRTUx6hAP0Pv6m2+bH2r2?= =?us-ascii?Q?UAklrSHP5hb8frD2ImEJmJJsN6w2h0snZcMyr2iAdRo+/ILxEWoexCBBYU1y?= =?us-ascii?Q?FCnk1NMPSYBfMvI9EnH8r3eLmkU9RkNu5svc4CZOuBPQph7ambk0PuoYnHDb?= =?us-ascii?Q?8di40fnJ6ps4Vq1pnRi3wWYUSqE/J8nydMJ5zKtWZz8JN7XM623S8aw2eB4e?= =?us-ascii?Q?TQuQjzL2FMorL2Jj5etQ+L9X5JoTVR5HFs2dBUpdUirmpUVHg3tcbf4Uk+vl?= =?us-ascii?Q?UU83u8ne70QWxXq3U0VwJ1iS86yR+4Yw9pirbHKKOCTduYfneUpTqLjR0S+0?= =?us-ascii?Q?nHlbrOFSh7FuIznwYE49jlKOhB7HWW7GAZJDxRLX4cvEu9A27uwgIhrrU2gm?= =?us-ascii?Q?+lgomjqWeW1OfV10Go80d63caUTAJbWNiWc4YpJt7VHcoZ1YvcLg88P4zTd0?= =?us-ascii?Q?xmQXnlFNZtvzKRVrOziovOZtq071573NMSM4V1m1VMV4CWTADUPWl4VOFQDx?= =?us-ascii?Q?QoGetsHzKVfNLcIu0WBfiE2fDYyQ4cx+LThzQXUEBt57YjVvoSPo0cwp9GJq?= =?us-ascii?Q?YRH4RLep9SkpDxJ57w3grzVjTOT2q6qnhP+/ViDIdGCJhAyAKf8sGV5bNBoB?= =?us-ascii?Q?hKyePEFG/WJ58+HYxLUJqltfPY7oElNLx/f5EDUV2VnW7RPdPxr1oGvRE6h2?= =?us-ascii?Q?3x5Y1PrFn2r90Ff9UglAGtVL/P2rUo1YwNQ3E9iBm+Znt45wc8M5631UfKaI?= =?us-ascii?Q?pNKc4yMPbNcm6UA+IDracUO60CS9IbvoSoTc5mgbNA4suFESQtL/zhSBhbha?= =?us-ascii?Q?YN8pfSRwcQnBPxtN/WHJ3wC7FiHwWeBOHF/4jl9bH0s09ZU7xMmGWMrV2few?= =?us-ascii?Q?Dh0o8HMXHvQNmW8yCeJSN0398gGXkrDkN9BSRFO+iTA+Cjs1FA/E2AnhOT/G?= =?us-ascii?Q?xHaAXEpWFv6PHb4MtI6ZrPaj+ZuKmcSOTxGtS/ORmtKICt6wRGm3jeoWu+hj?= =?us-ascii?Q?YTWTO2+EEkMRXliuGhlj8skNeX+ld+q+3ID2BRxnc1pEB7JJYzJjFA7c8/cR?= =?us-ascii?Q?aefGHFFAj4uJxhZBQ3Hdjz4aBvDv8yuOqbzaLrJMUwDISZjr3MxUCfaQbbb9?= =?us-ascii?Q?QhjmroNPWDrveVIn+MNaO9lBQH4BJgLxXsOsLTLu8XVSFo0ti8Zz7BHKYXdj?= =?us-ascii?Q?RPsWG1meQhxGpev4PogJ9f6JgqtJmGyPZ6ww92qi/NgXqZ4gVblwYmN9oxLS?= =?us-ascii?Q?uglgbNaVadIKBR2o6Gqy3y0PjMP4NdIBGx7oV59JukjKTykq4qNmG15O7RIJ?= =?us-ascii?Q?7e51RLxVt+LwKY35vo94iynHEzSH4dyX89CFl92ZjCwDQKz0xGcuyf3139Md?= =?us-ascii?Q?V4BuvU7wAPE62i108DJuZ6QHDNS1H2MPw3SWygbiorT4jIQa3qz1YwBxmecJ?= =?us-ascii?Q?J/oIQTjRaNvzcG65WXzVJxsakmn5cricEFDShkMdJvQPbrvAMGIwOcFC3D1F?= =?us-ascii?Q?dQETHSUr2CzNXIkUMLKne3ipXMWKk4ETfWPowsHOBs+5Yz5uK/ae7/ykWjSB?= =?us-ascii?Q?cEeIRvKLBpzxnbhD0+t94hoHXl1l2YHE11YMt+9mBdVR4/JSZ9Gl?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 080403df-b0d6-4b76-01ab-08da236827f7 X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2022 07:25:48.2135 (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: kK4lQqkdxrPUqAHFvNnid2z8ILeWGIa71Vz8Qo2+BBLkwT2GWvMH7/3cwwQnIRbDfCEKJBck0IrExoqCQ4aXJkD6jeo8X7y9jhsN0iPm6poxMu7ineh5LXRCFZ2TI1nM X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR01MB5501 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220421_002556_106634_2BC90D60 X-CRM114-Status: GOOD ( 27.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org I still have a couple tiny comments. Otherwise the patch set looks good to me. On Mon, 18 Apr 2022, Robin Murphy wrote: > Add the identifiers and events for CMN-650, which slots into its > evolutionary position between CMN-600 and the 700-series products. > Imagine CMN-600 made bigger, and with most of the rough edges smoothed > off, but that then balanced out by some bonkers PMU functionality for > the new HN-P enhancement in CMN-650r2. > > Most of the CXG events are actually common to newer revisions of CMN-600 > too, so they're arguably a little late; oh well. > > Signed-off-by: Robin Murphy > --- > drivers/perf/arm-cmn.c | 222 ++++++++++++++++++++++++++++++++--------- > 1 file changed, 176 insertions(+), 46 deletions(-) > > diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c > index 9c1d82be7a2f..cce8516d465c 100644 > --- a/drivers/perf/arm-cmn.c > +++ b/drivers/perf/arm-cmn.c > @@ -39,7 +39,7 @@ > #define CMN_CHILD_NODE_ADDR GENMASK(27, 0) > #define CMN_CHILD_NODE_EXTERNAL BIT(31) > > -#define CMN_MAX_DIMENSION 8 > +#define CMN_MAX_DIMENSION 12 > #define CMN_MAX_XPS (CMN_MAX_DIMENSION * CMN_MAX_DIMENSION) > #define CMN_MAX_DTMS (CMN_MAX_XPS + (CMN_MAX_DIMENSION - 1) * 4) > > @@ -65,7 +65,9 @@ > > /* For most nodes, this is all there is */ > #define CMN_PMU_EVENT_SEL 0x000 > -#define CMN_PMU_EVENTn_ID_SHIFT(n) ((n) * 8) > + > +/* HN-Ps are weird... */ > +#define CMN_HNP_PMU_EVENT_SEL 0x008 > > /* DTMs live in the PMU space of XP registers */ > #define CMN_DTM_WPn(n) (0x1A0 + (n) * 0x18) > @@ -177,9 +179,12 @@ > > > enum cmn_model { > - CMN_ANY = -1, > CMN600 = 1, > - CI700 = 2, > + CMN650 = 2, > + CI700 = 8, > + /* ...and then we can use bitmap tricks for commonality */ > + CMN_ANY = -1, > + NOT_CMN600 = -2, Matter of taste, but I'd probably prefer NOT_CMN600 = ~CMN600 > }; > > /* CMN-600 r0px shouldn't exist in silicon, thankfully */ > @@ -191,6 +196,11 @@ enum cmn_revision { > CMN600_R2P0, > CMN600_R3P0, > CMN600_R3P1, > + CMN650_R0P0 = 0, > + CMN650_R1P0, > + CMN650_R1P1, > + CMN650_R2P0, > + CMN650_R1P2, > CI700_R0P0 = 0, > CI700_R1P0, > CI700_R2P0, > @@ -211,6 +221,7 @@ enum cmn_node_type { > CMN_TYPE_RND = 0xd, > CMN_TYPE_RNSAM = 0xf, > CMN_TYPE_MTSX, > + CMN_TYPE_HNP, > CMN_TYPE_CXRA = 0x100, > CMN_TYPE_CXHA = 0x101, > CMN_TYPE_CXLA = 0x102, > @@ -307,9 +318,7 @@ struct arm_cmn_nodeid { > @@ -580,20 +592,25 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj, > struct device *dev = kobj_to_dev(kobj); > struct arm_cmn *cmn = to_cmn(dev_get_drvdata(dev)); > struct arm_cmn_event_attr *eattr; > + enum cmn_node_type type; > + u16 eventid; > > eattr = container_of(attr, typeof(*eattr), attr.attr); > > if (!(eattr->model & cmn->model)) > return 0; > > + type = eattr->type; > + eventid = eattr->eventid; > + > /* Watchpoints aren't nodes, so avoid confusion */ > - if (eattr->type == CMN_TYPE_WP) > + if (type == CMN_TYPE_WP) > return attr->mode; > > /* Hide XP events for unused interfaces/channels */ > - if (eattr->type == CMN_TYPE_XP) { > - unsigned int intf = (eattr->eventid >> 2) & 7; > - unsigned int chan = eattr->eventid >> 5; > + if (type == CMN_TYPE_XP) { > + unsigned int intf = (eventid >> 2) & 7; > + unsigned int chan = eventid >> 5; > > if ((intf & 4) && !(cmn->ports_used & BIT(intf & 3))) > return 0; > @@ -607,12 +624,29 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj, > } > > /* Revision-specific differences */ > - if (cmn->model == CMN600 && cmn->rev < CMN600_R1P2) { > - if (eattr->type == CMN_TYPE_HNF && eattr->eventid == 0x1b) > - return 0; > + if (cmn->model == CMN600) { > + if (cmn->rev < CMN600_R1P3) { > + if (type == CMN_TYPE_CXRA && eventid > 0x10) > + return 0; > + } > + if (cmn->rev < CMN600_R1P2) { > + if (type == CMN_TYPE_HNF && eventid == 0x1b) > + return 0; > + if (type == CMN_TYPE_CXRA || type == CMN_TYPE_CXHA) > + return 0; > + } > + } else if (cmn->model == CMN650) { > + if (cmn->rev < CMN650_R2P0 || cmn->rev == CMN650_R1P2) { > + if (type == CMN_TYPE_HNF && eventid > 0x22) > + return 0; > + if (type == CMN_TYPE_SBSX && eventid == 0x17) > + return 0; > + if (type == CMN_TYPE_RNI && eventid > 0x10) > + return 0; > + } What's the plan with cmn-650 r2p0 event settings? There seem to be a few extra ones made visible now. I'm fine with updating this patch or taking care of them in a separate one, which ever makes more sense. Cheers, Ilkka _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel