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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91348C6FD1D for ; Thu, 30 Mar 2023 10:34:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230477AbjC3Kep (ORCPT ); Thu, 30 Mar 2023 06:34:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229807AbjC3Kel (ORCPT ); Thu, 30 Mar 2023 06:34:41 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B40CB211C; Thu, 30 Mar 2023 03:34:31 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 488202F4; Thu, 30 Mar 2023 03:35:15 -0700 (PDT) Received: from [10.57.54.254] (unknown [10.57.54.254]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3FED43F663; Thu, 30 Mar 2023 03:34:29 -0700 (PDT) Message-ID: <3b95e362-300a-12af-0d55-76672c60be9f@arm.com> Date: Thu, 30 Mar 2023 11:34:22 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: [PATCH] perf/arm-cmn: fix regitster offset of CMN_MXP__CONNECT_INFO_P2-5 To: Jing Zhang , Ilkka Koskinen , 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 , Ruidong Tian References: <1680169620-26012-1-git-send-email-renyu.zj@linux.alibaba.com> Content-Language: en-GB From: Robin Murphy In-Reply-To: <1680169620-26012-1-git-send-email-renyu.zj@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023-03-30 10:47, Jing Zhang wrote: > 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") Ugh, these offsets are correct for CI-700, so strictly that commit is fine. What I failed to notice is that CMN-700 shuffled the mesh_port_connect_info registers out of the way, so it's commit 23760a014417 which should have added more handling for this difference. Thanks, Robin. > 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 */