Unverified Commit c431540f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11041 coresight: etm4x: Fix unbalanced pm_runtime_enable() 

Merge Pull Request from: @wedm23414 
 
From: Anshuman Khandual anshuman.khandual@arm.com

mainline inclusion
from mainline-v6.11-rc3
commit caa41c47dab7e1054f587e592ab21296e3a6781c
category: bugfix
bugzilla:https://gitee.com/openeuler/kernel/issues/IAKVLJ
Reference:https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=caa41c47dab7e1054f587e592ab21296e3a6781c



coresight: etm4x: Fix unbalanced pm_runtime_enable()
There is an unbalanced pm_runtime_enable() in etm4_probe_platform_dev()
when etm4_probe() fails. This problem can be observed via the coresight
etm4 module's (load -> unload -> load) sequence when etm4_probe() fails
in etm4_probe_platform_dev().

[ 63.379943] coresight-etm4x 7040000.etm: Unbalanced pm_runtime_enable!
[ 63.393630] coresight-etm4x 7140000.etm: Unbalanced pm_runtime_enable!
[ 63.407455] coresight-etm4x 7240000.etm: Unbalanced pm_runtime_enable!
[ 63.420983] coresight-etm4x 7340000.etm: Unbalanced pm_runtime_enable!
[ 63.420999] coresight-etm4x 7440000.etm: Unbalanced pm_runtime_enable!
[ 63.441209] coresight-etm4x 7540000.etm: Unbalanced pm_runtime_enable!
[ 63.454689] coresight-etm4x 7640000.etm: Unbalanced pm_runtime_enable!
[ 63.474982] coresight-etm4x 7740000.etm: Unbalanced pm_runtime_enable!

This fixes the above problem - with an explicit pm_runtime_disable() call
when etm4_probe() fails during etm4_probe_platform_dev().

Cc: Lorenzo Pieralisi lpieralisi@kernel.org
Cc: Hanjun Guo guohanjun@huawei.com
Cc: Sudeep Holla sudeep.holla@arm.com
Cc: "Rafael J. Wysocki" rafael@kernel.org
Cc: Len Brown lenb@kernel.org
Cc: Suzuki K Poulose suzuki.poulose@arm.com
Cc: Mike Leach mike.leach@linaro.org
Cc: James Clark james.clark@arm.com
Cc: Leo Yan leo.yan@linaro.org
Cc: linux-acpi@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: coresight@lists.linaro.org
Fixes: 5214b563 ("coresight: etm4x: Add support for sysreg only devices")
Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWang Lian <dev01404@linx-info.com>
Link: https://lore.kernel.org/r/20240314055843.2625883-2-anshuman.khandual@arm.com 
 
Link:https://gitee.com/openeuler/kernel/pulls/11041

 

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 26bc05c3 421fe7ac

drivers/hwtracing/coresight/coresight-etm4x-core.c

+3 −0
Original line number Diff line number Diff line
@@ -2088,6 +2088,9 @@ static int etm4_probe_platform_dev(struct platform_device *pdev) 
	ret = etm4_probe(&pdev->dev);



	pm_runtime_put(&pdev->dev);

	if (ret)

		pm_runtime_disable(&pdev->dev);



	return ret;

}