From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12AEB13C918 for ; Wed, 15 Apr 2026 04:25:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776227117; cv=none; b=NMrLRr+ACl3g4Q/Apao90p3yneXBhLu7EEEGcJ5D7GqkRzaafLfRvzWerLuALlbeP8bgqjQ3+3qdfOyt0YadjWEBSlz5dxRrc9whUx8ZcFmHULqbQNRLrbn6B8Uqzb84L/Bt5/1ksc1ZGxAZeci4BsmDIQV5+hN1bToORuikrSc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776227117; c=relaxed/simple; bh=CZ6Efh9jl4VhpPmQgS68LENosH6VLeZ3qCn8g19Q914=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=JrXs5Y7Bg3wBLQv6RecYtn6dsWRbYMzuyPh7lssZl/Y67XJVOB7YzmLAyxtHXPjeCtSAUNnUFQCrMR90LN9v0ncfpVAZeRHU+P3bpzMM5JB+6wsHBUTOC4bPRdswb/Y5FP4XDuOeHb6Id6Jvgf2K8r55zVoVobBQ7hgPjuYGmgM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=bhm4DD6M; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GijTxDAv; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="bhm4DD6M"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GijTxDAv" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63F2oPUl1778950 for ; Wed, 15 Apr 2026 04:25:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 8DZx9OY8lmpYKIAqzgqUoG+97imZ8CZhlT8ahlh/X/4=; b=bhm4DD6MYGcbqjuO Nr+Nik4l7FIrkZMvpSjFsxPYFwj3xmnmexBuYrUGg7e7ujfE8ZjLC8feSz7nYnH4 jwHUAz40SWKQ0ztnFge5PAGKn1T+0PlXHHJWuddU51j3pB9FU3kO5h5W004Vubog udfXWgbs08f+ry//cpJu5tWXtDE4MAsBv3/p4hz7z2Q0BwpFWHZgrcF9X9gsjl2t QrtxDFEi/3iTSNqwZUJnHE/MpkLvBbzkPdgN0Ay4GM72oqYQoAwO1erR8fWDpzjZ TPs8wE9OOdHg9vpkBC7u8xd4u9l9hY04k9pY4VIhbqFvcyY/kICn6s40fHDZubCd F83rTw== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dhrw01ygg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 15 Apr 2026 04:25:15 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2b2523e0299so160188515ad.3 for ; Tue, 14 Apr 2026 21:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1776227114; x=1776831914; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=8DZx9OY8lmpYKIAqzgqUoG+97imZ8CZhlT8ahlh/X/4=; b=GijTxDAvEEY9KrdRxwMoJitxShC48qdGX3F5xBxzYu76XKhLA0dd4+ciylrjgd6hOo hXojt/R9h+vBjTpKtX0jSb8hwdq98j9e/xVocn5nVzOezF17sOCRtEr6J74C2g8h2I3y TUnyaiie0c9FxzivrRLenSQZg0K960kbu01flxG5vkg/VGj6yWMMQSNUfm91RZuXd85T ZY+hNxIfjkHSgfS10aMVr1QFnw80YBfXqbkgw8vku/JMdCx4aUi0tndMfnRuRPbao8dv WA4N0DzEucwzNbYlfSxI8vrpBSmZK13RwESe3KEvavy8nXjQflhpw3HJDYcuz7QQmKaq qFNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776227114; x=1776831914; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8DZx9OY8lmpYKIAqzgqUoG+97imZ8CZhlT8ahlh/X/4=; b=Op3oCgs61sPwqdum9/9gEuNFSdUypoxKIQEpUsJJu9vISzBtaLiZLzAZE1re3bC9z9 P/gOA91hUDvvMuynnxGGJoQKho5y8i4PVKx2Q2ZgZtaT7rH946bCGwN4IDmTsn7kWUhM ypu8ihvCVg5dAD3xjl5GwLRTdB/egOU7AcOjGUIHvpIXR8rrwQeCHrgwoTdotK42RJEJ zfScyY/pWg1clsZFDRKG/lnZL6Sng/Mpxqa9QLH5yzMfPwKI9CPklZlwa3DE9L9hYQK+ oWahJXZ08Cov9kp8BV67lHCVwUJY/MBJpF7AuvSUoLG0Gt8nKZR4DjJ9otSfKV+p5/b4 ga8Q== X-Forwarded-Encrypted: i=1; AFNElJ9xlXv817d6q2YOXtMI+zBHIVqTNU9vPf+P17DKA23jmI+5U6xPeo3891iwJ01XTRf3jR7h2vruMthoGPI=@vger.kernel.org X-Gm-Message-State: AOJu0YxB3j/J/vvrnmTTQ7j4JBHb/I2NpDgxPA2UN9C085uugtDLTfcl WxF+2sOlUHFzvJZMwxX+DKbGYE08hiOHQfePtUWuMcLsq5La/zeBBWJXPhosEAsm/ZW4HxEGJWb r0IVS+KvXqflGA/2zrCn4Pvpj4eXG8pGDfWx9cmRFP6/IjUPkMYk4Uvk2S9YOAiz1k+4= X-Gm-Gg: AeBDiesjPVCfTe6ei3fmj7PsJCXD2LF6DOKgqIY5JIxCkXc/NepbVNBSlSojSc+omCA kqmFiQnucTnl3ZmxnBuwfu/CQHyedqJfUbumeNRxkOz4ExGuUkJZ/6WZxcGidU6Q9qH8kMcEpx8 22jgrQu49bEUe1aDKK7zCVJ/Q/1tCZmOUB8LpK0NBKajANBEqqtskSUgfghn0QhnDK+rCcZA0bv r9ViYaK1VBndJStx/t3Gzrs15tILpV5bNBSD+WzCjiu5O0K2xXgbWND1K6Gc9K7QKK8a3aKUcyR JKRMZKzinOukZ0+PyvOh/ftSAuCbI2OYymzW4ifT0oLek5e7KQswNEAboFIEcSrg9OlL5tDNXur 8A1jy/kbwaFfNVN8wJvySotA9+1cCn1FNpz7RMxPJftLgG8ZNm8Ma/NlPm2IbSFkkaX3TtOVFLf WVLBtGQeU8p64= X-Received: by 2002:a17:902:b213:b0:2b2:5503:1b8d with SMTP id d9443c01a7336-2b2d5938b1fmr155164425ad.6.1776227114313; Tue, 14 Apr 2026 21:25:14 -0700 (PDT) X-Received: by 2002:a17:902:b213:b0:2b2:5503:1b8d with SMTP id d9443c01a7336-2b2d5938b1fmr155164205ad.6.1776227113686; Tue, 14 Apr 2026 21:25:13 -0700 (PDT) Received: from [10.133.33.185] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b4782a93c7sm5440315ad.62.2026.04.14.21.25.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Apr 2026 21:25:12 -0700 (PDT) Message-ID: Date: Wed, 15 Apr 2026 12:25:09 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 4/9] coresight: etm4x: fix inconsistencies with sysfs configuration To: Yeoreum Yun , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: suzuki.poulose@arm.com, mike.leach@arm.com, james.clark@linaro.org, alexander.shishkin@linux.intel.com, leo.yan@arm.com References: <20260413142003.3549310-1-yeoreum.yun@arm.com> <20260413142003.3549310-5-yeoreum.yun@arm.com> Content-Language: en-US From: Jie Gan In-Reply-To: <20260413142003.3549310-5-yeoreum.yun@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-GUID: 1A92Cl55Z7VcCJRM3ZWuoNDT-fJ8-FFy X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE1MDAzOCBTYWx0ZWRfXyFuW3JxUw2Dv U72DbsbJcZcNZBq7O1VtaVIsIr8/HPPXrnGzsREStzCZh/28/XQdwPF/1qF0lLVZuArUwS6+ppd ic2WIiKEVj727zrVG8KbWpK/GWcyJmyVjCJmzanBLk+nKbhB/JmWouhqH3d66g+6qcGcytwqpMv lrZjRhglJygyH5nf9C68gAVwJ6Goy1aean1/OiOsNpQ99M48kga8EJKWnhRrlX8K9HlaMXHIzs7 1Pa8GoVZ51oEfDy8VXIiEFCsY6KqZ6Ip1PNPQ8VFV1wmlRyKBNj9s1vh3Ttf63IiVmRyPx5YRKD 630qX05gmdXoyt93Y4JFbv5h33nVD6TD/KkkEPaS5sbFL6cOKJby2q8w5hgQSdDUs9Z7ewOchDH +Nbl2iea2uUKu2Y1zJ2odrnNwOCNfq6VeFxG1PsunKieDSoFn+XAVdysGeeqFv7d7Q9jOJ4/RPh zGVjjbOMDuVu1LqIhlg== X-Proofpoint-ORIG-GUID: 1A92Cl55Z7VcCJRM3ZWuoNDT-fJ8-FFy X-Authority-Analysis: v=2.4 cv=YMGvDxGx c=1 sm=1 tr=0 ts=69df132b cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=7CQSdrXTAAAA:8 a=bZ0XY3ee3ZOhc1Ytu_MA:9 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-14_04,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 clxscore=1015 malwarescore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604070000 definitions=main-2604150038 On 4/13/2026 10:19 PM, Yeoreum Yun wrote: > The current ETM4x configuration via sysfs can lead to > several inconsistencies: > > - If the configuration is modified via sysfs while a perf session is > active, the running configuration may differ before a sched-out and > after a subsequent sched-in. > > - If a perf session and a sysfs session enable tracing concurrently, > the configuration from configfs may become corrupted. > > - There is a risk of corrupting drvdata->config if a perf session enables > tracing while cscfg_csdev_disable_active_config() is being handled in > etm4_disable_sysfs(). > > To resolve these issues, separate the configuration into: > > - active_config: the configuration applied to the current session > - config: the configuration set via sysfs > > Additionally: > > - Apply the configuration from configfs after taking the appropriate mode. > > - Since active_config and related fields are accessed only by the local CPU > in etm4_enable/disable_sysfs_smp_call() (similar to perf enable/disable), > remove the lock/unlock from the sysfs enable/disable path and > startup/dying_cpu except when to access config fields. > > Signed-off-by: Yeoreum Yun > --- > .../hwtracing/coresight/coresight-etm4x-cfg.c | 2 +- > .../coresight/coresight-etm4x-core.c | 107 ++++++++++-------- > drivers/hwtracing/coresight/coresight-etm4x.h | 2 + > 3 files changed, 62 insertions(+), 49 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-cfg.c b/drivers/hwtracing/coresight/coresight-etm4x-cfg.c > index d14d7c8a23e5..0553771d04e7 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-cfg.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-cfg.c > @@ -47,7 +47,7 @@ static int etm4_cfg_map_reg_offset(struct etmv4_drvdata *drvdata, > struct cscfg_regval_csdev *reg_csdev, u32 offset) > { > int err = -EINVAL, idx; > - struct etmv4_config *drvcfg = &drvdata->config; > + struct etmv4_config *drvcfg = &drvdata->active_config; > u32 off_mask; > > if (((offset >= TRCEVENTCTL0R) && (offset <= TRCVIPCSSCTLR)) || > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 1bc9f13e33f7..01099689525b 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -245,6 +245,10 @@ void etm4_release_trace_id(struct etmv4_drvdata *drvdata) > > struct etm4_enable_arg { > struct etmv4_drvdata *drvdata; > + unsigned long cfg_hash; > + int preset; > + u8 trace_id; > + struct etmv4_config config; > int rc; > }; > > @@ -270,10 +274,11 @@ static void etm4x_prohibit_trace(struct etmv4_drvdata *drvdata) > static u64 etm4x_get_kern_user_filter(struct etmv4_drvdata *drvdata) > { > u64 trfcr = drvdata->trfcr; > + struct etmv4_config *config = &drvdata->active_config; > > - if (drvdata->config.mode & ETM_MODE_EXCL_KERN) > + if (config->mode & ETM_MODE_EXCL_KERN) > trfcr &= ~TRFCR_EL1_ExTRE; > - if (drvdata->config.mode & ETM_MODE_EXCL_USER) > + if (config->mode & ETM_MODE_EXCL_USER) > trfcr &= ~TRFCR_EL1_E0TRE; > > return trfcr; > @@ -281,7 +286,7 @@ static u64 etm4x_get_kern_user_filter(struct etmv4_drvdata *drvdata) > > /* > * etm4x_allow_trace - Allow CPU tracing in the respective ELs, > - * as configured by the drvdata->config.mode for the current > + * as configured by the drvdata->active_config.mode for the current > * session. Even though we have TRCVICTLR bits to filter the > * trace in the ELs, it doesn't prevent the ETM from generating > * a packet (e.g, TraceInfo) that might contain the addresses from > @@ -292,12 +297,13 @@ static u64 etm4x_get_kern_user_filter(struct etmv4_drvdata *drvdata) > static void etm4x_allow_trace(struct etmv4_drvdata *drvdata) > { > u64 trfcr, guest_trfcr; > + struct etmv4_config *config = &drvdata->active_config; > > /* If the CPU doesn't support FEAT_TRF, nothing to do */ > if (!drvdata->trfcr) > return; > > - if (drvdata->config.mode & ETM_MODE_EXCL_HOST) > + if (config->mode & ETM_MODE_EXCL_HOST) > trfcr = drvdata->trfcr & ~(TRFCR_EL1_ExTRE | TRFCR_EL1_E0TRE); > else > trfcr = etm4x_get_kern_user_filter(drvdata); > @@ -305,7 +311,7 @@ static void etm4x_allow_trace(struct etmv4_drvdata *drvdata) > write_trfcr(trfcr); > > /* Set filters for guests and pass to KVM */ > - if (drvdata->config.mode & ETM_MODE_EXCL_GUEST) > + if (config->mode & ETM_MODE_EXCL_GUEST) > guest_trfcr = drvdata->trfcr & ~(TRFCR_EL1_ExTRE | TRFCR_EL1_E0TRE); > else > guest_trfcr = etm4x_get_kern_user_filter(drvdata); > @@ -499,7 +505,7 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) > { > int i, rc; > const struct etmv4_caps *caps = &drvdata->caps; > - struct etmv4_config *config = &drvdata->config; > + struct etmv4_config *config = &drvdata->active_config; > struct coresight_device *csdev = drvdata->csdev; > struct device *etm_dev = &csdev->dev; > struct csdev_access *csa = &csdev->access; > @@ -616,23 +622,46 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) > static void etm4_enable_sysfs_smp_call(void *info) > { > struct etm4_enable_arg *arg = info; > + struct etmv4_drvdata *drvdata; > struct coresight_device *csdev; > > if (WARN_ON(!arg)) > return; > > - csdev = arg->drvdata->csdev; > + drvdata = arg->drvdata; > + csdev = drvdata->csdev; > if (!coresight_take_mode(csdev, CS_MODE_SYSFS)) { > /* Someone is already using the tracer */ > arg->rc = -EBUSY; > return; > } > > - arg->rc = etm4_enable_hw(arg->drvdata); > + drvdata->active_config = arg->config; > > - /* The tracer didn't start */ > + if (arg->cfg_hash) { > + arg->rc = cscfg_csdev_enable_active_config(csdev, > + arg->cfg_hash, > + arg->preset); > + if (arg->rc) > + goto err; > + } > + > + drvdata->trcid = arg->trace_id; > + > + /* Tracer will never be paused in sysfs mode */ > + drvdata->paused = false; > + > + arg->rc = etm4_enable_hw(drvdata); > if (arg->rc) > - coresight_set_mode(csdev, CS_MODE_DISABLED); > + goto err; > + > + drvdata->sticky_enable = true; > + > + return; > +err: > + /* The tracer didn't start */ > + etm4_release_trace_id(drvdata); [NIT] better move this error handle to etm4_enable_sysfs. smp_call_function_single possible return before call etm4_enable_sysfs_smp_call if the cpu is offline. The error path here cannot handle this error, breaking previous logic(handle all errors in etm4_enable_sysfs by releasing trace id). There is no harm in not releasing the trace id here because ETM can re-use the allocated trace ID. But it's better to fix the inconsistent logic. Thanks, Jie > + coresight_set_mode(csdev, CS_MODE_DISABLED); > } > > /* > @@ -670,7 +699,7 @@ static int etm4_config_timestamp_event(struct etmv4_drvdata *drvdata, > int ctridx; > int rselector; > const struct etmv4_caps *caps = &drvdata->caps; > - struct etmv4_config *config = &drvdata->config; > + struct etmv4_config *config = &drvdata->active_config; > > /* No point in trying if we don't have at least one counter */ > if (!caps->nr_cntr) > @@ -754,7 +783,7 @@ static int etm4_parse_event_config(struct coresight_device *csdev, > int ret = 0; > struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > const struct etmv4_caps *caps = &drvdata->caps; > - struct etmv4_config *config = &drvdata->config; > + struct etmv4_config *config = &drvdata->active_config; > struct perf_event_attr max_timestamp = { > .ATTR_CFG_FLD_timestamp_CFG = U64_MAX, > }; > @@ -916,38 +945,24 @@ static int etm4_enable_sysfs(struct coresight_device *csdev, struct coresight_pa > > /* enable any config activated by configfs */ > cscfg_config_sysfs_get_active_cfg(&cfg_hash, &preset); > - if (cfg_hash) { > - ret = cscfg_csdev_enable_active_config(csdev, cfg_hash, preset); > - if (ret) { > - etm4_release_trace_id(drvdata); > - return ret; > - } > - } > - > - raw_spin_lock(&drvdata->spinlock); > - > - drvdata->trcid = path->trace_id; > - > - /* Tracer will never be paused in sysfs mode */ > - drvdata->paused = false; > > /* > * Executing etm4_enable_hw on the cpu whose ETM is being enabled > * ensures that register writes occur when cpu is powered. > */ > arg.drvdata = drvdata; > + arg.cfg_hash = cfg_hash; > + arg.preset = preset; > + arg.trace_id = path->trace_id; > + > + raw_spin_lock(&drvdata->spinlock); > + arg.config = drvdata->config; > + raw_spin_unlock(&drvdata->spinlock); > + > ret = smp_call_function_single(drvdata->cpu, > etm4_enable_sysfs_smp_call, &arg, 1); > if (!ret) > ret = arg.rc; > - if (!ret) > - drvdata->sticky_enable = true; > - > - if (ret) > - etm4_release_trace_id(drvdata); > - > - raw_spin_unlock(&drvdata->spinlock); > - > if (!ret) > dev_dbg(&csdev->dev, "ETM tracing enabled\n"); > return ret; > @@ -1036,7 +1051,7 @@ static void etm4_disable_hw(struct etmv4_drvdata *drvdata) > { > u32 control; > const struct etmv4_caps *caps = &drvdata->caps; > - struct etmv4_config *config = &drvdata->config; > + struct etmv4_config *config = &drvdata->active_config; > struct coresight_device *csdev = drvdata->csdev; > struct csdev_access *csa = &csdev->access; > int i; > @@ -1072,6 +1087,8 @@ static void etm4_disable_sysfs_smp_call(void *info) > > etm4_disable_hw(drvdata); > > + cscfg_csdev_disable_active_config(drvdata->csdev); > + > coresight_set_mode(drvdata->csdev, CS_MODE_DISABLED); > } > > @@ -1122,7 +1139,6 @@ static void etm4_disable_sysfs(struct coresight_device *csdev) > * DYING hotplug callback is serviced by the ETM driver. > */ > cpus_read_lock(); > - raw_spin_lock(&drvdata->spinlock); > > /* > * Executing etm4_disable_hw on the cpu whose ETM is being disabled > @@ -1131,10 +1147,6 @@ static void etm4_disable_sysfs(struct coresight_device *csdev) > smp_call_function_single(drvdata->cpu, etm4_disable_sysfs_smp_call, > drvdata, 1); > > - raw_spin_unlock(&drvdata->spinlock); > - > - cscfg_csdev_disable_active_config(csdev); > - > cpus_read_unlock(); > > /* > @@ -1377,6 +1389,7 @@ static void etm4_init_arch_data(void *info) > struct etm4_init_arg *init_arg = info; > struct etmv4_drvdata *drvdata; > struct etmv4_caps *caps; > + struct etmv4_config *config; > struct csdev_access *csa; > struct device *dev = init_arg->dev; > int i; > @@ -1384,6 +1397,7 @@ static void etm4_init_arch_data(void *info) > drvdata = dev_get_drvdata(init_arg->dev); > caps = &drvdata->caps; > csa = init_arg->csa; > + config = &drvdata->active_config; > > /* > * If we are unable to detect the access mechanism, > @@ -1444,7 +1458,7 @@ static void etm4_init_arch_data(void *info) > > /* EXLEVEL_S, bits[19:16] Secure state instruction tracing */ > caps->s_ex_level = FIELD_GET(TRCIDR3_EXLEVEL_S_MASK, etmidr3); > - drvdata->config.s_ex_level = caps->s_ex_level; > + config->s_ex_level = caps->s_ex_level; > /* EXLEVEL_NS, bits[23:20] Non-secure state instruction tracing */ > caps->ns_ex_level = FIELD_GET(TRCIDR3_EXLEVEL_NS_MASK, etmidr3); > /* > @@ -1689,7 +1703,7 @@ static void etm4_set_default(struct etmv4_config *config) > static int etm4_get_next_comparator(struct etmv4_drvdata *drvdata, u32 type) > { > int nr_comparator, index = 0; > - struct etmv4_config *config = &drvdata->config; > + struct etmv4_config *config = &drvdata->active_config; > > /* > * nr_addr_cmp holds the number of comparator _pair_, so time 2 > @@ -1730,7 +1744,7 @@ static int etm4_set_event_filters(struct etmv4_drvdata *drvdata, > { > int i, comparator, ret = 0; > u64 address; > - struct etmv4_config *config = &drvdata->config; > + struct etmv4_config *config = &drvdata->active_config; > struct etm_filters *filters = event->hw.addr_filters; > > if (!filters) > @@ -1848,13 +1862,11 @@ static int etm4_starting_cpu(unsigned int cpu) > if (!etmdrvdata[cpu]) > return 0; > > - raw_spin_lock(&etmdrvdata[cpu]->spinlock); > if (!etmdrvdata[cpu]->os_unlock) > etm4_os_unlock(etmdrvdata[cpu]); > > if (coresight_get_mode(etmdrvdata[cpu]->csdev)) > etm4_enable_hw(etmdrvdata[cpu]); > - raw_spin_unlock(&etmdrvdata[cpu]->spinlock); > return 0; > } > > @@ -1863,10 +1875,8 @@ static int etm4_dying_cpu(unsigned int cpu) > if (!etmdrvdata[cpu]) > return 0; > > - raw_spin_lock(&etmdrvdata[cpu]->spinlock); > if (coresight_get_mode(etmdrvdata[cpu]->csdev)) > etm4_disable_hw(etmdrvdata[cpu]); > - raw_spin_unlock(&etmdrvdata[cpu]->spinlock); > return 0; > } > > @@ -2252,7 +2262,8 @@ static int etm4_add_coresight_dev(struct etm4_init_arg *init_arg) > if (!desc.name) > return -ENOMEM; > > - etm4_set_default(&drvdata->config); > + etm4_set_default(&drvdata->active_config); > + drvdata->config = drvdata->active_config; > > pdata = coresight_get_platform_data(dev); > if (IS_ERR(pdata)) > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h > index 8864cfb76bad..725e6360a8b9 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.h > +++ b/drivers/hwtracing/coresight/coresight-etm4x.h > @@ -1071,6 +1071,7 @@ struct etmv4_save_state { > * allows tracing at all ELs. We don't want to compute this > * at runtime, due to the additional setting of TRFCR_CX when > * in EL2. Otherwise, 0. > + * @active_config: structure holding current applied configuration parameters. > * @config: structure holding configuration parameters. > * @save_state: State to be preserved across power loss > * @paused: Indicates if the trace unit is paused. > @@ -1091,6 +1092,7 @@ struct etmv4_drvdata { > bool os_unlock : 1; > bool paused : 1; > u64 trfcr; > + struct etmv4_config active_config; > struct etmv4_config config; > struct etmv4_save_state *save_state; > DECLARE_BITMAP(arch_features, ETM4_IMPDEF_FEATURE_MAX);