From patchwork Wed May 29 08:03:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xu Yang X-Patchwork-Id: 13678175 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 042F6C25B75 for ; Wed, 29 May 2024 08:04:59 +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=ko5YJWp0odx2FQsozGwyXEW0WkN0/5lo8F8jSwRh9IY=; b=NmMehKM5tK2K8V tOOuh/Mt2tJbgwueAr2e00gV22VDeA0r6eTcwDbdmO9dtjIfih1/kxserboiIZ5P3ZALkq5B0xiKH XZd8Cr6VBVfM8FE/d2f0Cg1x48dnCLukr5ny+g9JVm0+rLCqsZyykvST29LdVLS/Gz78XFMsNcAa6 g6KpoBYa5kTxwIez78jcGPQHbaTloEdBmmxecPuD6qmg17R+KKyAW/yi9vFfiM6R8SUFmo3nuA5A9 seesejYU9rsaxkyFV1BYCQ9Zrv0grtKD5j/2TB8cBSK0NLvJGR1ca8qSPn0ZTybHVN6D++NY4sy4/ qVb3DZs+RbEGnDR6fenw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sCEIf-00000003GTO-45EU; Wed, 29 May 2024 08:04:46 +0000 Received: from mail-am6eur05on20601.outbound.protection.outlook.com ([2a01:111:f403:2612::601] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sCEIa-00000003GQZ-0NzM for linux-arm-kernel@lists.infradead.org; Wed, 29 May 2024 08:04:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cK6FOwBoHhRT4U1tCmnBdisPst89+qj/uELnIkGtteoiYPW7Yrom0wPYZa37ymUE2tyXwj/m02//2rQ6om6xZndH2LmCIETKwDDmFXl42AGcV1df8T9SCDfnaBNY9PJbj9oYA8zpMNuAHuVNw/LHWvoj4NIHEqQU6BrSWiGTvv3fXjDGrKQvqTAOJEArtIc+jtNEDXXRdpYVO70RsGXkam3x8SLKwDQJo/Na9chLL80eXu3psjpHnoMtJTLo9UkxOLO9lP+rXwVQ9frzj7oktcnICCJMT8tFi03zINLMH007R4ixm9lQcC0J7nAoVqv7op34WtRu3rhe/2sggDg6JQ== 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=NgjbABisDP3gRdYq/T7zQX5HLpKMoQ8ELqZNhLllngU=; b=FR0XaRmYrLh5QZ050jV/fAI/k6a8htQm+2RmWuSyw4VtuUTl0ooz1crSJ7q+KEudH+Fc7dm/KWyQSVFSFymNJMZDviKipiG7DUAisuLC0lvh1+B3nkbA5r89A8Kiq2NMy4a42KpE//RaTvjiTsO98tRrWRvOY/QpQubv2LS/kW1Jg45mTRN8bDoFvMWmUqPpfKidIsVCflH/Jf2rssBXFJOvpzQJoFExZYwy7VVwBarAxDBK9P0/rwC2MW0EbwURR7+jodwhRLH16Yexf+4Awy9ZnejZD43rFOva0okWZciRn9dFHMZNdRmEdU/nKL0QVJqAlkhUGc+1zcfEiI7w6A== 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=NgjbABisDP3gRdYq/T7zQX5HLpKMoQ8ELqZNhLllngU=; b=VQYvyvkaue/ZeyrXPAJuB3Z2dDVsT7uURU3GfKJI2HZQi7MT9m6HbJBYhC3V36BZ9uxrr5yEqnsNly7qXZY5QiyedIVXjvoY6TVdru2rdSvh7ewFWiHroyVS7nPs1ODU6uKFSDDVg4x5pqPfPwN0eH89ZmhhqwNuJju7F2tMmdM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) by AS1PR04MB9384.eurprd04.prod.outlook.com (2603:10a6:20b:4d8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.19; Wed, 29 May 2024 08:04:37 +0000 Received: from DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7]) by DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7%4]) with mapi id 15.20.7611.025; Wed, 29 May 2024 08:04:37 +0000 From: Xu Yang To: frank.li@nxp.com, will@kernel.org, mark.rutland@arm.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, john.g.garry@oracle.com, jolsa@kernel.org, namhyung@kernel.org, irogers@google.com Cc: mike.leach@linaro.org, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, alexander.shishkin@linux.intel.com, adrian.hunter@intel.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, imx@lists.linux.dev Subject: [PATCH v12 2/8] perf: imx_perf: add macro definitions for parsing config attr Date: Wed, 29 May 2024 16:03:52 +0800 Message-Id: <20240529080358.703784-2-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240529080358.703784-1-xu.yang_2@nxp.com> References: <20240529080358.703784-1-xu.yang_2@nxp.com> X-ClientProxiedBy: SI2PR01CA0016.apcprd01.prod.exchangelabs.com (2603:1096:4:191::20) To DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8822:EE_|AS1PR04MB9384:EE_ X-MS-Office365-Filtering-Correlation-Id: f7f1a1f5-b54d-4f40-c0b1-08dc7fb5fb40 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|1800799015|52116005|376005|7416005|38350700005|921011; X-Microsoft-Antispam-Message-Info: CGxZb05vDTa+3YZw9Zwf6fIc7BXl22TIhH5/3Ji557jZBecngITsYTB4UiLfNf4kpPG/E41Zbz+xZy3ypcdFuXp7rOY8gMQZ6eyjaLEpnUg0irnX0nowgAfRoLyzP0v1hh2qc5akphKKn4/guU/UNBk1DAxVDqbafigBjMuQ+nurA1NO6sETiGVhi2Gt6OlMxajzZwhKNbZLx7zY7h105GXqG7Cf7fWuNig9fvu6Z3PHDfkoNPXzjkXZvxLF8CtYDOsDjsM1yWxf/g2b2ex5zx3MQVfTPXEysIVzZMJ2NFU8YLf+ksA1a1FTAu4d7FshjqwqXzHOJrsdUdEg4XESoNsa7+P9OhyLBHIC8dvcNKJXpTA+bIe9JfupbBzB9cabgtsKMu+Ivm27bi8+9nqY4Kr56wtucaHRFzQ26NKpPrNHZfmJc8lRgsz3YbqjvIG/nI8u6GtcyIcqplRIOlboxkHr06l8rMaUc+jZISbXRH++IP+GlBRP7TbsRm1BC5V4R861O2q+zQVozmt2BCDmHbwBYwsweTCw7bK0SoUN+zryOLwgirsARNVG/f0T31n2eIvmtL4TvcAk1pOghnu42ageCeSduKvOXjmHz6MAILUpOcBmAHFt0Lo4+O5TDY/j28QlWkpVofI9rlBlNHoUPAtxia7m/LJuBL4LLdLGhf7mM4k7HjEpHFajYmGabcD1/Yo3NtHV+vQAQVrVkfPmrQjw46HFFy9vRSLWLaMAcNEDtQt+egP9z4v2xo5x6Mmtdf3B9enWpB2NrZiE1te3AFOgtz6KiBiKuEOlYJnOwI0nElR2xNiBDS2pPC0w6kOA8gAs6ifLXDcwrlmzY/K2xp28MuTSSIbZLSwp7yKwTzgkNKYXFs+Ckjku7RdS8HaTJHiKMIhLruyLm7+vs3gIhTUhpegkfq/iziYyyzgezph/Hb3XO9/jCyvqh+hQ1ENsC993zwJ6+OSp6BwhWdJw6MvCDR4kEslTzFh9PgaklSUvT7yUyWneFfa2WObjjGCeLZCUjNegLRbbKF5uL9xAoj9UsHSP9BzoOlvGl98NaiofopNiIJNEBPzWbCmTKr6gjyHjKeIAY9jHVxREYsS0Yv6B1prPB/xggsVkRX++f2dwyTiTtFsIb96svpXv1dP8kueOPyGaJTPaENVaQ3erlN5hxCFPRnchTpcLXVQ3kZoBn6qTfLydyen6zjElWF7RBdiBXceWNJoNtNwwifh+ouREPzeNsncSpgaHdzB+HoqE68W8gPgbJZF2vs9LmSyRj63TDnsdZmKuvmJ28FpA+7hjyayUFrJizlgj67NzPT76g/iq0mT/P96tuHiLApUadATlQJqYQB6RiTKFy7/I5pK6U2y8jPzSfaBNK0XcLuY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8822.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(1800799015)(52116005)(376005)(7416005)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9P7BIuxPZ1cKhj/LoLPDxFuPvFIwXU7gnJgFZrLAsfNNtVgZAgKK3Zyq4xz2AvjfGrrZAfoovgGl3MCzpXtMm6Y7HtPqp8lxtTZYysdHxyZNAaVlf/MIWDXUF6DVKKT5xVLTibqVL8JQa/RFasog2buZzYimtOKUA39V0dhlABwOUvFz4L5YYbPJsy/u9j+cpc/vfDXofAP3KVLcqZtxm3jZQYMw+cvgrU6kFoy8EVWHXgsKlJHx3YQzHZcGxvPMLaDddNtpy4xT8clMrwGvbbq6/sGqYMjygFCw+RpO01hy4Cq+hHgcuN2YEGN5MdlbyI+Rw4bhkj/hisN6OUFBdGU82BTpBUaBpBRHqk76kQBM1LnWeHDb+dpwcYxegCX31c+zBu/NgZGR4OVqeWBDTRsuxM8xmDiIp3Ce/09oMD+N+bfqMr1tgMWwY4LKaph+YDY44E/2sOYgte4+vfFgwBNShraWSj/uogoqzxhzH9lN3zp90hGN8/+7iM9NbRWNlz6qW0d/pLw3+zFYQD7g1SUDj4ng1Q+R8Gx3e8x03HCqKHfwZL/8dxl2WaZqcI13tpG8xcV4dWFZ/m0rUokIVWjBDKtohtcW4gqkfiMbNNPsNUEXSHm/MZlyXg+T/2sRnIG1yRJ1tvwAIixY7KjzrjcDQ15uxjhc+IXpw1NU4tlup/Vvym2VWiH2NU0m2esHY50geksWwlL6M+WmjmNO2w4X1N2WlmTzJq/+NKUkv02WXUovC8OrQSjoeG5NtWAy6ee3Y+dQiEzrkJ0rTwuHF6rnpvJPEB3Dq8WGtXDrnTzI3t5VTm688D5oCcYMuU6BRFp0GTu7Au2TzPRJqc331hI3Nq8hcbqKiL1KDExmwpxFpGy1CbHlveijzimaTBpw39toq0KjN+iWf0Dwvo7phKQJQwycFKKoe5HPMVoDWpWFYAUloTq9bn/1mM6Yq2zpRqpQpdKJAa8P+eyr95Y2Pj7n5kSs/nRvJutsnGiG3leLOxNwdmjigsgGkruYL27kqbotV2Ea8/QSt4OmFfOVDgk37hnVIiN00ke8/HpanTomuntCs0eji+2VQ4Kw0XLekiFkjQT7eVayzPVDtSTgSPfw8ASc9hOmzOGN9PHoMuhzyPvsmNwCrrmAh+AZIkhF9NyT/ARWbsZvqNZmweROWsf3KEWe72pnqRQfjqKRq8juCXHEsycHQpd62GtqUvbtGplTG6xWXF5r4lNEpqxkVSVO+OpOB/O0IIw+A/EIsoJxJ62RwSR1+VEbTTwROnJ8LMDm1V5/otc4E0VNWlghH46VGe1woKgUET5LL62LyW6bQmwZtMqYVjEhrRfEnpTx2nu4aAVk+biO79WzkRuhxAKZcI2B+zsMHHtomse51ZTMuV8w1Ay24/dEO4jcVA4Dm8dMY896fOeIoS4HSyi/UWm+o9GETaAdX1i7lC2JbtbG6d/0e6YiS1apY2ZIH9Lq0v2Zv5VuiFOlZsdtx5O30jLChTqgPL1wNv0r2RvkD+OerhRFTv27CxyzlNbVmuX610cDjbtJ3Kp+2Q5Cr/rELXfDVFqPfqMnJfMNDBH3oc1ZbICerVikys6WOw/g6dDp X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7f1a1f5-b54d-4f40-c0b1-08dc7fb5fb40 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2024 08:04:37.2862 (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: oyTLCKZ7PhtsUEkA7TjIcjs1pBMleTuR3LodWfxLlH3skuTiC2Rsg1Czuly0619dA26cZmP3insWKTLzLWr1qg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9384 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240529_010440_164640_43F69F29 X-CRM114-Status: GOOD ( 15.32 ) 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 The user can set event and counter in cmdline and the driver need to parse it using 'config' attr value. This will add macro definitions to avoid hard-code in driver. Reviewed-by: Frank Li Signed-off-by: Xu Yang --- Changes in v4: - new patch Changes in v5: - move this patch earlier Changes in v6: - no changes Changes in v7: - use FIELD_* Changes in v8: - add Rb tag Changes in v9: - add Rb tag Changes in v10: - no changes Changes in v11: - no changes Changes in v12: - rename CONFIG_EVENT/COUNTER to avoid conflict from Kbuild CONFIG_COUNTER --- drivers/perf/fsl_imx9_ddr_perf.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/perf/fsl_imx9_ddr_perf.c b/drivers/perf/fsl_imx9_ddr_perf.c index 72c2d3074cde..c4caeab7a9be 100644 --- a/drivers/perf/fsl_imx9_ddr_perf.c +++ b/drivers/perf/fsl_imx9_ddr_perf.c @@ -42,6 +42,9 @@ #define NUM_COUNTERS 11 #define CYCLES_COUNTER 0 +#define CONFIG_EVENT_MASK GENMASK(7, 0) +#define CONFIG_COUNTER_MASK GENMASK(15, 8) + #define to_ddr_pmu(p) container_of(p, struct ddr_pmu, pmu) #define DDR_PERF_DEV_NAME "imx9_ddr" @@ -339,8 +342,10 @@ static void ddr_perf_counter_local_config(struct ddr_pmu *pmu, int config, int counter, bool enable) { u32 ctrl_a; + int event; ctrl_a = readl_relaxed(pmu->base + PMLCA(counter)); + event = FIELD_GET(CONFIG_EVENT_MASK, config); if (enable) { ctrl_a |= PMLCA_FC; @@ -352,7 +357,7 @@ static void ddr_perf_counter_local_config(struct ddr_pmu *pmu, int config, ctrl_a &= ~PMLCA_FC; ctrl_a |= PMLCA_CE; ctrl_a &= ~FIELD_PREP(PMLCA_EVENT, 0x7F); - ctrl_a |= FIELD_PREP(PMLCA_EVENT, (config & 0x000000FF)); + ctrl_a |= FIELD_PREP(PMLCA_EVENT, event); writel(ctrl_a, pmu->base + PMLCA(counter)); } else { /* Freeze counter. */ @@ -366,8 +371,8 @@ static void ddr_perf_monitor_config(struct ddr_pmu *pmu, int cfg, int cfg1, int u32 pmcfg1, pmcfg2; int event, counter; - event = cfg & 0x000000FF; - counter = (cfg & 0x0000FF00) >> 8; + event = FIELD_GET(CONFIG_EVENT_MASK, cfg); + counter = FIELD_GET(CONFIG_COUNTER_MASK, cfg); pmcfg1 = readl_relaxed(pmu->base + PMCFG1); @@ -469,7 +474,7 @@ static int ddr_perf_event_add(struct perf_event *event, int flags) int cfg2 = event->attr.config2; int counter; - counter = (cfg & 0x0000FF00) >> 8; + counter = FIELD_GET(CONFIG_COUNTER_MASK, cfg); pmu->events[counter] = event; pmu->active_events++;