From patchwork Thu Jul 13 10:37:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xu Yang X-Patchwork-Id: 13311779 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 2ED3CEB64DD for ; Thu, 13 Jul 2023 10:35:04 +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=mCflUJJkDOpOaB+p+ve7PuUikkvWMj+s0+VkWTjpsdo=; b=1x+G1LMbvUYyyp KNqlnnEf53UKCQiMTy6nR6daRLXnZw2XXrgpuDXaDO60EgR+FKWcAJdWKAAdPNyAtPW3QxMX6eEvq wiKFknTPIjNx/d+36KSfJdGDHsSvdYCnN1jlRoMZMtQ1gj5hWEuOLxqklbn2Flfz6ZeuQoIerBoQu Ep/u3z+WCF2Tpqk8Scjwbjn8O5YVSNhr9Hkx3ch6RFDkbOS/uTNtendlDIBqZ/RXiknF29IU2SBGl tO0GISiGUn5CczGEL7POJlg3jYXWVdN7Y0LJJHYdUjGS31/pap5Ek4XNUYCDDLRCUT4kG4YPovRq0 WN97y6ydLUG/O9PxYNKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qJted-002s3T-0a; Thu, 13 Jul 2023 10:34:35 +0000 Received: from mail-db3eur04on0612.outbound.protection.outlook.com ([2a01:111:f400:fe0c::612] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qJteY-002rvb-1P for linux-arm-kernel@lists.infradead.org; Thu, 13 Jul 2023 10:34:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=THEcj++XSRGvDKXUnVJGHCqQzLfLtWQzycdKWfXMyouylpxX+/I2epSVESVNjkDYpdbMlh80VcoF0jT5f/TxgFOGYFpmNNGOibH4clsQv2dQAaydyRXveA9bKYs29h3a6n+w8YHPgI1okqgp93uUoAsXzgYGZhVKWe081/kE7vM2MFDMpVPWIr2JytxqtuGX/uPwiqIWVt5eOLhogzdaQuSfEwXHFYNBya8hpnl4a275iaajnxPASzU4zc7bqz0RXUeFynNlq0vksi8h27YwqGgSUHdaxI4RiUv6SbzfCAQJ3BOzdV8Mg5qo4n6iOHuK2WarrrRuVjyQW4tx0/lZFw== 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=1hGTgUGFWB8NO2D7sR2TVDwA+9lioA1rKgZdvAaZHpg=; b=C2oYWTltif+eQBnIcFbnkWWc70jwGj9ua7ZKEMkpetiVqYbRUJ4OAjfTd/mu3euRwOw3xt1gATcjBzFrLlILbMWp+CRNYUIa1VC1xnTbP3H1/M1d9110tzKfTG/0pvbz6AhpX8HzmOiuQkGNPXiD1ijd5cfiDB0JQHLPzohGv/5R8aHlCZMjMJqFq72pOsuGSLOVm7tYlxfaqIknUl3OHHtHRhinSLSJdauUCAC6nv0fUSzF0aYqCM9PnyJmkRNvaRPFf4aAkqMq3CWpHYaMml7oSolFUZ1addbiNYzBUXaC2rMEadNuo7ltgz7tN0lVEmDN/ddNcYCE2WozR7SQHA== 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=1hGTgUGFWB8NO2D7sR2TVDwA+9lioA1rKgZdvAaZHpg=; b=Mlc4Pr2QDp/RNp18q3AkiKmwwlWvH55qzHBwXKSCMHL0pChYlAL0m7ntEgeE/4OnxK+z8tA9l5FkRazB76P2avSWVYS4RilX27MCsFPf07GyFPG3GBfalxGTWnprchogc5BEFtH7rMW08kXhkcS6O3vYFEM9ookr6YqPRNf9L3g= 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 PA4PR04MB7968.eurprd04.prod.outlook.com (2603:10a6:102:c0::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.22; Thu, 13 Jul 2023 10:34:25 +0000 Received: from DB7PR04MB4505.eurprd04.prod.outlook.com ([fe80::f9b0:8c34:e57:92a4]) by DB7PR04MB4505.eurprd04.prod.outlook.com ([fe80::f9b0:8c34:e57:92a4%7]) with mapi id 15.20.6588.017; Thu, 13 Jul 2023 10:34:25 +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 v2 3/3] perf/imx_ddr: don't enable counter0 if none of 4 counters are used Date: Thu, 13 Jul 2023 18:37:58 +0800 Message-Id: <20230713103758.2627269-3-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230713103758.2627269-1-xu.yang_2@nxp.com> References: <20230713103758.2627269-1-xu.yang_2@nxp.com> X-ClientProxiedBy: SI2PR02CA0015.apcprd02.prod.outlook.com (2603:1096:4:194::16) To DB7PR04MB4505.eurprd04.prod.outlook.com (2603:10a6:5:39::26) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR04MB4505:EE_|PA4PR04MB7968:EE_ X-MS-Office365-Filtering-Correlation-Id: 58c0b9a0-8ed7-4c88-541c-08db838cbad8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gyD/1uUfCN8CyIngQwXBgiokgZiNxG1yXjZ9mcRFT4Wda5RQzAXTR0+iccHBFV+JrS1lRqmJp6m0IRRyFk31ZUg2u1Ue20kfxhBSzBu3aWjK4oVZN0kM+T+eZ9+485WYP+OBgEi9dIUftggrbgmd31F9lvh+ko8hzVKeGQ2UW1Ww0wgg9Rd1Lfi1VvrzMAQd6NR2uDMJDnQS6gffl37/5kNOCUfeQItsGGaclAIguVCItoomGtYhyfsmQ4TbCoFh4GFiwcJmHrN//Hlu8dMK3CYEWlzDF9y2v0Sw5+gnmVG4yq0KwT4PG/RHYvHctWSKs5ChZ47f2XILEO3l4/DlKBXkXV1uV5+1B4gf66SfSSeBN90Jcy2otrZ7+JuoWrMWzjuRewfBF/NjcFqja+V241biRPAntHQI2YTgiT0ODWcPc//0p1Y8TqC8y7mSB3EKfKt5BBqOORuwp8mhg6qXg/KnfQINDAr94qhouqhYnYF0C5sIOoFf0OPzmdxhm6uKuEGlIhz2mEjQ5Mi0wuXqCRmcP3RjZkm/Pn2B9MxG/vr7ydsuROKl4HxTPGmpV2/gKuJQcjL1EtJt05szZtMaFTg+pm7AX/6npmDw0Gbsf/Tyqvd5oTKedag8X39O36pr 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)(4636009)(396003)(366004)(346002)(136003)(39860400002)(376002)(451199021)(6512007)(4326008)(1076003)(26005)(6506007)(36756003)(37006003)(38350700002)(38100700002)(8676002)(5660300002)(8936002)(86362001)(41300700001)(316002)(66476007)(2906002)(34206002)(66556008)(6636002)(66946007)(6486002)(52116002)(6666004)(478600001)(83380400001)(2616005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0YwfmcWVBkxy2WsnAaZohST5j1spWBb3XPqtnAHmTZpOhZsm3SwmEf7YjrSyPXeULkJ6eHBZssDOsPFm+43qp+Klx1aTuWA1/yL3i5rwBKYqtSvSkBJrsbZylz4vqFHnjzWs80pIqd4TtpNGrBr3ZwWHKNoXSsE+7CUdIG6it/VOa+NK7E84UxBExslHRew8j6veHaKlVkdkt/WQHsS+lbUtVs6tdVksI6/Pu6O8h1ULUuvjMduUtLWW+2K/ZQXBOTzT2eb/2aNcN6jjCoB7YN55QCC64NgcMhs3+oAQkf7kt0PJYacUZEdl9kATP2kUMroqK2fPmCRt/tWiL5sJNWT79hzTkjc59I8YoMAqhpWlsMKUrJp757I/469IW2BuPJqBWxudIQYuF3rfiUdckzwXY4ysyiVaHvkdGOirMzx6XyN9/uF45umG/MYL384i6vXlK/15HLWv4NfDfOHfERiHPblNN4aau4ml2JRely0MYD83qb3h3zxIMtjv4KlTKD4VBM8pS7TGrqHtHu4pHWK5O27mudV4DuX0zW4KXtjHG4VTyCV8p7R/I5qOp7RvHSYGitT0rPBn9BM0ro4rKLKL+WDo6O6uVR7mWl1ZuKCzTiq7tdegh5xDWAG0H9KgcN6fEvzfCQK1K84uiiaJyx9Q1K+exdvpDBspB1qt3PkEeMMU9fztsjRIL1LeUYL681aRS0qJYwNMuoim9dfOsQ2gSZgo5v6ry/adXKQSN9fYZCIrtEyWEegZ3z5BGf71G3ipOy5RWbAl1kQuh9wuYTptdraiVhK2tvOioqP7y7vQiU7ld9PjBaiic/NKcxQQW+SLLGAOMYmwRhxnsnxQ7S0I0MAlU9uZr/N0W2xwmbCI+VMHH8Qgh32c8XhWQZak/Z4rlrl0qAXZvV+5UKoC0WcNUssTp28g8CQ88LUDIoKBdtVSGhjUqQEKtB9+X6rpFn6oL0FRDy5qAWqyxZxDtsh2HeXGHsS1qN7yXeGggRClYOSBIFhUlfq7ZN2aWJHMQF1nu3XeQT8jzxjfLmU17hJTKPR8s0HTR+B1g9aawBOTLofX3r6abvQpurxzkPFHoNDZGJhE1/f255C4MKX509RUMQpG8yL3Iw73Dudpgxy3yFUawd+W3gOxJIrLnsQsmuB4zxKHY1lLfiSbD5LO2G7jtZccX7oDrq4r+kFRLcaFcVU2OXQTNogWwNkA/hY+GNNKC3k22RD0mHWS/wy4+r87QAdnBdUtQtCFPTHig5oqsqXuw2L7LAi7MOYOq6G4CqKX1e6xyxh+uZgVg4GkfecEv4dU/fubwg2HMBv3rmxBnqyLnq18SLpreImLvc3bW4ZlE7BRbaNSH5zwaN5+yZ0TyiZhWkZaQhjsAd199+38K6b+0ZWJFMTEwIGX2IbmSZeTNr2N88sVY7khL/4xViALyZrDvlVGVLI2P6Tkq9Z9tmU9j5ZR+Dh0OgXsGRbCspc69F5ihYZt8Ehw1ClIou5HU5gTaQdENoJXwWScx9y/4Z/OzIZUTYDPk3PtD+k334IsYmaC+exStMJWg8SIOMrjvsSMw4C3yDz6D6rBm5IQDI9Pq+gmQjL8wEw/zDgS X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58c0b9a0-8ed7-4c88-541c-08db838cbad8 X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB4505.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2023 10:34:25.8360 (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: rJaYVObtM7sunuBjUp874JeNCQqzudnIE2gO9JmQESPrXIAVyPRqpiWA36/8it0LsXsypdHeHJfavhLtO9Mo1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7968 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230713_033430_497884_64E6360B X-CRM114-Status: GOOD ( 15.52 ) 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 Acked-by: Mark Rutland --- Changes in v2: - add active events count as suggested from Frank --- drivers/perf/fsl_imx8_ddr_perf.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c index d65200d4e96e..761e45f21092 100644 --- a/drivers/perf/fsl_imx8_ddr_perf.c +++ b/drivers/perf/fsl_imx8_ddr_perf.c @@ -103,6 +103,7 @@ struct ddr_pmu { const struct fsl_ddr_devtype_data *devtype_data; int irq; int id; + int active_count; }; static ssize_t ddr_perf_identifier_show(struct device *dev, @@ -516,6 +517,9 @@ static void ddr_perf_event_start(struct perf_event *event, int flags) ddr_perf_counter_enable(pmu, event->attr.config, counter, true); + if (counter != EVENT_CYCLES_COUNTER) + pmu->active_count++; + hwc->state = 0; } @@ -569,6 +573,9 @@ 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 (counter != EVENT_CYCLES_COUNTER) + pmu->active_count--; + hwc->state |= PERF_HES_STOPPED; } @@ -589,7 +596,8 @@ 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) + if ((ddr_pmu->events[EVENT_CYCLES_COUNTER] == NULL) + && ddr_pmu->active_count > 0) ddr_perf_counter_enable(ddr_pmu, EVENT_CYCLES_ID, EVENT_CYCLES_COUNTER, @@ -600,7 +608,8 @@ 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) + if ((ddr_pmu->events[EVENT_CYCLES_COUNTER] == NULL) + && ddr_pmu->active_count > 0) ddr_perf_counter_enable(ddr_pmu, EVENT_CYCLES_ID, EVENT_CYCLES_COUNTER,