From patchwork Thu Mar 30 09:47:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Zhang X-Patchwork-Id: 668627 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53889C6FD1D for ; Thu, 30 Mar 2023 09:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230471AbjC3Jst (ORCPT ); Thu, 30 Mar 2023 05:48:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230420AbjC3JsT (ORCPT ); Thu, 30 Mar 2023 05:48:19 -0400 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92EA693E0; Thu, 30 Mar 2023 02:47:24 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R181e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=ay29a033018045176; MF=renyu.zj@linux.alibaba.com; NM=1; PH=DS; RN=12; SR=0; TI=SMTPD_---0Vf-9mI6_1680169623; Received: from srmbuffer011165236051.sqa.net(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0Vf-9mI6_1680169623) by smtp.aliyun-inc.com; Thu, 30 Mar 2023 17:47:11 +0800 From: Jing Zhang To: Ilkka Koskinen , Robin Murphy , Will Deacon , Mark Rutland Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, Shuai Xue , Zhuo Song , Jing Zhang , Ruidong Tian Subject: [PATCH] perf/arm-cmn: fix regitster offset of CMN_MXP__CONNECT_INFO_P2-5 Date: Thu, 30 Mar 2023 17:47:00 +0800 Message-Id: <1680169620-26012-1-git-send-email-renyu.zj@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org In the CMN700 specification, it is described that the address offset of the mxp_device_connect_info_p0-5 register is 16'h8 + #{8*index}. Therefore, the address offset of the CMN_MXP__CONNECT_INFO_P2-5 macro defined in the code is wrong, which causes the cmn700 topology map incorrect printed in debugfs. So correct the address offset value to make the cmn700 topology map correct in debugfs. Fixes: 60d1504070c2 ("perf/arm-cmn: Support new IP features") Signed-off-by: Jing Zhang Signed-off-by: Ruidong Tian --- drivers/perf/arm-cmn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c index 1deb61b..e9f844b 100644 --- a/drivers/perf/arm-cmn.c +++ b/drivers/perf/arm-cmn.c @@ -59,10 +59,10 @@ /* XPs also have some local topology info which has uses too */ #define CMN_MXP__CONNECT_INFO_P0 0x0008 #define CMN_MXP__CONNECT_INFO_P1 0x0010 -#define CMN_MXP__CONNECT_INFO_P2 0x0028 -#define CMN_MXP__CONNECT_INFO_P3 0x0030 -#define CMN_MXP__CONNECT_INFO_P4 0x0038 -#define CMN_MXP__CONNECT_INFO_P5 0x0040 +#define CMN_MXP__CONNECT_INFO_P2 0x0018 +#define CMN_MXP__CONNECT_INFO_P3 0x0020 +#define CMN_MXP__CONNECT_INFO_P4 0x0028 +#define CMN_MXP__CONNECT_INFO_P5 0x0030 #define CMN__CONNECT_INFO_DEVICE_TYPE GENMASK_ULL(4, 0) /* PMU registers occupy the 3rd 4KB page of each node's region */