From patchwork Fri Aug 11 01:54:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xu Yang X-Patchwork-Id: 13350005 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 A24DDC04E69 for ; Fri, 11 Aug 2023 01:51:11 +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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tDnDV4l3m+np0EZonIjlTJEXtuaVDdLQB2V5aBUhaYs=; b=zCDvaCTTxGLVO8 jV7FEqgyYa43OZgkqzlrBRsufbQZqMj3drx6ZSFrdPlOwTFGUlfQTYXecPzibT2PS5HsTiWpG63vH 9ytITjjQCnokgzSCZ3bxpcOh9NLIa+pRk7UCqziezCSrgg8r3osKpBldlg+M1uC60cL3tQ46z1D+E 2ubwKNumSWA8rTVEiHcV5hhG+NuZpo24//LM+dGWPgPjhfQoTUQvMGF8kQ2jgBHmGK4475BMZWIFM kSblYeYHrGADHAkOA870p+FeEtEMBqlnLtMqxsO9g/KXk4VLAQ9BjmEc4N43J+ToFnQIQ2zla3uql ufUexRIPdz6WjcJ2IzLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qUHIc-0096sK-2l; Fri, 11 Aug 2023 01:50:46 +0000 Received: from mail-he1eur04on062a.outbound.protection.outlook.com ([2a01:111:f400:fe0d::62a] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qUHIU-0096pu-3C for linux-arm-kernel@lists.infradead.org; Fri, 11 Aug 2023 01:50:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fJqrnN+B+0aOy5/Bs3Wo+a0oZOpoU0qSWUcCucJZQNyv2t/GistC8zWkSwfeDRU7rlJERbD6ZeOaY4yGbbrTZXSd60SlLVmoL2GShOTuZ30fdQLnRdrYtMTww65RRgxQEZkwwr38UawCXjx9FxhSemGW6mV6OaDRp8ve+kVGYpS6mnzedeXwbp9T66+VxF091O7jYuOfCcxqYV37V/lCEl2Lz5jPDt4IMCxPj+edUvokdutuw4VH9r+lmE7ZbCGD4hCcBJfN2m5M38g8NdFQQbdXJW9Qwv/aOVgwsMwJ9il/d5jENDiHALUjfORZuE99wlxHSMUMnH59u1EOxF0zgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ncip1oNg28yWHEIk9a4LZOytBMXwuk7eqQMHFjKmA9o=; b=njW3I+00QWVpgQon7vXFdn9cKborV3kEkX5tQMajNj1InuZeK0W6GO1uRZpyp3GdtBs2MR2mMgv3tt1sTD5E+3+5NwVBg72uqL55poeg5JNQ/UJUmXzHheDvIiSOk300gqBcflvv/P+EcXypByOqVApbWy1LfypOBBpN/h+cJHWPGV7qOiHKD6n7eBFeJ57h7rnrP2Z5f7Dzq43hpH3mEEXk3USX444d2vA9cMepSqC5rQ2Bc/XqgvNAHsx5550OJin1vGQcV9lp7HBXyfxQMDQKY0yk/vMmkySaz5z/In8xk1PJ6lQaN2CvJKLCcO5akO6sRDuixdMaot8ehJcOZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ncip1oNg28yWHEIk9a4LZOytBMXwuk7eqQMHFjKmA9o=; b=m9g8BxE97q0tzrTiU5wYTkhXl0NUAMIdHhtLlKnDFB3o/yJVwVphXOuGY3KxtA9YslCSL2OMCzEsp+UsOl8AKdfyZ3SxQwSoMhSlMh2Gqj+9AcVdW05KqwKBQNePBDi7WuP/0frP1OY4Kx2KrgzMPcFQRnnovfA/m4KTzcMMmEw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB7PR04MB4505.eurprd04.prod.outlook.com (2603:10a6:5:39::26) by AM9PR04MB8746.eurprd04.prod.outlook.com (2603:10a6:20b:43f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.19; Fri, 11 Aug 2023 01:50:36 +0000 Received: from DB7PR04MB4505.eurprd04.prod.outlook.com ([fe80::85e5:acf6:574d:a2a1]) by DB7PR04MB4505.eurprd04.prod.outlook.com ([fe80::85e5:acf6:574d:a2a1%4]) with mapi id 15.20.6652.029; Fri, 11 Aug 2023 01:50:36 +0000 From: Xu Yang To: frank.li@nxp.com Cc: will@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 2/2] perf/imx_ddr: don't enable counter0 if none of 4 counters Date: Fri, 11 Aug 2023 09:54:38 +0800 Message-Id: <20230811015438.1999307-2-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230811015438.1999307-1-xu.yang_2@nxp.com> References: <20230811015438.1999307-1-xu.yang_2@nxp.com> X-ClientProxiedBy: SG2PR02CA0091.apcprd02.prod.outlook.com (2603:1096:4:90::31) To DB7PR04MB4505.eurprd04.prod.outlook.com (2603:10a6:5:39::26) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR04MB4505:EE_|AM9PR04MB8746:EE_ X-MS-Office365-Filtering-Correlation-Id: ae172cc0-30ea-4abd-6154-08db9a0d5b2d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: msLhr+9fCzCaHxYleQp8m9cTn3fyVahoHeXD0Zd/xlfc/h9RhpVNojkDgRgaJ/1IwoKfSMn6J7XGIKJcu0s/hi4UF08no4/gcWeEz1bftuoISxc3tg9//mY3rQIiFGA/sanweOtJPI6b0QEOwTwAUr4TnG26ghAA7C1PrKL3JZzwSYNRykU6mDZCOX9f6TwO/P3FSz9ibvmZlDgLpi7aDiMo6tLGUcSBUFx1nnPuPWlOJCOzdeY2Oxese8nQP/jO0t5zvzJ9fZsMxJo1vwERCyFB2JPslVPQ41KjHi4waNQZsmfdv5yqtTWtWdQv6UqZ7n9Dt3YqLbLdq9LnhF0jWEs86s42MDwHuHPNI4OBJGaIN5yPnOdGjn0hVXngs+WxmOOq2JTka3Ai9MMf7CB2u3vmr631ewxVKEn/IcWlOA4cY3MLEscH0gRUEkndU8S5z+fZRl/tN927kDFv6I1fEPfQF+rTruP2U1pkzYckyOBb/VP7kEr5vOBcZ/9Dlw5UlPfooOI43CHu1S/uY8nJh6bAdkqzezNXEeOtlTWiAz2/x2NXIfctDMtdt4+a2KTlxchkdJ2HrsclTKzCjT4kyXqIUuw4tG9uc1uX9VQeZ2laeyXyel0cIjigor9BYOYR X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB7PR04MB4505.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(396003)(346002)(136003)(39860400002)(366004)(451199021)(1800799006)(186006)(6512007)(6506007)(1076003)(26005)(36756003)(38350700002)(37006003)(38100700002)(5660300002)(86362001)(6636002)(2906002)(4326008)(66946007)(66556008)(66476007)(34206002)(8936002)(8676002)(316002)(41300700001)(52116002)(6486002)(478600001)(2616005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lCngYY0nWvldiUpEvbl7153TRGWRBIrUnfmxgWFisPuTyWjRpUyB1DP3lQXWyiHQs9SOlntr5+K7DzkQPenR5IuysGwUuPyh5jQbCfdRreKo7HbLP0Mksf3kjoD4Iy9gAJrC/a7N3c/u0XtPO6gtysnkjkrnQYc1ZRelhCM4+WJIr1+SU1F8psHBVmj7Rbfgd1M+qdz+jk27LbycLgOY2C2+bJjNklcgtHeGpcOQ9836D8xaLm+N/9o/ak8MKt4xKY7g7/ps2lAISccHhfZaJhOT0I6px7y6poBbq3GLKK9tSr7nRX4Jud7f2qliZAERlaTJ6Gy2saaePwIIte08KImAmpUBpC7yHDJOIssHcnJMNKeIB+U8LJz8+Q70zGhO3zcyMZkjZG5DsInD21aV2FnPAuU2SCx1fVrcUCjTSvM/t0xen5ZBzBDDwtkMmBUREcC1gPziRfeOo3q6U21+U1P+VRt4u7H3U1hHufB56b0BV15r9dhlb0ZQaDm6L8J6DURQauX3aDTFrHtCSFZVw0V7ZcpPILtgrNIhfPgiq10u7D3el0ygMgc6Hg052wpdpxUlilhwxHeqQLYqK147RBuu93EAqo3BzQ4666WQZZEF/jrbW99MLWy8l3l9zgakd5+aGTDjb66ER9ultTrO6HLly9OaPmCJ/dZQXdCFaxuFwwRddL7DP/K1avtr9hzn6I9DRmRkJyzp5JPzoL2kz/qq3utPSd1owglZ52PsyabC9us4aipjWSMeWm5zmdLSLDMNd/uaAaoYvGChh8MNfG+Z+FuxU/gpMylZ6jZsm0w8jIhfaLgw4sNRbyOz2jvlsGDV9w8q0IcJunmgBHztBLFJb/1p4vDyqaFamnIyozaCIByr5/n7OAx1WVI35T+KkbgajibkruN/kZtDtePTsUmzEC7gQJovMDByitwoSVBom7z5teLw4Z6roAJUG0s9Jvf5M8Ir25iROTrhX/NB30TO4+czPz+mmpkRZHkvha8hxF2Uuw4TtbeqAvNJBGmFfk9vnjel7yYp0sY7eCIFdS/4SGWWCZjvgfFy226MeAsc1fqyYj3Z9OaleI8tTEpVHGEUnzsmDE75GqiUPEkOnPXshk88RLrOhcSZpK6gI5Ne2CPkDXcAWJ0JSKqjZmF9LTj1riVlvl/pNORo2UT+nHNct09r48JgVVRlA3B1lfo8i/aAKCP3Yf7EdfI4TEEvr7rOY8KISQ5ZR5HW1250dMivbBKQzGyVAirgwMpFYX6H3cnaASD4Z+b5Pe9IyYlAKsF1Vx2ybjoXdZPsnf6WNWzl7LjLvPvYUinIA22R9ONGasywTscBsWaa5C55oU0WRp3vq7/dUzJLHZs90jU0EkjhKK5atkhsBFObfszYMbFV2NC7fhdut0Adh3x/KQfJd8sQD8VeZLIi5y/J9EESD0PnwfaT87YhOusPiONeEzwv1AybHem7i/arKuhA3IzCiOb0P9MfKAVx3Gwtt6U440wesIqq2HIxR8aGVTascDXpE+p1s2y65APmgnLQoxfmOvKAuDgotLht7p7IeVdS71gvGvrNUBcy+R/FHAqvhc/anqYMXeahuUn0Z0xD4RMb X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae172cc0-30ea-4abd-6154-08db9a0d5b2d X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB4505.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 01:50:35.9937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: G9dzexNGw9o/RDr2TDE0/22H4xfX/lCR2hBbtYk4As2Hw6LMB/7A4KAwygUK4Od4Nri4KxzVsFJ7VS/al2a/Hg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8746 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230810_185039_078620_E4A16FBF X-CRM114-Status: GOOD ( 14.95 ) 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 In current driver, counter0 will be enabled after ddr_perf_pmu_enable() is called even though none of the 4 counters are used. This will cause counter0 continue to count until ddr_perf_pmu_disabled() is called. If pmu is not disabled all the time, the pmu interrupt will be asserted from time to time due to counter0 will overflow and irq handler will clear it. It's not an expected behavior. This patch will not enable counter0 if none of 4 counters are used. Fixes: 9a66d36cc7ac ("drivers/perf: imx_ddr: Add DDR performance counter support to perf") Signed-off-by: Xu Yang Reviewed-by: Frank Li --- Changes in v5: - no change Changes in v4: - enable cycle counter when active_counter from 0 -> 1 - disable cycle counter when active_counter from 1 -> 0 - make ddr_perf_pmu_enable/disable() an empty function Changes in v3: - don't differentiate cycle counter and other counters - modify logic in pmu_enable()/pmu_disable() Changes in v2: - add active counter count as suggested from Frank --- drivers/perf/fsl_imx8_ddr_perf.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c index b022755e6ab9..e78b30521be2 100644 --- a/drivers/perf/fsl_imx8_ddr_perf.c +++ b/drivers/perf/fsl_imx8_ddr_perf.c @@ -105,6 +105,7 @@ struct ddr_pmu { const struct fsl_ddr_devtype_data *devtype_data; int irq; int id; + int active_counter; }; static ssize_t ddr_perf_identifier_show(struct device *dev, @@ -516,6 +517,10 @@ static void ddr_perf_event_start(struct perf_event *event, int flags) ddr_perf_counter_enable(pmu, event->attr.config, counter, true); + if (!pmu->active_counter++) + ddr_perf_counter_enable(pmu, EVENT_CYCLES_ID, + EVENT_CYCLES_COUNTER, true); + hwc->state = 0; } @@ -569,6 +574,10 @@ static void ddr_perf_event_stop(struct perf_event *event, int flags) ddr_perf_counter_enable(pmu, event->attr.config, counter, false); ddr_perf_event_update(event); + if (!--pmu->active_counter) + ddr_perf_counter_enable(pmu, EVENT_CYCLES_ID, + EVENT_CYCLES_COUNTER, false); + hwc->state |= PERF_HES_STOPPED; } @@ -586,25 +595,10 @@ static void ddr_perf_event_del(struct perf_event *event, int flags) static void ddr_perf_pmu_enable(struct pmu *pmu) { - struct ddr_pmu *ddr_pmu = to_ddr_pmu(pmu); - - /* enable cycle counter if cycle is not active event list */ - if (ddr_pmu->events[EVENT_CYCLES_COUNTER] == NULL) - ddr_perf_counter_enable(ddr_pmu, - EVENT_CYCLES_ID, - EVENT_CYCLES_COUNTER, - true); } static void ddr_perf_pmu_disable(struct pmu *pmu) { - struct ddr_pmu *ddr_pmu = to_ddr_pmu(pmu); - - if (ddr_pmu->events[EVENT_CYCLES_COUNTER] == NULL) - ddr_perf_counter_enable(ddr_pmu, - EVENT_CYCLES_ID, - EVENT_CYCLES_COUNTER, - false); } static int ddr_perf_init(struct ddr_pmu *pmu, void __iomem *base,