Commit f4650088 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Junhao He
Browse files

coresight: etm4x: Allocate and device assign 'struct etmv4_drvdata' earlier 

mainline inclusion
from mainline-v6.5-rc1
commit 3095e90e
category: Cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I89TNS
CVE: NA

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



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

Allocate and device assign 'struct etmv4_drvdata' earlier during the driver
probe, ensuring that it can be retrieved in power management based runtime
callbacks if required. This will also help in dropping iomem base address
argument from the function etm4_probe() later.

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20230710062500.45147-2-anshuman.khandual@arm.com


Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent 1595b7ed

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

+14 −5
Original line number Diff line number Diff line
@@ -1915,18 +1915,15 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid) 
{

	int ret;

	struct coresight_platform_data *pdata = NULL;

	struct etmv4_drvdata *drvdata;

	struct etmv4_drvdata *drvdata = dev_get_drvdata(dev);

	struct coresight_desc desc = { 0 };

	struct etm4_init_arg init_arg = { 0 };

	u8 major, minor;

	char *type_name;



	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

	if (WARN_ON(!drvdata))

		return -ENOMEM;



	dev_set_drvdata(dev, drvdata);



	if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE)

		pm_save_enable = coresight_loses_context_with_cpu(dev) ?

			       PARAM_PM_SAVE_SELF_HOSTED : PARAM_PM_SAVE_NEVER;
@@ -2019,6 +2016,7 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid) 


static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id)

{

	struct etmv4_drvdata *drvdata;

	void __iomem *base;

	struct device *dev = &adev->dev;

	struct resource *res = &adev->res;
@@ -2029,6 +2027,11 @@ static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id) 
	if (IS_ERR(base))

		return PTR_ERR(base);



	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;



	dev_set_drvdata(dev, drvdata);

	ret = etm4_probe(dev, base, id->id);

	if (!ret)

		pm_runtime_put(&adev->dev);
@@ -2038,8 +2041,14 @@ static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id) 


static int etm4_probe_platform_dev(struct platform_device *pdev)

{

	struct etmv4_drvdata *drvdata;

	int ret;



	drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;



	dev_set_drvdata(&pdev->dev, drvdata);

	pm_runtime_get_noresume(&pdev->dev);

	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);