From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7BF7938239C for ; Sat, 3 Oct 2026 02:53:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790995986; cv=none; b=cQKke7snqJqXKUGPGQTQwaA55RzGBeseEBh8JfAQK+GUAoPG2ys0jggHSCTBzv6gN0SlSslddKcXWd3FDLDroa07n0+hb54QS0l69G2htITqZvsBJIJpMN0wmnbs2OCHDcqlzhyUVa0CQLFOJKgZpaq5j3wX92CSdpr18s33Tcw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790995986; c=relaxed/simple; bh=I5gF1aI6zM3JrpRuocabHDq7OjG3F6Z93bXDNOkqjP0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XecWiK1cMzoLYV+aTuM68LZp44U7fqwDNTZRM28AKUNTFvzfTB7aibscjnOmxCYgKw9aQCO+qrrjwBIDNUhRNMt652IsC6i0PJi49ggJ4Iq+wFcZ/ZUhDWx/ls/mDdNMzt2gIJYXGaUye8I9o1zXAj1ehLM8K/tsMjD7i7xST6k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=nh3LnyNs; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="nh3LnyNs" 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 1AF0E1764; Fri, 2 Oct 2026 19:53:00 -0700 (PDT) Received: from e129823.arm.com (e129823.arm.com [10.2.213.3]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6C6B43F763; Fri, 2 Oct 2026 19:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1790995983; bh=I5gF1aI6zM3JrpRuocabHDq7OjG3F6Z93bXDNOkqjP0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nh3LnyNsMkuDfe4anr6Dz/UpNV5VvsOjAhg752wLCzGpQfVlQAI9wbT2jfjSypZKC 7KChq4k15ELoqXVIuYUIYpDRj60wJ9sk4Djg+VdgeZezeeQs3t7Gbq+5BbUfELs6Z4 he5Fu+GZSTSoalkoaJViXgIK4JHP+xknoxl1SaB8= From: Yeoreum Yun Date: Sat, 03 Oct 2026 03:52:25 +0100 Subject: [PATCH RESEND v13 13/14] coresight: etm3x: rename local config as curr_config referring drvdata->curr_config Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261003-separate_etm_cfg_v2-v13-13-5d8a29aead95@arm.com> References: <20261003-separate_etm_cfg_v2-v13-0-5d8a29aead95@arm.com> In-Reply-To: <20261003-separate_etm_cfg_v2-v13-0-5d8a29aead95@arm.com> To: Mike Leach , James Clark , Leo Yan , Greg Kroah-Hartman , Mathieu Poirier , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev Cc: Suzuki K Poulose , Alexander Shishkin , Sebastian Andrzej Siewior , Clark Williams , Steven Rostedt , Yeoreum Yun X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=7366; i=yeoreum.yun@arm.com; h=from:subject:message-id; bh=I5gF1aI6zM3JrpRuocabHDq7OjG3F6Z93bXDNOkqjP0=; b=owEB7QES/pANAwAKAW3Vw9FaxTEzAcsmYgBqwG3tBaYQ7HGDE5ugVvY26ZdJ2MyMHrrS4+i6J vc7CgzulrGJAbMEAAEKAB0WIQQtg+CS3QUzuFh1pJ1t1cPRWsUxMwUCasBt7QAKCRBt1cPRWsUx M9wwDACINOvWa6550GhuTTdVrGTaUB40OuxQ9u4vSrfLoiAKONKyuNJl/KU3CqkMLtvLKO5C2hg z8mBiSCuFLuJmD2mZ7XE15v5T3KOqZVTtA3Hme95i8j3vEbiKgqyMwdcfceLaTY19u9HtOIUzem APu2MEuY6HG0Hp4gBbHg70MqDson7gCenFwaEFRwwny3nSKrfHh6G1ZOsk3DrZ4Y2tuqVUNDx+y vjfoycC/6FhLspuW1D/x1rvNxekU450LGExnu0bFyuVJNK3HCjgV8pGk0xF3QXX4WUXSplvjndo 3TkpXYA6lw+W1NKZnSTN98w4KZhLzv8wDxTPVWiwzQBEtGjumJeMMDffkcEPGoaXUH8kZIFq/ep oxILjq+rEB68browx/pgrqf/I6ORcWdPyIXHml+llhMDE+gE6zypbajiQpq+L+TRWwhwKv2LrJx PYTRSuY7ZotzYvTKVw5vu7FEG9B0fXgJSAw3xJkqZELDWN8mZJTpIYqza1WxKGQ3InorI= X-Developer-Key: i=yeoreum.yun@arm.com; a=openpgp; fpr=2D83E092DD0533B85875A49D6DD5C3D15AC53133 For readability, rename the local config variable to curr_config in places where it refers to drvdata->curr_config. Reviewed-by: Mike Leach Signed-off-by: Yeoreum Yun --- drivers/hwtracing/coresight/coresight-etm3x-core.c | 76 +++++++++++----------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c index ca2ba179b6fb..0cad9ecb49b6 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c @@ -309,7 +309,7 @@ static int etm_parse_event_config(struct etm_drvdata *drvdata, struct perf_event *event) { const struct etm_caps *caps = &drvdata->caps; - struct etm_config *config = &drvdata->curr_config; + struct etm_config *curr_config = &drvdata->curr_config; struct perf_event_attr *attr = &event->attr; u8 ts_level; @@ -317,28 +317,28 @@ static int etm_parse_event_config(struct etm_drvdata *drvdata, return -EINVAL; /* Clear configuration from previous run */ - memset(config, 0, sizeof(struct etm_config)); + memset(curr_config, 0, sizeof(struct etm_config)); if (attr->exclude_kernel) - config->mode = ETM_MODE_EXCL_KERN; + curr_config->mode = ETM_MODE_EXCL_KERN; if (attr->exclude_user) - config->mode = ETM_MODE_EXCL_USER; + curr_config->mode = ETM_MODE_EXCL_USER; /* Always start from the default config */ - etm_set_default(config); + etm_set_default(curr_config); /* * By default the tracers are configured to trace the whole address * range. Narrow the field only if requested by user space. */ - if (config->mode) - etm_config_trace_mode(config); + if (curr_config->mode) + etm_config_trace_mode(curr_config); - config->ctrl = 0; + curr_config->ctrl = 0; if (ATTR_CFG_GET_FLD(attr, cycacc)) - config->ctrl |= ETMCR_CYC_ACC; + curr_config->ctrl |= ETMCR_CYC_ACC; ts_level = max(ATTR_CFG_GET_FLD(attr, timestamp), ATTR_CFG_GET_FLD(attr, deprecated_timestamp)); @@ -350,7 +350,7 @@ static int etm_parse_event_config(struct etm_drvdata *drvdata, } if (ts_level) - config->ctrl |= ETMCR_TIMESTAMP_EN; + curr_config->ctrl |= ETMCR_TIMESTAMP_EN; /* * Possible to have cores with PTM (supports ret stack) and ETM (never @@ -358,7 +358,7 @@ static int etm_parse_event_config(struct etm_drvdata *drvdata, * - trace will still continue normally otherwise. */ if (ATTR_CFG_GET_FLD(attr, retstack) && (caps->retstack)) - config->ctrl |= ETMCR_RETURN_STACK; + curr_config->ctrl |= ETMCR_RETURN_STACK; return 0; } @@ -368,7 +368,7 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) int i, rc; u32 etmcr; const struct etm_caps *caps = &drvdata->caps; - struct etm_config *config = &drvdata->curr_config; + struct etm_config *curr_config = &drvdata->curr_config; struct coresight_device *csdev = drvdata->csdev; CS_UNLOCK(drvdata->csa.base); @@ -391,39 +391,39 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) etmcr &= ~ETM3X_SUPPORTED_OPTIONS; etmcr |= caps->port_size; etmcr |= ETMCR_ETM_EN; - etm_writel(drvdata, config->ctrl | etmcr, ETMCR); - etm_writel(drvdata, config->trigger_event, ETMTRIGGER); - etm_writel(drvdata, config->startstop_ctrl, ETMTSSCR); - etm_writel(drvdata, config->enable_event, ETMTEEVR); - etm_writel(drvdata, config->enable_ctrl1, ETMTECR1); - etm_writel(drvdata, config->fifofull_level, ETMFFLR); + etm_writel(drvdata, curr_config->ctrl | etmcr, ETMCR); + etm_writel(drvdata, curr_config->trigger_event, ETMTRIGGER); + etm_writel(drvdata, curr_config->startstop_ctrl, ETMTSSCR); + etm_writel(drvdata, curr_config->enable_event, ETMTEEVR); + etm_writel(drvdata, curr_config->enable_ctrl1, ETMTECR1); + etm_writel(drvdata, curr_config->fifofull_level, ETMFFLR); for (i = 0; i < caps->nr_addr_cmp; i++) { - etm_writel(drvdata, config->addr_val[i], ETMACVRn(i)); - etm_writel(drvdata, config->addr_acctype[i], ETMACTRn(i)); + etm_writel(drvdata, curr_config->addr_val[i], ETMACVRn(i)); + etm_writel(drvdata, curr_config->addr_acctype[i], ETMACTRn(i)); } for (i = 0; i < caps->nr_cntr; i++) { - etm_writel(drvdata, config->cntr_rld_val[i], ETMCNTRLDVRn(i)); - etm_writel(drvdata, config->cntr_event[i], ETMCNTENRn(i)); - etm_writel(drvdata, config->cntr_rld_event[i], + etm_writel(drvdata, curr_config->cntr_rld_val[i], ETMCNTRLDVRn(i)); + etm_writel(drvdata, curr_config->cntr_event[i], ETMCNTENRn(i)); + etm_writel(drvdata, curr_config->cntr_rld_event[i], ETMCNTRLDEVRn(i)); - etm_writel(drvdata, config->cntr_val[i], ETMCNTVRn(i)); + etm_writel(drvdata, curr_config->cntr_val[i], ETMCNTVRn(i)); } - etm_writel(drvdata, config->seq_12_event, ETMSQ12EVR); - etm_writel(drvdata, config->seq_21_event, ETMSQ21EVR); - etm_writel(drvdata, config->seq_23_event, ETMSQ23EVR); - etm_writel(drvdata, config->seq_31_event, ETMSQ31EVR); - etm_writel(drvdata, config->seq_32_event, ETMSQ32EVR); - etm_writel(drvdata, config->seq_13_event, ETMSQ13EVR); - etm_writel(drvdata, config->seq_curr_state, ETMSQR); + etm_writel(drvdata, curr_config->seq_12_event, ETMSQ12EVR); + etm_writel(drvdata, curr_config->seq_21_event, ETMSQ21EVR); + etm_writel(drvdata, curr_config->seq_23_event, ETMSQ23EVR); + etm_writel(drvdata, curr_config->seq_31_event, ETMSQ31EVR); + etm_writel(drvdata, curr_config->seq_32_event, ETMSQ32EVR); + etm_writel(drvdata, curr_config->seq_13_event, ETMSQ13EVR); + etm_writel(drvdata, curr_config->seq_curr_state, ETMSQR); for (i = 0; i < caps->nr_ext_out; i++) etm_writel(drvdata, ETM_DEFAULT_EVENT_VAL, ETMEXTOUTEVRn(i)); for (i = 0; i < caps->nr_ctxid_cmp; i++) - etm_writel(drvdata, config->ctxid_pid[i], ETMCIDCVRn(i)); - etm_writel(drvdata, config->ctxid_mask, ETMCIDCMR); - etm_writel(drvdata, config->sync_freq, ETMSYNCFR); + etm_writel(drvdata, curr_config->ctxid_pid[i], ETMCIDCVRn(i)); + etm_writel(drvdata, curr_config->ctxid_mask, ETMCIDCMR); + etm_writel(drvdata, curr_config->sync_freq, ETMSYNCFR); /* No external input selected */ etm_writel(drvdata, 0x0, ETMEXTINSELR); - etm_writel(drvdata, config->timestamp_event, ETMTSEVR); + etm_writel(drvdata, curr_config->timestamp_event, ETMTSEVR); /* No auxiliary control selected */ etm_writel(drvdata, 0x0, ETMAUXCR); etm_writel(drvdata, drvdata->traceid, ETMTRACEIDR); @@ -562,17 +562,17 @@ static void etm_disable_hw(struct etm_drvdata *drvdata) { int i; const struct etm_caps *caps = &drvdata->caps; - struct etm_config *config = &drvdata->curr_config; + struct etm_config *curr_config = &drvdata->curr_config; struct coresight_device *csdev = drvdata->csdev; CS_UNLOCK(drvdata->csa.base); etm_set_prog(drvdata); /* Read back sequencer and counters for post trace analysis */ - config->seq_curr_state = (etm_readl(drvdata, ETMSQR) & ETM_SQR_MASK); + curr_config->seq_curr_state = (etm_readl(drvdata, ETMSQR) & ETM_SQR_MASK); for (i = 0; i < caps->nr_cntr; i++) - config->cntr_val[i] = etm_readl(drvdata, ETMCNTVRn(i)); + curr_config->cntr_val[i] = etm_readl(drvdata, ETMCNTVRn(i)); etm_set_pwrdwn(drvdata); coresight_disclaim_device_unlocked(csdev); -- 2.43.0