From patchwork Wed Mar 1 17:55: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: 13156284 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 3A1AAC6FA9D for ; Wed, 1 Mar 2023 17:57:21 +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: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:In-Reply-To:References: List-Owner; bh=LUglp0i+onnbf7eIA+ug2y+veLmlSyaQpnMGABWeCAY=; b=j9u8/lLjMf+qAB DQQ+Kie5C42l2hQuNa2DKaoKQXxzHSt/XVk3eEnbB169p+3DBKLuSmJ8iMxDNwcl/5rFmLEmnm0JX 8Qb5reXrKRdxY2eEMAZrTpTiG7qmelcfuOGf3yulRKtRjDhsNVIFx1xfVbuV5NfmWV2/gcgg6u0Bl uNy3hL5kzMt3tc0qYqZHelXfrQXof9VwsvAgVjoQUx6kwrTIaMylr2YZAXR4f43u7DJvZFRMT1F9r 9aj73B2kJc53dS5zRpkin2NzoG7KgBq+8l6XYC0eTwkqLFCBsbfg8WbZ70iW1kvUtkGMnNd8gzl7V 3fveZzia6OTf63LW09FQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pXQge-00H280-JK; Wed, 01 Mar 2023 17:56:20 +0000 Received: from mail-dm6nam10on20712.outbound.protection.outlook.com ([2a01:111:f400:7e88::712] helo=NAM10-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pXQgb-00H26Z-2y for linux-arm-kernel@lists.infradead.org; Wed, 01 Mar 2023 17:56:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lPcjoahgrOiqUennOJjKfkebEbsViSH4J6xtD4foXd/265EZRx0SUPHMZ0aQIFMykvMFyR0kWo3lmRl4TWsYy8rG+UexKub1TYWvUQgCvHgbRY88fLHaYTqcM4chSD5ZIKIReYTuiaSvwVbXYEzwP3axk/ALUHWjWY+VtAHGIg23DxJA3aVMjwDuWlyFAO9wWvjeKyIJAdANG9U0IIdP89wxxOYTuqEHiWatlCjT/Ke5NCGSlxxJSy4ir0nVwt46SsJJTDZaj13pUvNvxdTmi9MAlRmbRizqxQUDeF6Jv8XLz59/tT7t4n9/f1dzLhNk0KJgesJFLyASiXNZctP0SA== 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=0Mar2Pr7gEbxzWjdA3kf7Vtq3HvD/qx0AR/QQwfuVY4=; b=iIgVlRf/9qQ+nDVm9DBixagpH5MwzNfchLhknvphpeqC5f/D3n+67oLM5wZeiIGHea9FDQW5mlkrQOeyMj2hCNY1lmNL+Nv5GW8Z9iz8ap+o+4nQo6RJvsAWskVYpDZRBGw1A0KkWsKKvcXwM/F8YIey42HwnMTSU7NDNIQWLCGs0Y10IuGdqW9SnIWSyEnHY8xbXGQ6xJP5lq4mllYxjeWEUDQXs0HrDagpWSphWWDkUkocLpX1vXHDXv23VqJee29H6aDEBizWPRPfkTwmCbJbyJaRv5i3yTjGwqT/Z2Zyk8gQEQrl0mEYxrH5VH4+M6RtFVYSKxzzkDapjLgjLQ== 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=0Mar2Pr7gEbxzWjdA3kf7Vtq3HvD/qx0AR/QQwfuVY4=; b=v61iJn2ZnbYDUwmSIB/qIJ2Scm9bQMpNN4aV8Oi5/v+phm9fZKexS4g2KO3KKH61Kr9PUx7BlmIDEyO2A095v1kfmSuRki+BxP7STNmROgkxyFWdlNTtZqYYZnps7LvuOKsop/srPc/of38bNNsbdWLu72YEbEmSecMziqnrbUE= 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 MN0PR01MB7828.prod.exchangelabs.com (2603:10b6:208:380::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.18; Wed, 1 Mar 2023 17:56:09 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::7d63:761b:d152:27e4]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::7d63:761b:d152:27e4%2]) with mapi id 15.20.6134.026; Wed, 1 Mar 2023 17:56:09 +0000 From: Ilkka Koskinen To: Robin Murphy , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Ilkka Koskinen , patches@amperecomputing.com Subject: [PATCH] perf/arm-cmn: Move overlapping wp_combine field Date: Wed, 1 Mar 2023 09:55:40 -0800 Message-Id: <20230301175540.19891-1-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: CH2PR11CA0002.namprd11.prod.outlook.com (2603:10b6:610:54::12) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|MN0PR01MB7828:EE_ X-MS-Office365-Filtering-Correlation-Id: 206b19f8-68e2-40ac-cc11-08db1a7e3cad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fgYhqE5m8ubDthkpKaOD4H3yTrUhuq6nmcPY4quLNUPJxam159aCrzTAEGf+QFsXJKAMTDpiMHhQwzRKDApkzCij+EZrEJZJXoRT3N3hHP2LgwucMJygU0SqgClvYvFz51mWFOIQY+7MxbesZxfKxfvQRo7Xxa2/Tz3M1wuL+UwrFPyqhOk+FIkavru7Bc5xjq4Kq/8z8YrN1BZTDg5NXJi8gLjSDqjL6BGws+vBtfsWdg3zXebfBSLzwe2WrMtUCpstdQUKpA6dR0MaV5E1nOWMe/nTBhLU9lqAHX/SMokIS8CFoaHXNrHDIQY+0wehlAKr1eHdSsBTeP3o7T1hg2up/kLNm/JmH50UCozn2QGWQynDoYwuHlZftJvJDDgx66vhfjehMZRxF035CQ6gHGT5H2Npp3bBPCa++CQFW0XkJCAqH04OrBz/sf6nVys8HvAtVMjayGrshyEAeue4JrDP3TtuEFgNdrbfqonuY6KGYJKkLiMuDzYFBsnsrd0gkEvqfz9PZPqrPqj/G5THnx516lsBjYkr1uBN4WoCYSLSsDJObSUO7V8arqc7LWrhQ/UIFgwYWuHAXPKkv8Ck5u1bx8m51q51NETUV8LL1ZEC5XgqFE/wLzSx967mvOl3UYt0Rkf7zg1YmCBi6HuSF+FuAIZzydTjDOXbnQ5M+U4lENctdqWef7XEDYkEIReEeEnj6f8zPsXGiaJ5TAW84A== 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:(13230025)(4636009)(376002)(39850400004)(346002)(366004)(136003)(396003)(451199018)(83380400001)(478600001)(54906003)(316002)(110136005)(4326008)(8676002)(38350700002)(38100700002)(66476007)(2616005)(6512007)(6506007)(1076003)(186003)(26005)(6666004)(52116002)(107886003)(6486002)(5660300002)(66556008)(66946007)(4744005)(86362001)(8936002)(2906002)(41300700001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xYZtPgArqfVe/RYfucAdEsJ0hzETjwyAfFtwBV/h4JVTwaaWq8zg9DMJCGhtiD5TPauIC4DTKFRUhukp92jRueeuNEnAg/yMjzSQChF6NwSrA+qWQGGOvUjkcJp6m5pGRGxMTcleuyIc1ZJA91bGRbzdnWoEWDZa94pNIniW+t5YK3aIBvJPbHzbzeDOiB70pyMUVpnQP7zMsywjFaws8B5hwqlGQiU8KCnDNiixPB58UCvjwO7sMbN//VPRtKlOoFyEkxuPvg2eJWHkNZRymRTld+xQwSwufvQsgsNLQt+acAUEaE6prjdk6DO5ZfLqxCbhnKf1z65DV3q27PMkqmLvyUJbevLEJH++kJAs/0dRKHzFxE3FHbhhY2q0ILsr6Dr1tL9Pbdl5wf5nIartOOOSAH4n87bguPQY35pzDRcRKG8F1N/tryOPr0XJLlQGpVsAtphYuAtzutKmufAXMqkm01Ok3bdA9d7MExhEW6NVhHxUYQGXifjySaTvOzuMJbggd3AUaxxnd8s+Om8oYKKCh6IUGjor9GO2HSlk/K4J7dv8ZdPiaITgumRNCm/Q64FawNorJF0APtNwtfOD0ctrOE/FZqHd+ewMqppoPGRCH4eYLbwXxOA/p+fREgzswjJ/YB0wPSNmvBTNgLde+n0kZtDdwerkjaZRwQAYlMRZCZuj5XVatxASf5kgv6tVwwOPXOftMlcMzT9/tW/uY6djemSoGaaR+cm03i4f9SXCk2i8n1ZbLQv5o1kIKPGVDwJsy5vpDCQXxO0vVqHIfVr7owGKqCq1OCFtjygUwLNwb2QwbiXBVop5gqaVWjQGEoQbnZK/k7ap5UcznUMjog8sH7ACsW9pSM3g30pitjeJGbDYvYYMz/GgUthVJsXn12YjeVBmD9kBAK7kYiPSuF8w3VwPK9Xv+jPfOUOCwKKS72+BhjGGSZezSQfHwWmCu6mjkgoJXNifTBkx9T5Hk7j1tkb5ETVrjTXR6SR5PaK3I6l2iRCVAAz4OmorfyfonVx4bR5GlZJ/9GHwWOf9PhdF+0m+0jtcRq9ZmdyTL9IgrlzkpOVG7vvM7OU03qNrwxhGNDEfoA2bIZB+JP+5x/3IVDahJDU5+YTnQuxRdv6q3t/sMaBG61c3Nzkl7WnW83ECQrqy8KYzMkhKNb90CAiK0zxxhn9IR4WZlpfw+YESGqMe7j8G/cefK4V1rmaP28fjGMs60DRnvxVHzc+l4kdoDaZrBXylLmc3SXxXwvLAhDaEufXWtaGyUDUKZpI/4D+jK0WiThJs4KPZ1hQN1XtCT1bVMNhwDYOZ/MxyGpN0vUeleFLK9JemHODLpJEbtRamsSdTe/gMx5EsumMkytTwzUZA8BaG4vEv7hAusmTKhNjQQc/1gliHa3dILNLREBMJSpa+jQ87K7g3knEog96cUM3cuMCQ06AdGM/Oz/qUSKfLsAP81FE88MUOYHBtTmIHKjXxqyccHUXtsT6/7Qf7OZiyLMQsdYrYC6m7nMpokMZGBIty6+Iw8t5vucRNPp//pSp+AXNoYEmG2xBvNtVLnRuJQRS/3HpRRRDwOvyUhBB+7A5lL2y/QHRoxgRIaU0/4B+3bLOxroWsouoa6J11N1Ix/xNrxbO9vYDD38s= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 206b19f8-68e2-40ac-cc11-08db1a7e3cad X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2023 17:56:09.3187 (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: aYOkeSMeZmQVb+vQpr/9zqPu2pjsA1i3N35XfacQ2Z0uh3VqpC4cdd/FHTNM9zj6/fnvphao+6sls8HD/2ndRbSYZ272CCqNh48i6x7dQt+b1XXnWG2lu6TrRCJ4x4zG X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR01MB7828 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230301_095617_409909_8F0F1930 X-CRM114-Status: UNSURE ( 9.92 ) X-CRM114-Notice: Please train this message. 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 As eventid field was expanded to support new mesh versions, it started to overlap with wp_combine field. Move wp_combine to fix the issue. Fixes: 23760a014417 ("perf/arm-cmn: Add CMN-700 support") Signed-off-by: Ilkka Koskinen --- drivers/perf/arm-cmn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c index c9689861be3f..9f2edc28d16e 100644 --- a/drivers/perf/arm-cmn.c +++ b/drivers/perf/arm-cmn.c @@ -166,7 +166,7 @@ #define CMN_EVENT_BYNODEID(event) FIELD_GET(CMN_CONFIG_BYNODEID, (event)->attr.config) #define CMN_EVENT_NODEID(event) FIELD_GET(CMN_CONFIG_NODEID, (event)->attr.config) -#define CMN_CONFIG_WP_COMBINE GENMASK_ULL(27, 24) +#define CMN_CONFIG_WP_COMBINE GENMASK_ULL(30, 27) #define CMN_CONFIG_WP_DEV_SEL GENMASK_ULL(50, 48) #define CMN_CONFIG_WP_CHN_SEL GENMASK_ULL(55, 51) /* Note that we don't yet support the tertiary match group on newer IPs */