When changes [1] and [2] have been applied to the driver etm4x, the
same modifications have been also collapsed in [3] and applied in
one shot to the driver etm3x.
While doing this, the driver etm3x has not been aligned to etm4x on
the use of non cpuslocked version of cpuhp callback setup APIs.

The current code triggers two run-time warnings when the kernel is
compiled with CONFIG_PROVE_LOCKING=y.

Use non cpuslocked version of cpuhp callback setup APIs in driver
etm3x, aligning it to the driver etm4x.

[1] commit 2d1a8bfb61ec ("coresight: etm4x: Fix etm4_count race by
                          moving cpuhp callbacks to init")
[2] commit 22a550a306ad ("coresight: etm4x: Allow etm4x to be built
                          as a module")
[3] commit 97fe626ce64c ("coresight: etm3x: Allow etm3x to be built
                          as a module")

Fixes: 97fe626ce64c ("coresight: etm3x: Allow etm3x to be built as a module")
Signed-off-by: Antonio Borneo <antonio.borneo@foss.st.com>
---
To: Suzuki K Poulose <suzuki.poulose@arm.com>
To: Mike Leach <mike.leach@linaro.org>
To: James Clark <james.clark@arm.com>
To: Leo Yan <leo.yan@linaro.org>
To: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Tingwei Zhang <quic_tingwei@quicinc.com>
To: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Kim Phillips <kim.phillips@arm.com>
To: Sai Prakash Ranjan <quic_saipraka@quicinc.com>
To: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
---
 drivers/hwtracing/coresight/coresight-etm3x-core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c
index a5e809589d3e3..0c011b7041696 100644
--- a/drivers/hwtracing/coresight/coresight-etm3x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c
@@ -795,16 +795,16 @@ static int __init etm_hp_setup(void)
 {
 	int ret;
 
-	ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ARM_CORESIGHT_STARTING,
-						   "arm/coresight:starting",
-						   etm_starting_cpu, etm_dying_cpu);
+	ret = cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING,
+					"arm/coresight:starting",
+					etm_starting_cpu, etm_dying_cpu);
 
 	if (ret)
 		return ret;
 
-	ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN,
-						   "arm/coresight:online",
-						   etm_online_cpu, NULL);
+	ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
+					"arm/coresight:online",
+					etm_online_cpu, NULL);
 
 	/* HP dyn state ID returned in ret on success */
 	if (ret > 0) {

base-commit: 8f0b4cce4481fb22653697cced8d0d04027cb1e8
-- 
2.34.1

On Thu, 08 Jan 2026 16:24:27 +0100, Antonio Borneo wrote:
> When changes [1] and [2] have been applied to the driver etm4x, the
> same modifications have been also collapsed in [3] and applied in
> one shot to the driver etm3x.
> While doing this, the driver etm3x has not been aligned to etm4x on
> the use of non cpuslocked version of cpuhp callback setup APIs.
> 
> The current code triggers two run-time warnings when the kernel is
> compiled with CONFIG_PROVE_LOCKING=y.
> 
> [...]

Applied, thanks!

[1/1] coresight: etm3x: Fix cpulocked warning on cpuhp
      https://git.kernel.org/coresight/c/1feb0377b9b8

Best regards,
-- 
Suzuki K Poulose <suzuki.poulose@arm.com>