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 0BC70C761A6 for ; Thu, 30 Mar 2023 10:35:23 +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:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BjtoYXio31WwjuuSCjWpVx3YTsdANM50BYsyO2bID/A=; b=VC3LwETYFuwuf1 2Y2av19Mt6+OhHTqOrS0arnfTnMjbeJsSuKbSsnWu8WHFBE3nWwTUJ6v1Qjb0WI1hPupLil6R3OHn 9GiujstdVM7daDnm9uAF36+m6GInM4F22bIjqjmcgDFG8gH8NObEEa+ngxkv1BGFAu8kid9iBht/J 1AzXkUmf4N8NgZR3Otk+PJilkU8DaM26KSfWRILf3FnQyaS/zRpzjbZ0klY1ukPZyEiHTvUgfI8xW 6+mwhYdxg3fr3MnP+QrjCyFhxK0cVnyx8eXbWfvxmsnFAmjPCqoRqreRecQfXVAqSHozupqNWRtUB 5jH00xJKv4tu+vcByBiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phpc5-003U0b-2P; Thu, 30 Mar 2023 10:34:37 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phpc2-003Txm-2W for linux-arm-kernel@lists.infradead.org; Thu, 30 Mar 2023 10:34:36 +0000 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230330_033434_868769_B4E03210 X-CRM114-Status: GOOD ( 17.51 ) 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 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 */ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel