From patchwork Thu Jun 20 03:04:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangyu Chen X-Patchwork-Id: 13704833 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 4488AC27C53 for ; Thu, 20 Jun 2024 03:05:19 +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:Content-Transfer-Encoding: MIME-Version:Date:Subject:Cc:To:From:Message-ID:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=MvLnBQtWyz44qgWyFen+YAfvkf/NA5LiTAc+ar/gjwc=; b=jD5bMRPr/95kncVEuibfJkRyOf +W2L8z+1KtgSLpbvTww+PV4NjQgMs9sGNW9sPmgSQP672ZEC5qU+uxI4aFJckv47RvVMcb6B8dEpQ eMQlIFCxdPUsQqO7RgEgc3AurpfnCAyc/afUgjw2+LDSRDloEfVsOC8+Yt/vHi9191vr51uLv74tZ ZvsapWpkTtwSfm4N3o7wy3I2yOLoFZCiGl9wt4mMtXdc9afhzBLszbNWzpwhU6HuWwOmoFprUEtkl gI0GeM8WPHET7mu5rG+NP0q/HzwA0L0IV59RSBfRf/nOvQHuuZyFq+2D1ylWa3uXfolwT9ii3fAFX ATJa04nQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sK86i-00000003QCX-2bCa; Thu, 20 Jun 2024 03:05:04 +0000 Received: from out203-205-221-209.mail.qq.com ([203.205.221.209]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sK86e-00000003QB4-0XCk for linux-arm-kernel@lists.infradead.org; Thu, 20 Jun 2024 03:05:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1718852685; bh=MvLnBQtWyz44qgWyFen+YAfvkf/NA5LiTAc+ar/gjwc=; h=From:To:Cc:Subject:Date; b=Dx+n6G+p5vKiPV6thBEC4kK3X9IRgtbMPh6ZjOd3Z4Jz/KXU+XxZM1wgFVM5mL/SX AB0IAdoaZDzbrGNVp0fcx617NCG//7DAAY5SWUeJiKlnIePNSR1ApshzbXu9MekS4Q qb+ZFaGSfmTEPyd14eSy4DA4ibA7L83s5aLgABIo= Received: from Yangyus-MBP.lan ([2408:8207:18a1:970f:f545:a993:a6:36e4]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id 12A15E7E; Thu, 20 Jun 2024 11:04:42 +0800 X-QQ-mid: xmsmtpt1718852682txuyjzpm5 Message-ID: X-QQ-XMAILINFO: NkHKfw09D6j8uL2HVuJBhrdaCUDh1ERnAUZ8/tYbi4vw0i8bJKcrZyMIbx3h8c dMmP4OuYNT7Vsvpcb6lzbOmrbWPOqdnRmbRcYOXbbQ0Y3V0Vv7QFx1mQN1j/FTxSbPq5npDj2f91 HODXYEunqsrMHTRPqRfLg1A6hsPz+a0c30zMb/2OzdpnaL2BhNmyJmUN+HqgE2IZlUmJeN6A0XVQ Po4NW30aUHKQlcW8waIC2WT0ss/Ws5PfmXCz8R8re1ibKdaGtd7Vt05M48o9LCIgdTYbLDyV25yj t4fReppM1slQwKzwma/EOZyXZe/9K2qglOhoQ+RoI9C5VSaylVbpuelSECOGOU2jAtUEXHmFVE8R qcURW5QDkdbxdo5eFvr9NC9M3JiEMHX/lEfW2VQVu9kPGj4kMzjQlQhL2eoarms2U0U5HiEZ6pVJ pOj83xD+Jg6sbkwv8ekYNzhKKN9YCJr4h6m6SErK6JcxxPaLL7ziTK0jqp2fAzCcpglJzFHfyODD gozJjUB/P7ckIq3tXKz1G0PzpH2pxhRikm7+6lAu1vp6/kafvuqJXi2xJZlMZhJjkX0rDqlb8yJb /PILJKw5H3wj0kBBl7VxHqZsOMHbEog4h9rc4R6MMpwKFsKD7spDBdUMyE81+sgHxcxXBF9dsAh4 bMrHD8AncHgbRJmRl8Zj4yCgzEYLcFXrJdFUZ5rg/k6syi3cT5hqNlnh03L3XTE/zUc6/t/j+6/s lLQAu9ekA3rZ4PaVQM5Kaxoqwk7+4y2NOFZfvjNsGr3A2jas+okPXJMmeDLDIZzU/zoyyHoDehNS IRVOAxmRZWGWwU+js7OIRqk8LcO941U1CFXyN35KlN8LjiorWZF887nYbz4d7kwCzo+L3AKwKXWy oWg8mdSr7jY+Q5/oTD4rJWJYvdd1p+9tOrw1IyQldM2pCpGpxmWjBHib1tTqIDcl4+iY+/Ir96uJ 88b4uZ8kNzV4edFHgfTpmR9mLQDKPtr7/ui/HP3PQcW2kkHiTtradwtciQIOFr X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Yangyu Chen To: linux-arm-kernel@lists.infradead.org Cc: Marc Zyngier , Will Deacon , Mark Rutland , Janne Grunau , Hector Martin , Asahi Lina , asahi@lists.linux.dev, linux-kernel@vger.kernel.org, Yangyu Chen Subject: [PATCH v1] drivers/perf: apple_m1: fix affinity table for event 0x96 and 0x9b Date: Thu, 20 Jun 2024 11:04:28 +0800 X-OQ-MSGID: <20240620030428.1832-1-cyy@cyyself.name> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240619_200500_526222_0BE66EC4 X-CRM114-Status: GOOD ( 10.21 ) 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 Events 0x96 and 0x9b can be installed on counter 7 only. Fix this to avoid getting the wrong counter value. Signed-off-by: Yangyu Chen --- drivers/perf/apple_m1_cpu_pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c index f322e5ca1114..b8127e5428e1 100644 --- a/drivers/perf/apple_m1_cpu_pmu.c +++ b/drivers/perf/apple_m1_cpu_pmu.c @@ -107,12 +107,12 @@ static const u16 m1_pmu_event_affinity[M1_PMU_PERFCTR_LAST + 1] = { [M1_PMU_PERFCTR_UNKNOWN_93] = ONLY_5_6_7, [M1_PMU_PERFCTR_UNKNOWN_94] = ONLY_5_6_7, [M1_PMU_PERFCTR_UNKNOWN_95] = ONLY_5_6_7, - [M1_PMU_PERFCTR_UNKNOWN_96] = ONLY_5_6_7, + [M1_PMU_PERFCTR_UNKNOWN_96] = BIT(7), [M1_PMU_PERFCTR_UNKNOWN_97] = BIT(7), [M1_PMU_PERFCTR_UNKNOWN_98] = ONLY_5_6_7, [M1_PMU_PERFCTR_UNKNOWN_99] = ONLY_5_6_7, [M1_PMU_PERFCTR_UNKNOWN_9a] = BIT(7), - [M1_PMU_PERFCTR_UNKNOWN_9b] = ONLY_5_6_7, + [M1_PMU_PERFCTR_UNKNOWN_9b] = BIT(7), [M1_PMU_PERFCTR_UNKNOWN_9c] = ONLY_5_6_7, [M1_PMU_PERFCTR_UNKNOWN_9f] = BIT(7), [M1_PMU_PERFCTR_UNKNOWN_bf] = ONLY_5_6_7,