Commit 3c9b2713 authored Oct 28, 2023 by Suzuki K Poulose Committed by Junhao He Oct 28, 2023

coresight: trbe: Allocate platform data per device

mainline inclusion
from mainline-v6.5-rc1
commit 39744738
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8BC14
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=39744738a67de9153d73e11817937c0004feab2e

--------------------------------

Coresight TRBE driver shares a single platform data (which is empty btw).
However, with the commit 4e8fe7e5
("coresight: Store pointers to connections rather than an array of them")
the coresight core would free up the pdata, resulting in multiple attempts
to free the same pdata for TRBE instances. Fix this by allocating a pdata per
coresight_device.

Fixes: 4e8fe7e5 ("coresight: Store pointers to connections rather than an array of them")
Link: https://lore.kernel.org/r/20230814093813.19152-3-hejunhao3@huawei.com


Reported-by: Junhao He <hejunhao3@huawei.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: James Clark <james.clark@arm.com>
Tested-by: Junhao He <hejunhao3@huawei.com>
Link: https://lore.kernel.org/r/20230816141008.535450-2-suzuki.poulose@arm.com


Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Junhao He <hejunhao3@huawei.com>

parent 23fecda7

drivers/hwtracing/coresight/coresight-trbe.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -940,10 +940,13 @@ static void arm_trbe_register_coresight_cpu(struct trbe_drvdata *drvdata, int cp
		if (!desc.name)
		goto cpu_clear;

		desc.pdata = coresight_get_platform_data(dev);
		if (IS_ERR(desc.pdata))
		goto cpu_clear;

		desc.type = CORESIGHT_DEV_TYPE_SINK;
		desc.subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_PERCPU_SYSMEM;
		desc.ops = &arm_trbe_cs_ops;
		desc.pdata = dev_get_platdata(dev);
		desc.groups = arm_trbe_groups;
		desc.dev = dev;
		trbe_csdev = coresight_register(&desc);
		@@ -1137,7 +1140,6 @@ static void arm_trbe_remove_irq(struct trbe_drvdata *drvdata)

		static int arm_trbe_device_probe(struct platform_device *pdev)
		{
		struct coresight_platform_data *pdata;
		struct trbe_drvdata *drvdata;
		struct device *dev = &pdev->dev;
		int ret;
		@@ -1146,12 +1148,7 @@ static int arm_trbe_device_probe(struct platform_device *pdev)
		if (!drvdata)
		return -ENOMEM;

		pdata = coresight_get_platform_data(dev);
		if (IS_ERR(pdata))
		return PTR_ERR(pdata);

		dev_set_drvdata(dev, drvdata);
		dev->platform_data = pdata;
		drvdata->pdev = pdev;
		ret = arm_trbe_probe_irq(pdev, drvdata);
		if (ret)