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 0B757C3DA4A for ; Fri, 16 Aug 2024 10:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MGSPe+VciLkFRyvBf3qGdzIaw2QkUhq/giZtczopIAQ=; b=H9yrG6HkyJDgqkTOtsG7VQ1pqM e9a3L15pghB7apeHWsjUft+uxwsbZqVdJKxCVSri96XTDlTjHsKeTbs/4grRz+jvFl7JjKEPszm/D kHkZA3WUqFSZZyWL4RGCQjF/izkWxEwqkyX21um44JIbEyLWBIl2Yz5fjk+oPB1kxYWKmBhFJLzwa L7Wfe6+wQzB1rBy7npQ9ISsAFvPEGkJ+0m0by0dxwsr1wUfx8AWTxnSi6eSKW/KCJbI7baVZiZzvp 4LFw7zkTRudLD8Ki5W2uTIuQAQ84v+1YxI5s1WP2/ZhvYw1C+WYf71FBB7Y1GPlbSGpNZYM9OFubq 2Aw5AmOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1setm2-0000000CWo5-0Led; Fri, 16 Aug 2024 10:01:34 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1setkh-0000000CWMB-3eOR for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 10:00:14 +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 6146A143D; Fri, 16 Aug 2024 03:00:35 -0700 (PDT) Received: from J2N7QTR9R3 (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 798953F73B; Fri, 16 Aug 2024 03:00:08 -0700 (PDT) Date: Fri, 16 Aug 2024 11:00:06 +0100 From: Mark Rutland To: Robin Murphy Cc: will@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, ilkka@os.amperecomputing.com Subject: Re: [PATCH 2/8] perf/arm-cmn: Fix CCLA register offset Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_030012_059885_63ED3759 X-CRM114-Status: GOOD ( 21.15 ) 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 On Fri, Aug 09, 2024 at 08:15:41PM +0100, Robin Murphy wrote: > Apparently pmu_event_sel is offset by 8 for all CCLA nodes, not just > the CCLA_RNI combination type. Was there some reason we used to think that was specific to CCLA_RNI nodes, or was that just an oversight? Looking at the CMN-700 TRM and scanning for pmu_event_sel, we have: 16'h2000 por_ccg_ha_pmu_event_sel 16'h2000 por_ccg_ra_pmu_event_sel 16'h2008 por_ccla_pmu_event_sel 16'h2000 por_dn_pmu_event_sel 16'h2000 cmn_hns_pmu_event_sel 16'h2000 por_hni_pmu_event_sel 16'h2008 por_hnp_pmu_event_sel 16'h2000 por_mxp_pmu_event_sel 16'h2000 por_rnd_pmu_event_sel 16'h2000 por_rni_pmu_event_sel 16'h2000 por_sbsx_pmu_event_sel > Fixes: 23760a014417 ("perf/arm-cmn: Add CMN-700 support") > Signed-off-by: Robin Murphy > --- > drivers/perf/arm-cmn.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c > index fd2122a37f22..0e2e12e2f4fb 100644 > --- a/drivers/perf/arm-cmn.c > +++ b/drivers/perf/arm-cmn.c > @@ -2393,10 +2393,13 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset) > case CMN_TYPE_CXHA: > case CMN_TYPE_CCRA: > case CMN_TYPE_CCHA: > - case CMN_TYPE_CCLA: > case CMN_TYPE_HNS: > dn++; > break; > + case CMN_TYPE_CCLA: > + dn->pmu_base += CMN_HNP_PMU_EVENT_SEL; > + dn++; > + break; When reading this for the first time, it looks like a copy-paste error since CMN_HNP_PMU_EVENT_SEL doesn't have any obvious relationship with CCLA nodes. I reckon it'd be worth adding CMN_CCLA_PMU_EVENT_SEL, and replacing the existing comment above the definition of CMN_HNP_PMU_EVENT_SEL, e.g. /* * Some nodes place common registers at different offsets from most * other nodes. */ #define CMN_HNP_PMU_EVENT_SEL 0x008 #define CMN_CCLA_PMU_EVENT_SEL 0x008 That way the switch looks less suspicious, and the comment is a bit more helpful to anyone trying to figure out what's going on here. With that: Acked-by: Mark Rutland Mark. > /* Nothing to see here */ > case CMN_TYPE_MPAM_S: > case CMN_TYPE_MPAM_NS: > -- > 2.39.2.101.g768bb238c484.dirty >