From patchwork Fri Oct 20 17:51:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Murphy X-Patchwork-Id: 156248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp1227812vqb; Fri, 20 Oct 2023 10:51:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE8oJaEAGHs92HphJeNFKUQad4UQijv0qPDLTY6b96DQa0qWUIlLOv3DWVaju/xpngguZBX X-Received: by 2002:a05:6a00:10c5:b0:6be:559:d030 with SMTP id d5-20020a056a0010c500b006be0559d030mr2260221pfu.19.1697824318411; Fri, 20 Oct 2023 10:51:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697824318; cv=none; d=google.com; s=arc-20160816; b=rykuKwlqTHDvX5VFpMc6W1maW6qYRVn1u4OCt/U0agYm3JH5getX++ageOJ2Ul5c+/ Ot9Dm03KFTy006BG4sG5YiHt+NFAYAteDuqbkoSkbEOuSjZDS5UK/wpoR62FG3ZeVd72 Pvd6V6ZILOJ9NURt/lOqR3QqX3r6lQbnNEhQKnvs6RsEmOKPuuIAWMDstQtLMFLB/3eM IZGmCuWzwxEFp2uFPM8PF4zunJyITfefSKmINaBoR9VXjDAk4QetTMVVx9xC9EHtHUO+ m1VC8P2d94NQlk6UzpVp7zd5gi9EBg4e8CHkh+K1nxx5wePWmUZuR6oAEqQGD91ZHjGm emfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=TDr25jaNyQJQh7f+KiE7JD1i9PI1j24qH6I5wuo7kv0=; fh=5eTsl8DZJtk22FZMserOlh83jaey1v40CuRMPgl25m8=; b=qhelWC1CpVYrWz8A8ef4KHobH5zYpybt/uhN7vuHvLpSQkl6eMML/hDKHnOgoy4plW nf//mkX19xlFyIyVxMcCfPWM9gcn+AidTtAndAh0iHR54wHYgZHo2eeQfpELRuUGIm5e eoba8BO6SNhAy+5lY4N/scyBJJbAof9TYVL3YmRohDA/WfACBcSnG1YMR/C59b4sFMWU 804wtc9JueUkKI70LI1kQ3Vt5do/EczuJ0sxjXXZvN5nD+4LqcmW75smJ6+HnBxDkdjX m1oOVvwi8tS2Msk6IlUzKA/YGPGsI6xwuDuSOehbV2hfLItRUiYLmln9pTavc+nGaZ/W MGhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id u14-20020a056a00098e00b006bddac4b018si2526115pfg.107.2023.10.20.10.51.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 10:51:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id BC82A83A2BEA; Fri, 20 Oct 2023 10:51:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377935AbjJTRvh (ORCPT + 26 others); Fri, 20 Oct 2023 13:51:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377915AbjJTRvf (ORCPT ); Fri, 20 Oct 2023 13:51:35 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E7B38FA for ; Fri, 20 Oct 2023 10:51:33 -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 9B9AE153B; Fri, 20 Oct 2023 10:52:14 -0700 (PDT) Received: from e121345-lin.cambridge.arm.com (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B7A233F762; Fri, 20 Oct 2023 10:51:32 -0700 (PDT) From: Robin Murphy To: will@kernel.org Cc: mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, jeremy.linton@arm.com, ilkka@os.amperecomputing.com, renyu.zj@linux.alibaba.com Subject: [PATCH 1/3] perf/arm-cmn: Fix DTC domain detection Date: Fri, 20 Oct 2023 18:51:25 +0100 Message-Id: <3076ee83d0554f6939fbb6ee49ab2bdb28d8c7ee.1697824215.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.39.2.101.g768bb238c484.dirty In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 20 Oct 2023 10:51:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780297832486240281 X-GMAIL-MSGID: 1780297832486240281 It transpires that dtm_unit_info is another register which got shuffled in CMN-700 without me noticing. Fix that in a way which also proactively fixes the fragile laziness of its consumer, just in case any further fields ever get added alongside dtc_domain. Fixes: 23760a014417 ("perf/arm-cmn: Add CMN-700 support") Signed-off-by: Robin Murphy Reviewed-by: Ilkka Koskinen --- drivers/perf/arm-cmn.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c index 913dc04b3a40..f1ac8d0cdb3b 100644 --- a/drivers/perf/arm-cmn.c +++ b/drivers/perf/arm-cmn.c @@ -112,7 +112,9 @@ #define CMN_DTM_PMEVCNTSR 0x240 -#define CMN_DTM_UNIT_INFO 0x0910 +#define CMN650_DTM_UNIT_INFO 0x0910 +#define CMN_DTM_UNIT_INFO 0x0960 +#define CMN_DTM_UNIT_INFO_DTC_DOMAIN GENMASK_ULL(1, 0) #define CMN_DTM_NUM_COUNTERS 4 /* Want more local counters? Why not replicate the whole DTM! Ugh... */ @@ -2117,6 +2119,16 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn) return 0; } +static unsigned int arm_cmn_dtc_domain(struct arm_cmn *cmn, void __iomem *xp_region) +{ + int offset = CMN_DTM_UNIT_INFO; + + if (cmn->part == PART_CMN650 || cmn->part == PART_CI700) + offset = CMN650_DTM_UNIT_INFO; + + return FIELD_GET(CMN_DTM_UNIT_INFO_DTC_DOMAIN, readl_relaxed(xp_region + offset)); +} + static void arm_cmn_init_node_info(struct arm_cmn *cmn, u32 offset, struct arm_cmn_node *node) { int level; @@ -2248,7 +2260,7 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset) if (cmn->part == PART_CMN600) xp->dtc = 0xf; else - xp->dtc = 1 << readl_relaxed(xp_region + CMN_DTM_UNIT_INFO); + xp->dtc = 1 << arm_cmn_dtc_domain(cmn, xp_region); xp->dtm = dtm - cmn->dtms; arm_cmn_init_dtm(dtm++, xp, 0);