If we failed to setup the DMA mask for TMC-ETR, report the error before failing the probe.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-tmc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index 2a02da3..647b6aa 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -340,6 +340,8 @@ static inline bool tmc_etr_can_use_sg(struct tmc_drvdata *drvdata) static int tmc_etr_setup_caps(struct tmc_drvdata *drvdata, u32 devid, void *dev_caps) { + int rc; + u32 dma_mask = 0;

/* Set the unadvertised capabilities */ @@ -369,7 +371,10 @@ static int tmc_etr_setup_caps(struct tmc_drvdata *drvdata, dma_mask = 40; }

- return dma_set_mask_and_coherent(drvdata->dev, DMA_BIT_MASK(dma_mask)); + rc = dma_set_mask_and_coherent(drvdata->dev, DMA_BIT_MASK(dma_mask)); + if (rc) + dev_err(drvdata->dev, "Failed to setup DMA mask: %d\n", rc); + return rc; }

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

As a preparatory step to merge the separate drivers for static and dynamic replicators, annotate the static replicator specific details. Also refactor the probe routine to make it generic in order to merge the drivers easily.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-replicator.c | 62 +++++++++++++--------- 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index feac983..43cbcf1 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -56,58 +56,68 @@ static const struct coresight_ops replicator_cs_ops = { .link_ops = &replicator_link_ops, };

-static int replicator_probe(struct platform_device *pdev) +static int replicator_probe(struct device *dev) { - int ret; - struct device *dev = &pdev->dev; + int ret = 0; struct coresight_platform_data *pdata = NULL; struct replicator_drvdata *drvdata; struct coresight_desc desc = { 0 }; - struct device_node *np = pdev->dev.of_node; + struct device_node *np = dev->of_node;

if (np) { pdata = of_get_coresight_platform_data(dev, np); if (IS_ERR(pdata)) return PTR_ERR(pdata); - pdev->dev.platform_data = pdata; + dev->platform_data = pdata; }

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM;

- drvdata->dev = &pdev->dev; - drvdata->atclk = devm_clk_get(&pdev->dev, "atclk"); /* optional */ + drvdata->dev = dev; + drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */ if (!IS_ERR(drvdata->atclk)) { ret = clk_prepare_enable(drvdata->atclk); if (ret) return ret; } - pm_runtime_get_noresume(&pdev->dev); - pm_runtime_set_active(&pdev->dev); - pm_runtime_enable(&pdev->dev); - platform_set_drvdata(pdev, drvdata); + + dev_set_drvdata(dev, drvdata);

desc.type = CORESIGHT_DEV_TYPE_LINK; desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT; desc.ops = &replicator_cs_ops; - desc.pdata = pdev->dev.platform_data; - desc.dev = &pdev->dev; + desc.pdata = dev->platform_data; + desc.dev = dev; drvdata->csdev = coresight_register(&desc); if (IS_ERR(drvdata->csdev)) { ret = PTR_ERR(drvdata->csdev); - goto out_disable_pm; + goto out_disable_clk; }

- pm_runtime_put(&pdev->dev); + pm_runtime_put(dev);

- return 0; - -out_disable_pm: - if (!IS_ERR(drvdata->atclk)) +out_disable_clk: + if (ret && !IS_ERR_OR_NULL(drvdata->atclk)) clk_disable_unprepare(drvdata->atclk); - pm_runtime_put_noidle(&pdev->dev); - pm_runtime_disable(&pdev->dev); + return ret; +} + +static int static_replicator_probe(struct platform_device *pdev) +{ + int ret; + + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + + ret = replicator_probe(&pdev->dev); + + if (ret) { + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_disable(&pdev->dev); + }

return ret; } @@ -139,18 +149,18 @@ static const struct dev_pm_ops replicator_dev_pm_ops = { replicator_runtime_resume, NULL) };

-static const struct of_device_id replicator_match[] = { +static const struct of_device_id static_replicator_match[] = { {.compatible = "arm,coresight-replicator"}, {} };

-static struct platform_driver replicator_driver = { - .probe = replicator_probe, +static struct platform_driver static_replicator_driver = { + .probe = static_replicator_probe, .driver = { .name = "coresight-replicator", - .of_match_table = replicator_match, + .of_match_table = static_replicator_match, .pm = &replicator_dev_pm_ops, .suppress_bind_attrs = true, }, }; -builtin_platform_driver(replicator_driver); +builtin_platform_driver(static_replicator_driver);

Merge the drivers for the two varieties of replicators into a singel one. The dynamic replicator has programming base which can be programmed to filter the trace data. The driver detects the type based on the "base" address value of the device, which is NULL for the static device.

Also, while at it, remove the now obsolete DYNAMIC_REPLICATOR config entry.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/Kconfig | 8 - drivers/hwtracing/coresight/Makefile | 1 - .../coresight/coresight-dynamic-replicator.c | 285 --------------------- drivers/hwtracing/coresight/coresight-replicator.c | 174 ++++++++++++- 4 files changed, 169 insertions(+), 299 deletions(-) delete mode 100644 drivers/hwtracing/coresight/coresight-dynamic-replicator.c

diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig index ad34380..a40d796 100644 --- a/drivers/hwtracing/coresight/Kconfig +++ b/drivers/hwtracing/coresight/Kconfig @@ -81,14 +81,6 @@ config CORESIGHT_SOURCE_ETM4X for instruction level tracing. Depending on the implemented version data tracing may also be available.

-config CORESIGHT_DYNAMIC_REPLICATOR - bool "CoreSight Programmable Replicator driver" - depends on CORESIGHT_LINKS_AND_SINKS - help - This enables support for dynamic CoreSight replicator link driver. - The programmable ATB replicator allows independent filtering of the - trace data based on the traceid. - config CORESIGHT_STM bool "CoreSight System Trace Macrocell driver" depends on (ARM && !(CPU_32v3 || CPU_32v4 || CPU_32v4T)) || ARM64 diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile index 41870de..3b435aa 100644 --- a/drivers/hwtracing/coresight/Makefile +++ b/drivers/hwtracing/coresight/Makefile @@ -15,7 +15,6 @@ obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.o \ coresight-etm3x-sysfs.o obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o \ coresight-etm4x-sysfs.o -obj-$(CONFIG_CORESIGHT_DYNAMIC_REPLICATOR) += coresight-dynamic-replicator.o obj-$(CONFIG_CORESIGHT_STM) += coresight-stm.o obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o obj-$(CONFIG_CORESIGHT_CATU) += coresight-catu.o diff --git a/drivers/hwtracing/coresight/coresight-dynamic-replicator.c b/drivers/hwtracing/coresight/coresight-dynamic-replicator.c deleted file mode 100644 index b7d7c41..0000000 --- a/drivers/hwtracing/coresight/coresight-dynamic-replicator.c +++ /dev/null @@ -1,285 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved. - */ - -#include <linux/amba/bus.h> -#include <linux/clk.h> -#include <linux/coresight.h> -#include <linux/device.h> -#include <linux/err.h> -#include <linux/init.h> -#include <linux/io.h> -#include <linux/kernel.h> -#include <linux/of.h> -#include <linux/pm_runtime.h> -#include <linux/slab.h> - -#include "coresight-priv.h" - -#define REPLICATOR_IDFILTER0 0x000 -#define REPLICATOR_IDFILTER1 0x004 - -/** - * struct replicator_drvdata - specifics associated to a replicator component - * @base: memory mapped base address for this component. - * @dev: the device entity associated with this component - * @atclk: optional clock for the core parts of the replicator. - * @csdev: component vitals needed by the framework - */ -struct replicator_drvdata { - void __iomem *base; - struct device *dev; - struct clk *atclk; - struct coresight_device *csdev; -}; - -/* - * dynamic_replicator_reset : Reset the replicator configuration to sane values. - */ -static void dynamic_replicator_reset(struct replicator_drvdata *drvdata) -{ - CS_UNLOCK(drvdata->base); - - if (!coresight_claim_device_unlocked(drvdata->base)) { - writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER0); - writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER1); - coresight_disclaim_device_unlocked(drvdata->base); - } - - CS_LOCK(drvdata->base); -} - -static int dynamic_replicator_enable(struct replicator_drvdata *drvdata, - int inport, int outport) -{ - int rc = 0; - u32 reg; - - switch (outport) { - case 0: - reg = REPLICATOR_IDFILTER0; - break; - case 1: - reg = REPLICATOR_IDFILTER1; - break; - default: - WARN_ON(1); - return -EINVAL; - } - - CS_UNLOCK(drvdata->base); - - if ((readl_relaxed(drvdata->base + REPLICATOR_IDFILTER0) == 0xff) && - (readl_relaxed(drvdata->base + REPLICATOR_IDFILTER1) == 0xff)) - rc = coresight_claim_device_unlocked(drvdata->base); - - /* Ensure that the outport is enabled. */ - if (!rc) - writel_relaxed(0x00, drvdata->base + reg); - CS_LOCK(drvdata->base); - - return rc; -} - -static int replicator_enable(struct coresight_device *csdev, int inport, - int outport) -{ - int rc = 0; - struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); - - rc = dynamic_replicator_enable(drvdata, inport, outport); - dev_dbg(drvdata->dev, "REPLICATOR enabled\n"); - return rc; -} - -static void dynamic_replicator_disable(struct replicator_drvdata *drvdata, - int inport, int outport) -{ - u32 reg; - - switch (outport) { - case 0: - reg = REPLICATOR_IDFILTER0; - break; - case 1: - reg = REPLICATOR_IDFILTER1; - break; - default: - WARN_ON(1); - return; - } - - CS_UNLOCK(drvdata->base); - - /* disable the flow of ATB data through port */ - writel_relaxed(0xff, drvdata->base + reg); - - if ((readl_relaxed(drvdata->base + REPLICATOR_IDFILTER0) == 0xff) && - (readl_relaxed(drvdata->base + REPLICATOR_IDFILTER1) == 0xff)) - coresight_disclaim_device_unlocked(drvdata->base); - CS_LOCK(drvdata->base); -} - -static void replicator_disable(struct coresight_device *csdev, int inport, - int outport) -{ - struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); - - dynamic_replicator_disable(drvdata, inport, outport); - dev_dbg(drvdata->dev, "REPLICATOR disabled\n"); -} - -static const struct coresight_ops_link replicator_link_ops = { - .enable = replicator_enable, - .disable = replicator_disable, -}; - -static const struct coresight_ops replicator_cs_ops = { - .link_ops = &replicator_link_ops, -}; - -#define coresight_replicator_reg(name, offset) \ - coresight_simple_reg32(struct replicator_drvdata, name, offset) - -coresight_replicator_reg(idfilter0, REPLICATOR_IDFILTER0); -coresight_replicator_reg(idfilter1, REPLICATOR_IDFILTER1); - -static struct attribute *replicator_mgmt_attrs[] = { - &dev_attr_idfilter0.attr, - &dev_attr_idfilter1.attr, - NULL, -}; - -static const struct attribute_group replicator_mgmt_group = { - .attrs = replicator_mgmt_attrs, - .name = "mgmt", -}; - -static const struct attribute_group *replicator_groups[] = { - &replicator_mgmt_group, - NULL, -}; - -static int replicator_probe(struct device *dev, struct resource *res) -{ - int ret = 0; - struct coresight_platform_data *pdata = NULL; - struct replicator_drvdata *drvdata; - struct coresight_desc desc = { 0 }; - struct device_node *np = dev->of_node; - void __iomem *base; - - if (np) { - pdata = of_get_coresight_platform_data(dev, np); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); - dev->platform_data = pdata; - } - - drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); - if (!drvdata) - return -ENOMEM; - - drvdata->dev = dev; - drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */ - if (!IS_ERR(drvdata->atclk)) { - ret = clk_prepare_enable(drvdata->atclk); - if (ret) - return ret; - } - - /* - * Map the device base for dynamic-replicator, which has been - * validated by AMBA core - */ - if (res) { - base = devm_ioremap_resource(dev, res); - if (IS_ERR(base)) { - ret = PTR_ERR(base); - goto out_disable_clk; - } - drvdata->base = base; - desc.groups = replicator_groups; - } - - dev_set_drvdata(dev, drvdata); - - desc.type = CORESIGHT_DEV_TYPE_LINK; - desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT; - desc.ops = &replicator_cs_ops; - desc.pdata = dev->platform_data; - desc.dev = dev; - drvdata->csdev = coresight_register(&desc); - - if (IS_ERR(drvdata->csdev)) { - ret = PTR_ERR(drvdata->csdev); - goto out_disable_clk; - } - - dynamic_replicator_reset(drvdata); - pm_runtime_put(dev); - -out_disable_clk: - if (ret && !IS_ERR_OR_NULL(drvdata->atclk)) - clk_disable_unprepare(drvdata->atclk); - return ret; -} - -static int dynamic_replicator_probe(struct amba_device *adev, - const struct amba_id *id) -{ - return replicator_probe(&adev->dev, &adev->res); -} - -#ifdef CONFIG_PM -static int replicator_runtime_suspend(struct device *dev) -{ - struct replicator_drvdata *drvdata = dev_get_drvdata(dev); - - if (drvdata && !IS_ERR(drvdata->atclk)) - clk_disable_unprepare(drvdata->atclk); - - return 0; -} - -static int replicator_runtime_resume(struct device *dev) -{ - struct replicator_drvdata *drvdata = dev_get_drvdata(dev); - - if (drvdata && !IS_ERR(drvdata->atclk)) - clk_prepare_enable(drvdata->atclk); - - return 0; -} -#endif - -static const struct dev_pm_ops replicator_dev_pm_ops = { - SET_RUNTIME_PM_OPS(replicator_runtime_suspend, - replicator_runtime_resume, - NULL) -}; - -static const struct amba_id dynamic_replicator_ids[] = { - { - .id = 0x000bb909, - .mask = 0x000fffff, - }, - { - /* Coresight SoC-600 */ - .id = 0x000bb9ec, - .mask = 0x000fffff, - }, - { 0, 0 }, -}; - -static struct amba_driver dynamic_replicator_driver = { - .drv = { - .name = "coresight-dynamic-replicator", - .pm = &replicator_dev_pm_ops, - .suppress_bind_attrs = true, - }, - .probe = dynamic_replicator_probe, - .id_table = dynamic_replicator_ids, -}; -builtin_amba_driver(dynamic_replicator_driver); diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 43cbcf1..4e0da85 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -1,10 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved. * * Description: CoreSight Replicator driver */

+#include <linux/amba/bus.h> #include <linux/kernel.h> #include <linux/device.h> #include <linux/platform_device.h> @@ -18,25 +19,117 @@

#include "coresight-priv.h"

+#define REPLICATOR_IDFILTER0 0x000 +#define REPLICATOR_IDFILTER1 0x004 + /** * struct replicator_drvdata - specifics associated to a replicator component + * @base: memory mapped base address for this component. Also indicates + * whether this one is programmable or not. * @dev: the device entity associated with this component * @atclk: optional clock for the core parts of the replicator. * @csdev: component vitals needed by the framework */ struct replicator_drvdata { + void __iomem *base; struct device *dev; struct clk *atclk; struct coresight_device *csdev; };

+static void dynamic_replicator_reset(struct replicator_drvdata *drvdata) +{ + CS_UNLOCK(drvdata->base); + + if (!coresight_claim_device_unlocked(drvdata->base)) { + writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER0); + writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER1); + coresight_disclaim_device_unlocked(drvdata->base); + } + + CS_LOCK(drvdata->base); +} + +/* + * replicator_reset : Reset the replicator configuration to sane values. + */ +static inline void replicator_reset(struct replicator_drvdata *drvdata) +{ + if (drvdata->base) + dynamic_replicator_reset(drvdata); +} + +static int dynamic_replicator_enable(struct replicator_drvdata *drvdata, + int inport, int outport) +{ + int rc = 0; + u32 reg; + + switch (outport) { + case 0: + reg = REPLICATOR_IDFILTER0; + break; + case 1: + reg = REPLICATOR_IDFILTER1; + break; + default: + WARN_ON(1); + return -EINVAL; + } + + CS_UNLOCK(drvdata->base); + + if ((readl_relaxed(drvdata->base + REPLICATOR_IDFILTER0) == 0xff) && + (readl_relaxed(drvdata->base + REPLICATOR_IDFILTER1) == 0xff)) + rc = coresight_claim_device_unlocked(drvdata->base); + + /* Ensure that the outport is enabled. */ + if (!rc) + writel_relaxed(0x00, drvdata->base + reg); + CS_LOCK(drvdata->base); + + return rc; +} + static int replicator_enable(struct coresight_device *csdev, int inport, int outport) { + int rc = 0; struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);

- dev_dbg(drvdata->dev, "REPLICATOR enabled\n"); - return 0; + if (drvdata->base) + rc = dynamic_replicator_enable(drvdata, inport, outport); + if (!rc) + dev_dbg(drvdata->dev, "REPLICATOR enabled\n"); + return rc; +} + +static void dynamic_replicator_disable(struct replicator_drvdata *drvdata, + int inport, int outport) +{ + u32 reg; + + switch (outport) { + case 0: + reg = REPLICATOR_IDFILTER0; + break; + case 1: + reg = REPLICATOR_IDFILTER1; + break; + default: + WARN_ON(1); + return; + } + + CS_UNLOCK(drvdata->base); + + /* disable the flow of ATB data through port */ + writel_relaxed(0xff, drvdata->base + reg); + + if ((readl_relaxed(drvdata->base + REPLICATOR_IDFILTER0) == 0xff) && + (readl_relaxed(drvdata->base + REPLICATOR_IDFILTER1) == 0xff)) + coresight_disclaim_device_unlocked(drvdata->base); + CS_LOCK(drvdata->base); }

static void replicator_disable(struct coresight_device *csdev, int inport, @@ -44,6 +137,8 @@ static void replicator_disable(struct coresight_device *csdev, int inport, { struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);

+ if (drvdata->base) + dynamic_replicator_disable(drvdata, inport, outport); dev_dbg(drvdata->dev, "REPLICATOR disabled\n"); }

@@ -56,13 +151,36 @@ static const struct coresight_ops replicator_cs_ops = { .link_ops = &replicator_link_ops, };

-static int replicator_probe(struct device *dev) +#define coresight_replicator_reg(name, offset) \ + coresight_simple_reg32(struct replicator_drvdata, name, offset) + +coresight_replicator_reg(idfilter0, REPLICATOR_IDFILTER0); +coresight_replicator_reg(idfilter1, REPLICATOR_IDFILTER1); + +static struct attribute *replicator_mgmt_attrs[] = { + &dev_attr_idfilter0.attr, + &dev_attr_idfilter1.attr, + NULL, +}; + +static const struct attribute_group replicator_mgmt_group = { + .attrs = replicator_mgmt_attrs, + .name = "mgmt", +}; + +static const struct attribute_group *replicator_groups[] = { + &replicator_mgmt_group, + NULL, +}; + +static int replicator_probe(struct device *dev, struct resource *res) { int ret = 0; struct coresight_platform_data *pdata = NULL; struct replicator_drvdata *drvdata; struct coresight_desc desc = { 0 }; struct device_node *np = dev->of_node; + void __iomem *base;

if (np) { pdata = of_get_coresight_platform_data(dev, np); @@ -83,6 +201,20 @@ static int replicator_probe(struct device *dev) return ret; }

+ /* + * Map the device base for dynamic-replicator, which has been + * validated by AMBA core + */ + if (res) { + base = devm_ioremap_resource(dev, res); + if (IS_ERR(base)) { + ret = PTR_ERR(base); + goto out_disable_clk; + } + drvdata->base = base; + desc.groups = replicator_groups; + } + dev_set_drvdata(dev, drvdata);

desc.type = CORESIGHT_DEV_TYPE_LINK; @@ -96,6 +228,7 @@ static int replicator_probe(struct device *dev) goto out_disable_clk; }

+ replicator_reset(drvdata); pm_runtime_put(dev);

out_disable_clk: @@ -112,7 +245,8 @@ static int static_replicator_probe(struct platform_device *pdev) pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev);

- ret = replicator_probe(&pdev->dev); + /* Static replicators do not have programming base */ + ret = replicator_probe(&pdev->dev, NULL);

if (ret) { pm_runtime_put_noidle(&pdev->dev); @@ -164,3 +298,33 @@ static struct platform_driver static_replicator_driver = { }, }; builtin_platform_driver(static_replicator_driver); + +static int dynamic_replicator_probe(struct amba_device *adev, + const struct amba_id *id) +{ + return replicator_probe(&adev->dev, &adev->res); +} + +static const struct amba_id dynamic_replicator_ids[] = { + { + .id = 0x000bb909, + .mask = 0x000fffff, + }, + { + /* Coresight SoC-600 */ + .id = 0x000bb9ec, + .mask = 0x000fffff, + }, + { 0, 0 }, +}; + +static struct amba_driver dynamic_replicator_driver = { + .drv = { + .name = "coresight-dynamic-replicator", + .pm = &replicator_dev_pm_ops, + .suppress_bind_attrs = true, + }, + .probe = dynamic_replicator_probe, + .id_table = dynamic_replicator_ids, +}; +builtin_amba_driver(dynamic_replicator_driver);

In preparation to use a consistent device naming scheme, clean up the device link tracking in replicator driver. Use the "coresight" device instead of the "real" parent device for all internal purposes. All other requests (e.g, power management, DMA operations) must use the "real" device which is the parent device.

Cc: Mathieu Poirier mathie.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-replicator.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 4e0da85..8bbb008 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -26,13 +26,11 @@ * struct replicator_drvdata - specifics associated to a replicator component * @base: memory mapped base address for this component. Also indicates * whether this one is programmable or not. - * @dev: the device entity associated with this component * @atclk: optional clock for the core parts of the replicator. * @csdev: component vitals needed by the framework */ struct replicator_drvdata { void __iomem *base; - struct device *dev; struct clk *atclk; struct coresight_device *csdev; }; @@ -100,7 +98,7 @@ static int replicator_enable(struct coresight_device *csdev, int inport, if (drvdata->base) rc = dynamic_replicator_enable(drvdata, inport, outport); if (!rc) - dev_dbg(drvdata->dev, "REPLICATOR enabled\n"); + dev_dbg(&csdev->dev, "REPLICATOR enabled\n"); return rc; }

@@ -139,7 +137,7 @@ static void replicator_disable(struct coresight_device *csdev, int inport,

if (drvdata->base) dynamic_replicator_disable(drvdata, inport, outport); - dev_dbg(drvdata->dev, "REPLICATOR disabled\n"); + dev_dbg(&csdev->dev, "REPLICATOR disabled\n"); }

static const struct coresight_ops_link replicator_link_ops = { @@ -193,7 +191,6 @@ static int replicator_probe(struct device *dev, struct resource *res) if (!drvdata) return -ENOMEM;

- drvdata->dev = dev; drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */ if (!IS_ERR(drvdata->atclk)) { ret = clk_prepare_enable(drvdata->atclk);

Switch to using the CoreSight device instead of the real amba device.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-catu.c | 13 +++++++------ drivers/hwtracing/coresight/coresight-catu.h | 1 - 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index 11c6f2f..671a05a 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -408,13 +408,14 @@ static int catu_enable_hw(struct catu_drvdata *drvdata, void *data) int rc; u32 control, mode; struct etr_buf *etr_buf = data; + struct device *dev = &drvdata->csdev->dev;

if (catu_wait_for_ready(drvdata)) - dev_warn(drvdata->dev, "Timeout while waiting for READY\n"); + dev_warn(dev, "Timeout while waiting for READY\n");

control = catu_read_control(drvdata); if (control & BIT(CATU_CONTROL_ENABLE)) { - dev_warn(drvdata->dev, "CATU is already enabled\n"); + dev_warn(dev, "CATU is already enabled\n"); return -EBUSY; }

@@ -440,7 +441,7 @@ static int catu_enable_hw(struct catu_drvdata *drvdata, void *data) catu_write_irqen(drvdata, 0); catu_write_mode(drvdata, mode); catu_write_control(drvdata, control); - dev_dbg(drvdata->dev, "Enabled in %s mode\n", + dev_dbg(dev, "Enabled in %s mode\n", (mode == CATU_MODE_PASS_THROUGH) ? "Pass through" : "Translate"); @@ -461,15 +462,16 @@ static int catu_enable(struct coresight_device *csdev, void *data) static int catu_disable_hw(struct catu_drvdata *drvdata) { int rc = 0; + struct device *dev = &drvdata->csdev->dev;

catu_write_control(drvdata, 0); coresight_disclaim_device_unlocked(drvdata->base); if (catu_wait_for_ready(drvdata)) { - dev_info(drvdata->dev, "Timeout while waiting for READY\n"); + dev_info(dev, "Timeout while waiting for READY\n"); rc = -EAGAIN; }

- dev_dbg(drvdata->dev, "Disabled\n"); + dev_dbg(dev, "Disabled\n"); return rc; }

@@ -519,7 +521,6 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) goto out; }

- drvdata->dev = dev; dev_set_drvdata(dev, drvdata); base = devm_ioremap_resource(dev, &adev->res); if (IS_ERR(base)) { diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h index 1b281f0..96ea8c4 100644 --- a/drivers/hwtracing/coresight/coresight-catu.h +++ b/drivers/hwtracing/coresight/coresight-catu.h @@ -61,7 +61,6 @@ #define CATU_IRQEN_OFF 0x0

struct catu_drvdata { - struct device *dev; void __iomem *base; struct coresight_device *csdev; int irq;

Keep track of the STM coresight device which is a child device of the AMBA device. Since we can get to the coresight_device from the "device" instance, remove the explicit field.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-stm.c | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c index 9f8a844..6afe033 100644 --- a/drivers/hwtracing/coresight/coresight-stm.c +++ b/drivers/hwtracing/coresight/coresight-stm.c @@ -110,9 +110,9 @@ struct channel_space { /** * struct stm_drvdata - specifics associated to an STM component * @base: memory mapped base address for this component. - * @dev: the device entity associated to this component. + * @dev: the coresight device entity associated to this + * component. * @atclk: optional clock for the core parts of the STM. - * @csdev: component vitals needed by the framework. * @spinlock: only one at a time pls. * @chs: the channels accociated to this STM. * @stm: structure associated to the generic STM interface. @@ -130,7 +130,6 @@ struct stm_drvdata { void __iomem *base; struct device *dev; struct clk *atclk; - struct coresight_device *csdev; spinlock_t spinlock; struct channel_space chs; struct stm_data stm; @@ -205,7 +204,7 @@ static int stm_enable(struct coresight_device *csdev, if (val) return -EBUSY;

- pm_runtime_get_sync(drvdata->dev); + pm_runtime_get_sync(drvdata->dev->parent);

spin_lock(&drvdata->spinlock); stm_enable_hw(drvdata); @@ -271,7 +270,7 @@ static void stm_disable(struct coresight_device *csdev, /* Wait until the engine has completely stopped */ coresight_timeout(drvdata->base, STMTCSR, STMTCSR_BUSY_BIT, 0);

- pm_runtime_put(drvdata->dev); + pm_runtime_put(drvdata->dev->parent);

local_set(&drvdata->mode, CS_MODE_DISABLED); dev_dbg(drvdata->dev, "STM tracing disabled\n"); @@ -336,10 +335,10 @@ static int stm_generic_link(struct stm_data *stm_data, { struct stm_drvdata *drvdata = container_of(stm_data, struct stm_drvdata, stm); - if (!drvdata || !drvdata->csdev) + if (!drvdata || !drvdata->dev) return -EINVAL;

- return coresight_enable(drvdata->csdev); + return coresight_enable(to_coresight_device(drvdata->dev)); }

static void stm_generic_unlink(struct stm_data *stm_data, @@ -347,10 +346,10 @@ static void stm_generic_unlink(struct stm_data *stm_data, { struct stm_drvdata *drvdata = container_of(stm_data, struct stm_drvdata, stm); - if (!drvdata || !drvdata->csdev) + if (!drvdata || !drvdata->dev) return;

- coresight_disable(drvdata->csdev); + coresight_disable(to_coresight_device(drvdata->dev)); }

static phys_addr_t @@ -763,10 +762,9 @@ static void stm_init_default_data(struct stm_drvdata *drvdata) bitmap_clear(drvdata->chs.guaranteed, 0, drvdata->numsp); }

-static void stm_init_generic_data(struct stm_drvdata *drvdata) +static void stm_init_generic_data(struct stm_drvdata *drvdata, const char *name) { - drvdata->stm.name = dev_name(drvdata->dev); - + drvdata->stm.name = name; /* * MasterIDs are assigned at HW design phase. As such the core is * using a single master for interaction with this device. @@ -795,6 +793,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) struct resource ch_res; size_t bitmap_size; struct coresight_desc desc = { 0 }; + struct coresight_device *csdev; struct device_node *np = adev->dev.of_node;

if (np) { @@ -807,7 +806,6 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) if (!drvdata) return -ENOMEM;

- drvdata->dev = &adev->dev; drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */ if (!IS_ERR(drvdata->atclk)) { ret = clk_prepare_enable(drvdata->atclk); @@ -848,7 +846,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) spin_lock_init(&drvdata->spinlock);

stm_init_default_data(drvdata); - stm_init_generic_data(drvdata); + stm_init_generic_data(drvdata, pdata->name);

if (stm_register_device(dev, &drvdata->stm, THIS_MODULE)) { dev_info(dev, @@ -862,15 +860,17 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) desc.pdata = pdata; desc.dev = dev; desc.groups = coresight_stm_groups; - drvdata->csdev = coresight_register(&desc); - if (IS_ERR(drvdata->csdev)) { - ret = PTR_ERR(drvdata->csdev); + csdev = coresight_register(&desc); + if (IS_ERR(csdev)) { + ret = PTR_ERR(csdev); goto stm_unregister; }

+ drvdata->dev = &csdev->dev; pm_runtime_put(&adev->dev);

- dev_info(dev, "%s initialized\n", (char *)coresight_get_uci_data(id)); + dev_info(drvdata->dev, "%s initialized\n", + (char *)coresight_get_uci_data(id)); return 0;

stm_unregister:

Track the coresight device instead of the real device.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-etb10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index 105782e..a471cbd 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -97,12 +97,12 @@ static unsigned int etb_get_buffer_depth(struct etb_drvdata *drvdata) { u32 depth = 0;

- pm_runtime_get_sync(drvdata->dev); + pm_runtime_get_sync(drvdata->dev->parent);

/* RO registers don't need locking */ depth = readl_relaxed(drvdata->base + ETB_RAM_DEPTH_REG);

- pm_runtime_put(drvdata->dev); + pm_runtime_put(drvdata->dev->parent); return depth; }

@@ -701,7 +701,6 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) if (!drvdata) return -ENOMEM;

- drvdata->dev = &adev->dev; drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */ if (!IS_ERR(drvdata->atclk)) { ret = clk_prepare_enable(drvdata->atclk); @@ -740,6 +739,7 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) if (IS_ERR(drvdata->csdev)) return PTR_ERR(drvdata->csdev);

+ drvdata->dev = &drvdata->csdev->dev; drvdata->miscdev.name = pdata->name; drvdata->miscdev.minor = MISC_DYNAMIC_MINOR; drvdata->miscdev.fops = &etb_fops;

As we are about to about refactor the platform specific handling, move the DT property handling to generic helpers.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-etm3x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index 1b9ae3a..7137f06 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -800,9 +800,9 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) return PTR_ERR(pdata);

adev->dev.platform_data = pdata; - drvdata->use_cp14 = of_property_read_bool(np, "arm,cp14"); }

+ drvdata->use_cp14 = fwnode_property_read_bool(dev->fwnode, "arm,cp14"); dev_set_drvdata(dev, drvdata);

/* Validity for the resource is already checked by the AMBA core */

As we are about to refactor the platform specific handling, make the default buffer size probing generic.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-tmc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index 9e7ff83..7ce3427 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -375,6 +375,15 @@ static int tmc_etr_setup_caps(struct device *parent, u32 devid, void *dev_caps) return rc; }

+static u32 tmc_etr_get_default_buffer_size(struct device *dev) +{ + u32 size; + + if (fwnode_property_read_u32(dev->fwnode, "arm,buffer-size", &size)) + size = SZ_1M; + return size; +} + static int tmc_probe(struct amba_device *adev, const struct amba_id *id) { int ret = 0; @@ -418,16 +427,10 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) drvdata->config_type = BMVAL(devid, 6, 7); drvdata->memwidth = tmc_get_memwidth(devid);

- if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) { - if (np) - ret = of_property_read_u32(np, - "arm,buffer-size", - &drvdata->size); - if (ret) - drvdata->size = SZ_1M; - } else { + if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) + drvdata->size = tmc_etr_get_default_buffer_size(dev); + else drvdata->size = readl_relaxed(drvdata->base + TMC_RSZ) * 4; - }

pm_runtime_put(&adev->dev);

The CoreSight components ETM and CPU-Debug are always associated with CPUs. Replace the of_coresight_get_cpu() with a platform agnostic helper, in preparation to add ACPI support.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-cpu-debug.c | 3 +-- drivers/hwtracing/coresight/coresight-platform.c | 18 +++++++++++++----- include/linux/coresight.h | 7 +------ 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c index e8819d7..07a1367 100644 --- a/drivers/hwtracing/coresight/coresight-cpu-debug.c +++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c @@ -572,14 +572,13 @@ static int debug_probe(struct amba_device *adev, const struct amba_id *id) struct device *dev = &adev->dev; struct debug_drvdata *drvdata; struct resource *res = &adev->res; - struct device_node *np = adev->dev.of_node; int ret;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM;

- drvdata->cpu = np ? of_coresight_get_cpu(np) : 0; + drvdata->cpu = coresight_get_cpu(dev); if (per_cpu(debug_drvdata, drvdata->cpu)) { dev_err(dev, "CPU%d drvdata has already been initialized\n", drvdata->cpu); diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 693e3f5..93b6c87 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -147,12 +147,14 @@ static void of_coresight_get_ports(const struct device_node *node, } }

-int of_coresight_get_cpu(const struct device_node *node) +static int of_coresight_get_cpu(struct device *dev) { int cpu; struct device_node *dn;

- dn = of_parse_phandle(node, "cpu", 0); + if (!dev->of_node) + return 0; + dn = of_parse_phandle(dev->of_node, "cpu", 0); /* Affinity defaults to CPU0 */ if (!dn) return 0; @@ -162,7 +164,6 @@ int of_coresight_get_cpu(const struct device_node *node) /* Affinity to CPU0 if no cpu nodes are found */ return (cpu < 0) ? 0 : cpu; } -EXPORT_SYMBOL_GPL(of_coresight_get_cpu);

/* * of_coresight_parse_endpoint : Parse the given output endpoint @ep @@ -237,8 +238,6 @@ of_get_coresight_platform_data(struct device *dev, bool legacy_binding = false; struct device_node *node = dev->of_node;

- pdata->cpu = of_coresight_get_cpu(node); - /* Get the number of input and output port for this component */ of_coresight_get_ports(node, &pdata->nr_inport, &pdata->nr_outport);

@@ -290,6 +289,14 @@ of_get_coresight_platform_data(struct device *dev, } #endif

+int coresight_get_cpu(struct device *dev) +{ + if (is_of_node(dev->fwnode)) + return of_coresight_get_cpu(dev); + return 0; +} +EXPORT_SYMBOL_GPL(coresight_get_cpu); + struct coresight_platform_data * coresight_get_platform_data(struct device *dev) { @@ -304,6 +311,7 @@ coresight_get_platform_data(struct device *dev)

/* Use device name as sysfs handle */ pdata->name = dev_name(dev); + pdata->cpu = coresight_get_cpu(dev);

if (is_of_node(dev->fwnode)) return of_get_coresight_platform_data(dev, pdata); diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 5b29255..a48cd9b 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -291,12 +291,7 @@ static inline void coresight_disclaim_device_unlocked(void __iomem *base) {}

#endif

-#ifdef CONFIG_OF -extern int of_coresight_get_cpu(const struct device_node *node); -#else -static inline int of_coresight_get_cpu(const struct device_node *node) -{ return 0; } -#endif +extern int coresight_get_cpu(struct device *dev);

struct coresight_platform_data *coresight_get_platform_data(struct device *dev);

We rely on the device names to find a CoreSight device on the coresight bus. The device name however is obtained from the platform, which is bound to the real platform/amba device. As we are about to use different naming scheme for the coresight devices, we can't rely on the platform device name to find the corresponding coresight device. Instead we use the platform agnostic "fwnode handle" of the parent device to find the devices. We also reuse the same fwnode as the parent for the Coresight device we create.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-platform.c | 10 ++++------ drivers/hwtracing/coresight/coresight-priv.h | 2 ++ drivers/hwtracing/coresight/coresight.c | 19 +++++++++++-------- include/linux/coresight.h | 4 ++-- 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 877ed2b..5eee987 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -31,7 +31,7 @@ static int coresight_alloc_conns(struct device *dev, return 0; }

-static int coresight_fwnode_handle_match(struct device *dev, void *data) +int coresight_match_fwnode_handle(struct device *dev, void *data) { return dev_fwnode(dev) == data; } @@ -46,7 +46,7 @@ coresight_find_device_by_fwnode(struct fwnode_handle *fwnode) * platform bus. */ dev = bus_find_device(&platform_bus_type, NULL, - fwnode, coresight_fwnode_handle_match); + fwnode, coresight_match_fwnode_handle); if (dev) return dev;

@@ -55,7 +55,7 @@ coresight_find_device_by_fwnode(struct fwnode_handle *fwnode) * looking for the device that matches the endpoint node. */ return bus_find_device(&amba_bustype, NULL, - fwnode, coresight_fwnode_handle_match); + fwnode, coresight_match_fwnode_handle); }

#ifdef CONFIG_OF @@ -214,9 +214,7 @@ static int of_coresight_parse_endpoint(struct device *dev, }

conn->outport = endpoint.port; - conn->child_name = devm_kstrdup(dev, - dev_name(rdev), - GFP_KERNEL); + conn->child_fwnode = fwnode_handle_get(rdev_fwnode); conn->child_port = rendpoint.port; /* Connection record updated */ ret = 1; diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index e0684d0..8fb1243 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -153,6 +153,8 @@ struct list_head *coresight_build_path(struct coresight_device *csdev, struct coresight_device *sink); void coresight_release_path(struct list_head *path);

+int coresight_match_fwnode_handle(struct device *dev, void *data); + #ifdef CONFIG_CORESIGHT_SOURCE_ETM3X extern int etm_readl_cp14(u32 off, unsigned int *val); extern int etm_writel_cp14(u32 off, u32 val); diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index 29cef89..9cdedab 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -1005,13 +1005,11 @@ static int coresight_orphan_match(struct device *dev, void *data) /* We have found at least one orphan connection */ if (conn->child_dev == NULL) { /* Does it match this newly added device? */ - if (conn->child_name && - !strcmp(dev_name(&csdev->dev), conn->child_name)) { + if (conn->child_fwnode == csdev->dev.fwnode) conn->child_dev = csdev; - } else { + else /* This component still has an orphan */ still_orphan = true; - } } }

@@ -1043,9 +1041,9 @@ static void coresight_fixup_device_conns(struct coresight_device *csdev) struct coresight_connection *conn = &csdev->conns[i]; struct device *dev = NULL;

- if (conn->child_name) - dev = bus_find_device_by_name(&coresight_bustype, NULL, - conn->child_name); + dev = bus_find_device(&coresight_bustype, NULL, + (void *)conn->child_fwnode, + coresight_match_fwnode_handle); if (dev) { conn->child_dev = to_coresight_device(dev); /* and put reference from 'bus_find_device()' */ @@ -1080,9 +1078,11 @@ static int coresight_remove_match(struct device *dev, void *data) if (conn->child_dev == NULL) continue;

- if (!strcmp(dev_name(&csdev->dev), conn->child_name)) { + if (csdev->dev.fwnode == conn->child_fwnode) { iterator->orphan = true; conn->child_dev = NULL; + /* Drop the reference to the handle for connection */ + fwnode_handle_put(conn->child_fwnode); /* No need to continue */ break; } @@ -1198,6 +1198,8 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) csdev->dev.parent = desc->dev; csdev->dev.release = coresight_device_release; csdev->dev.bus = &coresight_bustype; + csdev->dev.fwnode = fwnode_handle_get(dev_fwnode(desc->dev)); + dev_set_name(&csdev->dev, "%s", desc->pdata->name);

ret = device_register(&csdev->dev); @@ -1247,6 +1249,7 @@ void coresight_unregister(struct coresight_device *csdev) etm_perf_del_symlink_sink(csdev); /* Remove references of that device in the topology */ coresight_remove_conns(csdev); + fwnode_handle_put(csdev->dev.fwnode); device_unregister(&csdev->dev); } EXPORT_SYMBOL_GPL(coresight_unregister); diff --git a/include/linux/coresight.h b/include/linux/coresight.h index a48cd9b..76c31b2 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -128,14 +128,14 @@ struct coresight_desc { /** * struct coresight_connection - representation of a single connection * @outport: a connection's output port number. - * @chid_name: remote component's name. + * @chid_fwnode: remote component's fwnode handle. * @child_port: remote component's port number @output is connected to. * @child_dev: a @coresight_device representation of the component connected to @outport. */ struct coresight_connection { int outport; - const char *child_name; + struct fwnode_handle *child_fwnode; int child_port; struct coresight_device *child_dev; };

The stimulus base for STM device must be listed as the second memory resource, followed by the programming base address. Add support for parsing the information for ACPI.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Cc: "Rafael J. Wysocki" rjw@rjwysocki.net Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-stm.c | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)

diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c index d94ae22..995443a 100644 --- a/drivers/hwtracing/coresight/coresight-stm.c +++ b/drivers/hwtracing/coresight/coresight-stm.c @@ -16,6 +16,7 @@ * (C) 2015-2016 Chunyan Zhang zhang.chunyan@linaro.org */ #include <asm/local.h> +#include <linux/acpi.h> #include <linux/amba/bus.h> #include <linux/bitmap.h> #include <linux/clk.h> @@ -717,10 +718,52 @@ static inline int of_stm_get_stimulus_area(struct device *dev, } #endif

+#ifdef CONFIG_ACPI +static int acpi_stm_get_stimulus_area(struct device *dev, struct resource *res) +{ + int rc; + bool found_base = false; + struct resource_entry *rent; + LIST_HEAD(res_list); + + struct acpi_device *adev = ACPI_COMPANION(dev); + + if (!adev) + return -ENODEV; + rc = acpi_dev_get_resources(adev, &res_list, NULL, NULL); + if (rc < 0) + return rc; + + rc = -ENOENT; + list_for_each_entry(rent, &res_list, node) { + if (resource_type(rent->res) != IORESOURCE_MEM) + continue; + if (found_base) { + *res = *rent->res; + rc = 0; + break; + } + + found_base = true; + } + + acpi_dev_free_resource_list(&res_list); + return rc; +} +#else +static inline int acpi_stm_get_stimulus_area(struct device *dev, + struct resource *res) +{ + return -ENOENT; +} +#endif + static int stm_get_stimulus_area(struct device *dev, struct resource *res) { if (dev->of_node) return of_stm_get_stimulus_area(dev, res); + else if (is_acpi_node(dev->fwnode)) + return acpi_stm_get_stimulus_area(dev, res); return -ENOENT; }

All AMBA devices are handled via ACPI AMBA scan notifier infrastructure. The platform devices get the ACPI id added to their driver.

Cc: "Rafael J. Wysocki" rjw@rjwysocki.net Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/acpi/acpi_amba.c | 9 +++++++++ drivers/hwtracing/coresight/coresight-replicator.c | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c index 7f77c07..eef5a69 100644 --- a/drivers/acpi/acpi_amba.c +++ b/drivers/acpi/acpi_amba.c @@ -24,6 +24,15 @@

static const struct acpi_device_id amba_id_list[] = { {"ARMH0061", 0}, /* PL061 GPIO Device */ + {"ARMHC500", 0}, /* ARM CoreSight ETM4x */ + {"ARMHC501", 0}, /* ARM CoreSight ETR */ + {"ARMHC502", 0}, /* ARM CoreSight STM */ + {"ARMHC503", 0}, /* ARM CoreSight Debug */ + {"ARMHC979", 0}, /* ARM CoreSight TPIU */ + {"ARMHC97C", 0}, /* ARM CoreSight SoC-400 TMC, SoC-600 ETF/ETB */ + {"ARMHC98D", 0}, /* ARM CoreSight Dynamic Replicator */ + {"ARMHC9CA", 0}, /* ARM CoreSight CATU */ + {"ARMHC9FF", 0}, /* ARM CoreSight Funnel */ {"", 0}, };

diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 7b937c0..11b1978 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -5,6 +5,7 @@ * Description: CoreSight Replicator driver */

+#include <linux/acpi.h> #include <linux/amba/bus.h> #include <linux/kernel.h> #include <linux/device.h> @@ -288,11 +289,17 @@ static const struct of_device_id static_replicator_match[] = { {} };

+#ifdef CONFIG_ACPI +static const struct acpi_device_id static_replicator_acpi_ids[] = { + {"ARMHC985", 0}, /* ARM CoreSight Static Replicator */ +}; +#endif static struct platform_driver static_replicator_driver = { .probe = static_replicator_probe, .driver = { .name = "coresight-replicator", - .of_match_table = static_replicator_match, + .of_match_table = of_match_ptr(static_replicator_match), + .acpi_match_table = ACPI_PTR(static_replicator_acpi_ids), .pm = &replicator_dev_pm_ops, .suppress_bind_attrs = true, },

On Wed, Mar 20, 2019 at 06:49:27PM +0000, Suzuki K Poulose wrote:

Switch to using the coresight device instead of the parent amba device.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com

---

drivers/hwtracing/coresight/coresight-tpiu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c index b2f72a1..9763721 100644 --- a/drivers/hwtracing/coresight/coresight-tpiu.c +++ b/drivers/hwtracing/coresight/coresight-tpiu.c @@ -48,15 +48,13 @@ /**

• @base: memory mapped base address for this component.

• • @dev: the device entity associated to this component.

• • @dev: the coresight device entity associated to this component.
  • @atclk: optional clock for the core parts of the TPIU.

• • @csdev: component vitals needed by the framework.
  */

struct tpiu_drvdata { void __iomem *base; struct device *dev; struct clk *atclk;

• struct coresight_device *csdev;

Here again I would get rid of @dev rather than @csdev to be consistent with what was done previously.

Mathieu

}; static void tpiu_enable_hw(struct tpiu_drvdata *drvdata) @@ -121,6 +119,7 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id) struct tpiu_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 };

• struct coresight_device *csdev; struct device_node *np = adev->dev.of_node;

if (np) { @@ -134,7 +133,6 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id) if (!drvdata) return -ENOMEM;

• drvdata->dev = &adev->dev; drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */ if (!IS_ERR(drvdata->atclk)) { ret = clk_prepare_enable(drvdata->atclk);

@@ -160,9 +158,11 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id) desc.ops = &tpiu_cs_ops; desc.pdata = pdata; desc.dev = dev;

• drvdata->csdev = coresight_register(&desc);

• csdev = coresight_register(&desc);
• if (!IS_ERR(csdev))

• drvdata->dev = &csdev->dev;
  

• return PTR_ERR_OR_ZERO(drvdata->csdev);

• return PTR_ERR_OR_ZERO(csdev);

}

#ifdef CONFIG_PM

2.7.4

On 03/26/2019 09:54 PM, Mathieu Poirier wrote:

On Wed, Mar 20, 2019 at 06:49:27PM +0000, Suzuki K Poulose wrote:

...

Switch to using the coresight device instead of the parent amba device.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com

---

drivers/hwtracing/coresight/coresight-tpiu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c index b2f72a1..9763721 100644 --- a/drivers/hwtracing/coresight/coresight-tpiu.c +++ b/drivers/hwtracing/coresight/coresight-tpiu.c @@ -48,15 +48,13 @@ /**

• @base: memory mapped base address for this component.

• • @dev: the device entity associated to this component.

• • @dev: the coresight device entity associated to this component.
  • @atclk: optional clock for the core parts of the TPIU.

• • @csdev: component vitals needed by the framework.
  */ struct tpiu_drvdata { void __iomem *base; struct device *dev; struct clk *atclk;
• struct coresight_device *csdev;

Here again I would get rid of @dev rather than @csdev to be consistent with what was done previously.

Sure, will do.

Cheers Suzuki

On Wed, Mar 20, 2019 at 06:49:22PM +0000, Suzuki K Poulose wrote:

Merge the drivers for the two varieties of replicators into a singel one. The dynamic replicator has programming base which can be programmed to filter the trace data. The driver detects the type based on the "base" address value of the device, which is NULL for the static device.

Also, while at it, remove the now obsolete DYNAMIC_REPLICATOR config entry.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com

I'll pickup patches 1 to 5 immediately as they are useful on their own.

Mathieu

---

drivers/hwtracing/coresight/Kconfig | 8 - drivers/hwtracing/coresight/Makefile | 1 - .../coresight/coresight-dynamic-replicator.c | 285 --------------------- drivers/hwtracing/coresight/coresight-replicator.c | 174 ++++++++++++- 4 files changed, 169 insertions(+), 299 deletions(-) delete mode 100644 drivers/hwtracing/coresight/coresight-dynamic-replicator.c

diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig index ad34380..a40d796 100644 --- a/drivers/hwtracing/coresight/Kconfig +++ b/drivers/hwtracing/coresight/Kconfig @@ -81,14 +81,6 @@ config CORESIGHT_SOURCE_ETM4X for instruction level tracing. Depending on the implemented version data tracing may also be available. -config CORESIGHT_DYNAMIC_REPLICATOR

• bool "CoreSight Programmable Replicator driver"
• depends on CORESIGHT_LINKS_AND_SINKS
• help

•  This enables support for dynamic CoreSight replicator link driver.
  

•  The programmable ATB replicator allows independent filtering of the
  

•  trace data based on the traceid.
  

config CORESIGHT_STM bool "CoreSight System Trace Macrocell driver" depends on (ARM && !(CPU_32v3 || CPU_32v4 || CPU_32v4T)) || ARM64 diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile index 41870de..3b435aa 100644 --- a/drivers/hwtracing/coresight/Makefile +++ b/drivers/hwtracing/coresight/Makefile @@ -15,7 +15,6 @@ obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.o \ coresight-etm3x-sysfs.o obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o \ coresight-etm4x-sysfs.o -obj-$(CONFIG_CORESIGHT_DYNAMIC_REPLICATOR) += coresight-dynamic-replicator.o obj-$(CONFIG_CORESIGHT_STM) += coresight-stm.o obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o obj-$(CONFIG_CORESIGHT_CATU) += coresight-catu.o diff --git a/drivers/hwtracing/coresight/coresight-dynamic-replicator.c b/drivers/hwtracing/coresight/coresight-dynamic-replicator.c deleted file mode 100644 index b7d7c41..0000000 --- a/drivers/hwtracing/coresight/coresight-dynamic-replicator.c +++ /dev/null @@ -1,285 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/*

• • Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
• */

-#include <linux/amba/bus.h> -#include <linux/clk.h> -#include <linux/coresight.h> -#include <linux/device.h> -#include <linux/err.h> -#include <linux/init.h> -#include <linux/io.h> -#include <linux/kernel.h> -#include <linux/of.h> -#include <linux/pm_runtime.h> -#include <linux/slab.h>

-#include "coresight-priv.h"

-#define REPLICATOR_IDFILTER0 0x000 -#define REPLICATOR_IDFILTER1 0x004

-/**

• • struct replicator_drvdata - specifics associated to a replicator component
• • @base: memory mapped base address for this component.
• • @dev: the device entity associated with this component
• • @atclk: optional clock for the core parts of the replicator.
• • @csdev: component vitals needed by the framework
• */

-struct replicator_drvdata {

• void __iomem *base;
• struct device *dev;
• struct clk *atclk;
• struct coresight_device *csdev;

-};

-/*

• • dynamic_replicator_reset : Reset the replicator configuration to sane values.
• */

-static void dynamic_replicator_reset(struct replicator_drvdata *drvdata) -{

• CS_UNLOCK(drvdata->base);
• if (!coresight_claim_device_unlocked(drvdata->base)) {

• writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER0);
  

• writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER1);
  

• coresight_disclaim_device_unlocked(drvdata->base);
  

• }
• CS_LOCK(drvdata->base);

-}

-static int dynamic_replicator_enable(struct replicator_drvdata *drvdata,

• 		     int inport, int outport)
  

-{

• int rc = 0;
• u32 reg;
• switch (outport) {
• case 0:

• reg = REPLICATOR_IDFILTER0;
  

• break;
  

• case 1:

• reg = REPLICATOR_IDFILTER1;
  

• break;
  

• default:

• WARN_ON(1);
  

• return -EINVAL;
  

• }
• CS_UNLOCK(drvdata->base);
• if ((readl_relaxed(drvdata->base + REPLICATOR_IDFILTER0) == 0xff) &&

•    (readl_relaxed(drvdata->base + REPLICATOR_IDFILTER1) == 0xff))
  

• rc = coresight_claim_device_unlocked(drvdata->base);
  

• /* Ensure that the outport is enabled. */
• if (!rc)

• writel_relaxed(0x00, drvdata->base + reg);
  

• CS_LOCK(drvdata->base);
• return rc;

-}

-static int replicator_enable(struct coresight_device *csdev, int inport,

• 	     int outport)
  

-{

• int rc = 0;
• struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
• rc = dynamic_replicator_enable(drvdata, inport, outport);
• dev_dbg(drvdata->dev, "REPLICATOR enabled\n");
• return rc;

-}

-static void dynamic_replicator_disable(struct replicator_drvdata *drvdata,

• 		       int inport, int outport)
  

-{

• u32 reg;
• switch (outport) {
• case 0:

• reg = REPLICATOR_IDFILTER0;
  

• break;
  

• case 1:

• reg = REPLICATOR_IDFILTER1;
  

• break;
  

• default:

• WARN_ON(1);
  

• return;
  

• }
• CS_UNLOCK(drvdata->base);
• /* disable the flow of ATB data through port */
• writel_relaxed(0xff, drvdata->base + reg);
• if ((readl_relaxed(drvdata->base + REPLICATOR_IDFILTER0) == 0xff) &&

•    (readl_relaxed(drvdata->base + REPLICATOR_IDFILTER1) == 0xff))
  

• coresight_disclaim_device_unlocked(drvdata->base);
  

• CS_LOCK(drvdata->base);

-}

-static void replicator_disable(struct coresight_device *csdev, int inport,

• 	       int outport)
  

-{

• struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
• dynamic_replicator_disable(drvdata, inport, outport);
• dev_dbg(drvdata->dev, "REPLICATOR disabled\n");

-}

-static const struct coresight_ops_link replicator_link_ops = {

• .enable = replicator_enable,
• .disable = replicator_disable,

-};

-static const struct coresight_ops replicator_cs_ops = {

• .link_ops = &replicator_link_ops,

-};

-#define coresight_replicator_reg(name, offset) \

• coresight_simple_reg32(struct replicator_drvdata, name, offset)

-coresight_replicator_reg(idfilter0, REPLICATOR_IDFILTER0); -coresight_replicator_reg(idfilter1, REPLICATOR_IDFILTER1);

-static struct attribute *replicator_mgmt_attrs[] = {

• &dev_attr_idfilter0.attr,
• &dev_attr_idfilter1.attr,
• NULL,

-};

-static const struct attribute_group replicator_mgmt_group = {

• .attrs = replicator_mgmt_attrs,
• .name = "mgmt",

-};

-static const struct attribute_group *replicator_groups[] = {

• &replicator_mgmt_group,
• NULL,

-};

-static int replicator_probe(struct device *dev, struct resource *res) -{

• int ret = 0;
• struct coresight_platform_data *pdata = NULL;
• struct replicator_drvdata *drvdata;
• struct coresight_desc desc = { 0 };
• struct device_node *np = dev->of_node;
• void __iomem *base;
• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata))
  

• 	return PTR_ERR(pdata);
  

• dev->platform_data = pdata;
  

• }
• drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
• if (!drvdata)

• return -ENOMEM;
  

• drvdata->dev = dev;
• drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */
• if (!IS_ERR(drvdata->atclk)) {

• ret = clk_prepare_enable(drvdata->atclk);
  

• if (ret)
  

• 	return ret;
  

• }
• /*

• * Map the device base for dynamic-replicator, which has been
  

• * validated by AMBA core
  

• */
  

• if (res) {

• base = devm_ioremap_resource(dev, res);
  

• if (IS_ERR(base)) {
  

• 	ret = PTR_ERR(base);
  

• 	goto out_disable_clk;
  

• }
  

• drvdata->base = base;
  

• desc.groups = replicator_groups;
  

• }
• dev_set_drvdata(dev, drvdata);
• desc.type = CORESIGHT_DEV_TYPE_LINK;
• desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT;
• desc.ops = &replicator_cs_ops;
• desc.pdata = dev->platform_data;
• desc.dev = dev;
• drvdata->csdev = coresight_register(&desc);
• if (IS_ERR(drvdata->csdev)) {

• ret = PTR_ERR(drvdata->csdev);
  

• goto out_disable_clk;
  

• }
• dynamic_replicator_reset(drvdata);
• pm_runtime_put(dev);

-out_disable_clk:

• if (ret && !IS_ERR_OR_NULL(drvdata->atclk))

• clk_disable_unprepare(drvdata->atclk);
  

• return ret;

-}

-static int dynamic_replicator_probe(struct amba_device *adev,

• 		    const struct amba_id *id)
  

-{

• return replicator_probe(&adev->dev, &adev->res);

-}

-#ifdef CONFIG_PM -static int replicator_runtime_suspend(struct device *dev) -{

• struct replicator_drvdata *drvdata = dev_get_drvdata(dev);
• if (drvdata && !IS_ERR(drvdata->atclk))

• clk_disable_unprepare(drvdata->atclk);
  

• return 0;

-}

-static int replicator_runtime_resume(struct device *dev) -{

• struct replicator_drvdata *drvdata = dev_get_drvdata(dev);
• if (drvdata && !IS_ERR(drvdata->atclk))

• clk_prepare_enable(drvdata->atclk);
  

• return 0;

-} -#endif

-static const struct dev_pm_ops replicator_dev_pm_ops = {

• SET_RUNTIME_PM_OPS(replicator_runtime_suspend,

• 	   replicator_runtime_resume,
  

• 	   NULL)
  

-};

-static const struct amba_id dynamic_replicator_ids[] = {

• {

• .id     = 0x000bb909,
  

• .mask   = 0x000fffff,
  

• },
• {

• /* Coresight SoC-600 */
  

• .id     = 0x000bb9ec,
  

• .mask   = 0x000fffff,
  

• },
• { 0, 0 },

-};

-static struct amba_driver dynamic_replicator_driver = {

• .drv = {

• .name	= "coresight-dynamic-replicator",
  

• .pm	= &replicator_dev_pm_ops,
  

• .suppress_bind_attrs = true,
  

• },
• .probe = dynamic_replicator_probe,
• .id_table = dynamic_replicator_ids,

-}; -builtin_amba_driver(dynamic_replicator_driver); diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 43cbcf1..4e0da85 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -1,10 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 /*

• • Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.

• • Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
  • Description: CoreSight Replicator driver
  */

+#include <linux/amba/bus.h> #include <linux/kernel.h> #include <linux/device.h> #include <linux/platform_device.h> @@ -18,25 +19,117 @@ #include "coresight-priv.h" +#define REPLICATOR_IDFILTER0 0x000 +#define REPLICATOR_IDFILTER1 0x004

/**

• struct replicator_drvdata - specifics associated to a replicator component

• • @base: memory mapped base address for this component. Also indicates

• • whether this one is programmable or not.
    

  • @dev: the device entity associated with this component
  • @atclk: optional clock for the core parts of the replicator.
  • @csdev: component vitals needed by the framework
  */

struct replicator_drvdata {

• void __iomem *base; struct device *dev; struct clk *atclk; struct coresight_device *csdev;

}; +static void dynamic_replicator_reset(struct replicator_drvdata *drvdata) +{

• CS_UNLOCK(drvdata->base);
• if (!coresight_claim_device_unlocked(drvdata->base)) {

• writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER0);
  

• writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER1);
  

• coresight_disclaim_device_unlocked(drvdata->base);
  

• }
• CS_LOCK(drvdata->base);

+}

+/*

• • replicator_reset : Reset the replicator configuration to sane values.
• */

+static inline void replicator_reset(struct replicator_drvdata *drvdata) +{

• if (drvdata->base)

• dynamic_replicator_reset(drvdata);
  

+}

+static int dynamic_replicator_enable(struct replicator_drvdata *drvdata,

• 		     int inport, int outport)
  

+{

• int rc = 0;
• u32 reg;
• switch (outport) {
• case 0:

• reg = REPLICATOR_IDFILTER0;
  

• break;
  

• case 1:

• reg = REPLICATOR_IDFILTER1;
  

• break;
  

• default:

• WARN_ON(1);
  

• return -EINVAL;
  

• }
• CS_UNLOCK(drvdata->base);
• if ((readl_relaxed(drvdata->base + REPLICATOR_IDFILTER0) == 0xff) &&

•    (readl_relaxed(drvdata->base + REPLICATOR_IDFILTER1) == 0xff))
  

• rc = coresight_claim_device_unlocked(drvdata->base);
  

• /* Ensure that the outport is enabled. */
• if (!rc)

• writel_relaxed(0x00, drvdata->base + reg);
  

• CS_LOCK(drvdata->base);
• return rc;

+}

static int replicator_enable(struct coresight_device *csdev, int inport, int outport) {

• int rc = 0; struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);

• dev_dbg(drvdata->dev, "REPLICATOR enabled\n");
• return 0;

• if (drvdata->base)

• rc = dynamic_replicator_enable(drvdata, inport, outport);
  

• if (!rc)

• dev_dbg(drvdata->dev, "REPLICATOR enabled\n");
  

• return rc;

+}

+static void dynamic_replicator_disable(struct replicator_drvdata *drvdata,

• 		       int inport, int outport)
  

+{

• u32 reg;
• switch (outport) {
• case 0:

• reg = REPLICATOR_IDFILTER0;
  

• break;
  

• case 1:

• reg = REPLICATOR_IDFILTER1;
  

• break;
  

• default:

• WARN_ON(1);
  

• return;
  

• }
• CS_UNLOCK(drvdata->base);
• /* disable the flow of ATB data through port */
• writel_relaxed(0xff, drvdata->base + reg);
• if ((readl_relaxed(drvdata->base + REPLICATOR_IDFILTER0) == 0xff) &&

•    (readl_relaxed(drvdata->base + REPLICATOR_IDFILTER1) == 0xff))
  

• coresight_disclaim_device_unlocked(drvdata->base);
  

• CS_LOCK(drvdata->base);

} static void replicator_disable(struct coresight_device *csdev, int inport, @@ -44,6 +137,8 @@ static void replicator_disable(struct coresight_device *csdev, int inport, { struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);

• if (drvdata->base)

• dynamic_replicator_disable(drvdata, inport, outport);
  

  dev_dbg(drvdata->dev, "REPLICATOR disabled\n");

} @@ -56,13 +151,36 @@ static const struct coresight_ops replicator_cs_ops = { .link_ops = &replicator_link_ops, }; -static int replicator_probe(struct device *dev) +#define coresight_replicator_reg(name, offset) \

• coresight_simple_reg32(struct replicator_drvdata, name, offset)

+coresight_replicator_reg(idfilter0, REPLICATOR_IDFILTER0); +coresight_replicator_reg(idfilter1, REPLICATOR_IDFILTER1);

+static struct attribute *replicator_mgmt_attrs[] = {

• &dev_attr_idfilter0.attr,
• &dev_attr_idfilter1.attr,
• NULL,

+};

+static const struct attribute_group replicator_mgmt_group = {

• .attrs = replicator_mgmt_attrs,
• .name = "mgmt",

+};

+static const struct attribute_group *replicator_groups[] = {

• &replicator_mgmt_group,
• NULL,

+};

+static int replicator_probe(struct device *dev, struct resource *res) { int ret = 0; struct coresight_platform_data *pdata = NULL; struct replicator_drvdata *drvdata; struct coresight_desc desc = { 0 }; struct device_node *np = dev->of_node;

• void __iomem *base;

if (np) { pdata = of_get_coresight_platform_data(dev, np); @@ -83,6 +201,20 @@ static int replicator_probe(struct device *dev) return ret; }

• /*

• * Map the device base for dynamic-replicator, which has been
  

• * validated by AMBA core
  

• */
  

• if (res) {

• base = devm_ioremap_resource(dev, res);
  

• if (IS_ERR(base)) {
  

• 	ret = PTR_ERR(base);
  

• 	goto out_disable_clk;
  

• }
  

• drvdata->base = base;
  

• desc.groups = replicator_groups;
  

• }
• dev_set_drvdata(dev, drvdata);

desc.type = CORESIGHT_DEV_TYPE_LINK; @@ -96,6 +228,7 @@ static int replicator_probe(struct device *dev) goto out_disable_clk; }

• replicator_reset(drvdata); pm_runtime_put(dev);

out_disable_clk: @@ -112,7 +245,8 @@ static int static_replicator_probe(struct platform_device *pdev) pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev);

• ret = replicator_probe(&pdev->dev);

• /* Static replicators do not have programming base */
• ret = replicator_probe(&pdev->dev, NULL);

if (ret) { pm_runtime_put_noidle(&pdev->dev); @@ -164,3 +298,33 @@ static struct platform_driver static_replicator_driver = { }, }; builtin_platform_driver(static_replicator_driver);

+static int dynamic_replicator_probe(struct amba_device *adev,

• 		    const struct amba_id *id)
  

+{

• return replicator_probe(&adev->dev, &adev->res);

+}

+static const struct amba_id dynamic_replicator_ids[] = {

• {

• .id     = 0x000bb909,
  

• .mask   = 0x000fffff,
  

• },
• {

• /* Coresight SoC-600 */
  

• .id     = 0x000bb9ec,
  

• .mask   = 0x000fffff,
  

• },
• { 0, 0 },

+};

+static struct amba_driver dynamic_replicator_driver = {

• .drv = {

• .name	= "coresight-dynamic-replicator",
  

• .pm	= &replicator_dev_pm_ops,
  

• .suppress_bind_attrs = true,
  

• },
• .probe = dynamic_replicator_probe,
• .id_table = dynamic_replicator_ids,

+};

+builtin_amba_driver(dynamic_replicator_driver);

2.7.4

On Wed, Mar 20, 2019 at 06:49:30PM +0000, Suzuki K Poulose wrote:

Track the coresight device instead of the real device.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com

---

drivers/hwtracing/coresight/coresight-etb10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index 105782e..a471cbd 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -97,12 +97,12 @@ static unsigned int etb_get_buffer_depth(struct etb_drvdata *drvdata) { u32 depth = 0;

• pm_runtime_get_sync(drvdata->dev);

• pm_runtime_get_sync(drvdata->dev->parent);

/* RO registers don't need locking */ depth = readl_relaxed(drvdata->base + ETB_RAM_DEPTH_REG);

• pm_runtime_put(drvdata->dev);

• pm_runtime_put(drvdata->dev->parent); return depth;

} @@ -701,7 +701,6 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) if (!drvdata) return -ENOMEM;

• drvdata->dev = &adev->dev; drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */ if (!IS_ERR(drvdata->atclk)) { ret = clk_prepare_enable(drvdata->atclk);

@@ -740,6 +739,7 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) if (IS_ERR(drvdata->csdev)) return PTR_ERR(drvdata->csdev);

• drvdata->dev = &drvdata->csdev->dev;

For patch 11, 12, 13 - same comment as earlier. Let's use drvdata::csdev and get rid of drvdata::dev.

drvdata->miscdev.name = pdata->name; drvdata->miscdev.minor = MISC_DYNAMIC_MINOR; drvdata->miscdev.fops = &etb_fops; -- 2.7.4

On Wed, Mar 20, 2019 at 06:49:35PM +0000, Suzuki K Poulose wrote:

So far we have hard coded the DT platform parsing code in every driver. Introduce generic helper to parse the information provided by the firmware in a platform agnostic manner, in preparation for the ACPI support.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com

---

drivers/hwtracing/coresight/coresight-catu.c | 13 ++--- drivers/hwtracing/coresight/coresight-etb10.c | 11 ++-- drivers/hwtracing/coresight/coresight-etm3x.c | 12 ++-- drivers/hwtracing/coresight/coresight-etm4x.c | 11 ++-- drivers/hwtracing/coresight/coresight-funnel.c | 11 ++-- drivers/hwtracing/coresight/coresight-platform.c | 65 +++++++++++++--------- drivers/hwtracing/coresight/coresight-replicator.c | 12 ++-- drivers/hwtracing/coresight/coresight-stm.c | 11 ++-- drivers/hwtracing/coresight/coresight-tmc.c | 13 ++--- drivers/hwtracing/coresight/coresight-tpiu.c | 11 ++-- include/linux/coresight.h | 7 +-- 11 files changed, 80 insertions(+), 97 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index 671a05a..4595c67 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -503,17 +503,14 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) struct coresight_desc catu_desc; struct coresight_platform_data *pdata = NULL; struct device *dev = &adev->dev;

• struct device_node *np = dev->of_node; void __iomem *base;

• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata)) {
  

• 	ret = PTR_ERR(pdata);
  

• 	goto out;
  

• }
  

• dev->platform_data = pdata;
  

• pdata = coresight_get_platform_data(dev);
• if (IS_ERR(pdata)) {

• ret = PTR_ERR(pdata);
  

• goto out;
  

  }
• dev->platform_data = pdata;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) { diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index a471cbd..e4175849 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -688,14 +688,11 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) struct etb_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 };

• struct device_node *np = adev->dev.of_node;

• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata))
  

• 	return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;
  

• }

• pdata = coresight_get_platform_data(dev);
• if (IS_ERR(pdata))

• return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index 7137f06..b101464 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -788,20 +788,16 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) struct etm_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 };

• struct device_node *np = adev->dev.of_node;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM;

• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata))
  

• 	return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;
  

• }

• pdata = coresight_get_platform_data(dev);
• if (IS_ERR(pdata))

• return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata; drvdata->use_cp14 = fwnode_property_read_bool(dev->fwnode, "arm,cp14"); dev_set_drvdata(dev, drvdata);

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index 8d5ee3b..bfc23ab 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -974,18 +974,15 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) struct etmv4_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 };

• struct device_node *np = adev->dev.of_node;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM;

• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata))
  

• 	return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;
  

• }

• pdata = coresight_get_platform_data(dev);
• if (IS_ERR(pdata))

• return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;

dev_set_drvdata(dev, drvdata); diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index 1085f31..2590744 100644 --- a/drivers/hwtracing/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c @@ -185,14 +185,11 @@ static int funnel_probe(struct amba_device *adev, const struct amba_id *id) struct funnel_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 };

• struct device_node *np = adev->dev.of_node;

• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata))
  

• 	return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;
  

• }

• pdata = coresight_get_platform_data(dev);
• if (IS_ERR(pdata))

• return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 514cc2b..693e3f5 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -17,6 +17,20 @@ #include <linux/cpumask.h> #include <asm/smp_plat.h> +static int coresight_alloc_conns(struct device *dev,

• 		 struct coresight_platform_data *pdata)
  

+{

• if (pdata->nr_outport) {

• pdata->conns = devm_kzalloc(dev, pdata->nr_outport *
  

• 			    sizeof(*pdata->conns),
  

• 			    GFP_KERNEL);
  

• if (!pdata->conns)
  

• 	return -ENOMEM;
  

• }
• return 0;

+}

#ifdef CONFIG_OF static int of_dev_node_match(struct device *dev, void *data) { @@ -133,20 +147,6 @@ static void of_coresight_get_ports(const struct device_node *node, } } -static int of_coresight_alloc_memory(struct device *dev,

• 	struct coresight_platform_data *pdata)
  

-{

• if (pdata->nr_outport) {

• pdata->conns = devm_kzalloc(dev, pdata->nr_outport *
  

• 			    sizeof(*pdata->conns),
  

• 			    GFP_KERNEL);
  

• if (!pdata->conns)
  

• 	return -ENOMEM;
  

• }
• return 0;

-}

int of_coresight_get_cpu(const struct device_node *node) { int cpu; @@ -226,23 +226,17 @@ static int of_coresight_parse_endpoint(struct device *dev, return ret; } -struct coresight_platform_data * +static struct coresight_platform_data * of_get_coresight_platform_data(struct device *dev,

• 	       const struct device_node *node)
  

• 	       struct coresight_platform_data *pdata)
  

{ int ret = 0;

• struct coresight_platform_data *pdata; struct coresight_connection *conn; struct device_node *ep = NULL; const struct device_node *parent = NULL; bool legacy_binding = false;

• struct device_node *node = dev->of_node;

• pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
• if (!pdata)

• return ERR_PTR(-ENOMEM);
  

• /* Use device name as sysfs handle */
• pdata->name = dev_name(dev); pdata->cpu = of_coresight_get_cpu(node);

/* Get the number of input and output port for this component */ @@ -252,7 +246,7 @@ of_get_coresight_platform_data(struct device *dev, if (!pdata->nr_outport) return pdata;

• ret = of_coresight_alloc_memory(dev, pdata);

• ret = coresight_alloc_conns(dev, pdata);

I'm pretty sure you're doing this because you want to use coresight_alloc_conns() for ACPI as well, and I'm fine with that. But it is quite orthogonal to the rest of the work done in this patch and as such I think it needs a patch of its own.

if (ret) return ERR_PTR(ret); @@ -294,5 +288,26 @@ of_get_coresight_platform_data(struct device *dev, return pdata; } -EXPORT_SYMBOL_GPL(of_get_coresight_platform_data); #endif

+struct coresight_platform_data * +coresight_get_platform_data(struct device *dev) +{

• struct coresight_platform_data *pdata;
• if (IS_ERR_OR_NULL(dev->fwnode))

• return NULL;
  

• pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
• if (!pdata)

• return ERR_PTR(-ENOMEM);
  

• /* Use device name as sysfs handle */
• pdata->name = dev_name(dev);
• if (is_of_node(dev->fwnode))

• return of_get_coresight_platform_data(dev, pdata);
  

• return ERR_PTR(-ENOENT);

+} +EXPORT_SYMBOL_GPL(coresight_get_platform_data); diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 8bbb008..7eb3bf7 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -177,15 +177,12 @@ static int replicator_probe(struct device *dev, struct resource *res) struct coresight_platform_data *pdata = NULL; struct replicator_drvdata *drvdata; struct coresight_desc desc = { 0 };

• struct device_node *np = dev->of_node; void __iomem *base;

• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata))
  

• 	return PTR_ERR(pdata);
  

• dev->platform_data = pdata;
  

• }

• pdata = coresight_get_platform_data(dev);
• if (IS_ERR(pdata))

• return PTR_ERR(pdata);
  

• dev->platform_data = pdata;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) @@ -213,7 +210,6 @@ static int replicator_probe(struct device *dev, struct resource *res) } dev_set_drvdata(dev, drvdata);

• desc.type = CORESIGHT_DEV_TYPE_LINK; desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT; desc.ops = &replicator_cs_ops;

diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c index eb96bba..6514586 100644 --- a/drivers/hwtracing/coresight/coresight-stm.c +++ b/drivers/hwtracing/coresight/coresight-stm.c @@ -809,14 +809,11 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) size_t bitmap_size; struct coresight_desc desc = { 0 }; struct coresight_device *csdev;

• struct device_node *np = adev->dev.of_node;

• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata))
  

• 	return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;
  

• }

• pdata = coresight_get_platform_data(dev);
• if (IS_ERR(pdata))

• return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM;

diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index 7ce3427..147ab17 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -394,16 +394,13 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) struct tmc_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 };

• struct device_node *np = adev->dev.of_node;

• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata)) {
  

• 	ret = PTR_ERR(pdata);
  

• 	goto out;
  

• }
  

• adev->dev.platform_data = pdata;
  

• pdata = coresight_get_platform_data(dev);
• if (IS_ERR(pdata)) {

• ret = PTR_ERR(pdata);
  

• goto out;
  

  }
• adev->dev.platform_data = pdata;

ret = -ENOMEM; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c index 9763721..18a749a 100644 --- a/drivers/hwtracing/coresight/coresight-tpiu.c +++ b/drivers/hwtracing/coresight/coresight-tpiu.c @@ -120,14 +120,11 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id) struct resource *res = &adev->res; struct coresight_desc desc = { 0 }; struct coresight_device *csdev;

• struct device_node *np = adev->dev.of_node;

• if (np) {

• pdata = of_get_coresight_platform_data(dev, np);
  

• if (IS_ERR(pdata))
  

• 	return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;
  

• }

• pdata = coresight_get_platform_data(dev);
• if (IS_ERR(pdata))

• return PTR_ERR(pdata);
  

• adev->dev.platform_data = pdata;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 7b87965..5b29255 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -293,14 +293,11 @@ static inline void coresight_disclaim_device_unlocked(void __iomem *base) {} #ifdef CONFIG_OF extern int of_coresight_get_cpu(const struct device_node *node); -extern struct coresight_platform_data * -of_get_coresight_platform_data(struct device *dev,

• 	       const struct device_node *node);
  

#else static inline int of_coresight_get_cpu(const struct device_node *node) { return 0; } -static inline struct coresight_platform_data *of_get_coresight_platform_data(

• struct device *dev, const struct device_node *node) { return NULL; }

#endif +struct coresight_platform_data *coresight_get_platform_data(struct device *dev);

#endif

2.7.4

On Wed, Mar 20, 2019 at 06:49:38PM +0000, Suzuki K Poulose wrote:

We rely on the device names to find a CoreSight device on the coresight bus. The device name however is obtained from the platform, which is bound to the real platform/amba device. As we are about to use different naming scheme for the coresight devices, we can't rely on the platform device name to find the corresponding coresight device. Instead we use the platform agnostic "fwnode handle" of the parent device to find the devices. We also reuse the same fwnode as the parent for the Coresight device we create.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com

---

drivers/hwtracing/coresight/coresight-platform.c | 10 ++++------ drivers/hwtracing/coresight/coresight-priv.h | 2 ++ drivers/hwtracing/coresight/coresight.c | 19 +++++++++++-------- include/linux/coresight.h | 4 ++-- 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 877ed2b..5eee987 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -31,7 +31,7 @@ static int coresight_alloc_conns(struct device *dev, return 0; } -static int coresight_fwnode_handle_match(struct device *dev, void *data) +int coresight_match_fwnode_handle(struct device *dev, void *data) { return dev_fwnode(dev) == data; } @@ -46,7 +46,7 @@ coresight_find_device_by_fwnode(struct fwnode_handle *fwnode) * platform bus. */ dev = bus_find_device(&platform_bus_type, NULL,

• 	      fwnode, coresight_fwnode_handle_match);
  

• 	      fwnode, coresight_match_fwnode_handle);
  

  if (dev) return dev;

@@ -55,7 +55,7 @@ coresight_find_device_by_fwnode(struct fwnode_handle *fwnode) * looking for the device that matches the endpoint node. */ return bus_find_device(&amba_bustype, NULL,

• 	       fwnode, coresight_fwnode_handle_match);
  

• 	       fwnode, coresight_match_fwnode_handle);
  

}

Please change the name to coresight_match_fwnode_handle() in the previous patch so that it is set only once.

#ifdef CONFIG_OF @@ -214,9 +214,7 @@ static int of_coresight_parse_endpoint(struct device *dev, } conn->outport = endpoint.port;

• conn->child_name = devm_kstrdup(dev,
  

• 				dev_name(rdev),
  

• 				GFP_KERNEL);
  

• conn->child_fwnode = fwnode_handle_get(rdev_fwnode);
  

I think it is worth adding a comment saying the refcount on the handle is decremented in coresight_remove_match(). It is quite obvious when looking at this patch but I suspect it won't be so in 1 year from now when trying to understand this code again, especially since the increment/decrement are in different files.

conn->child_port = rendpoint.port;
/* Connection record updated */
ret = 1;

diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index e0684d0..8fb1243 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -153,6 +153,8 @@ struct list_head *coresight_build_path(struct coresight_device *csdev, struct coresight_device *sink); void coresight_release_path(struct list_head *path); +int coresight_match_fwnode_handle(struct device *dev, void *data);

#ifdef CONFIG_CORESIGHT_SOURCE_ETM3X extern int etm_readl_cp14(u32 off, unsigned int *val); extern int etm_writel_cp14(u32 off, u32 val); diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index 29cef89..9cdedab 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -1005,13 +1005,11 @@ static int coresight_orphan_match(struct device *dev, void *data) /* We have found at least one orphan connection */ if (conn->child_dev == NULL) { /* Does it match this newly added device? */

• 	if (conn->child_name &&
  

• 	    !strcmp(dev_name(&csdev->dev), conn->child_name)) {
  

• 	if (conn->child_fwnode ==  csdev->dev.fwnode)
  	conn->child_dev = csdev;
  

• 	} else {
  

• 	else
  	/* This component still has an orphan */
  	still_orphan = true;
  

• 	}
  

  } }

@@ -1043,9 +1041,9 @@ static void coresight_fixup_device_conns(struct coresight_device *csdev) struct coresight_connection *conn = &csdev->conns[i]; struct device *dev = NULL;

• if (conn->child_name)
  

• 	dev = bus_find_device_by_name(&coresight_bustype, NULL,
  

• 				      conn->child_name);
  

• dev = bus_find_device(&coresight_bustype, NULL,
  

• 		      (void *)conn->child_fwnode,
  

• 		      coresight_match_fwnode_handle);
  

  if (dev) { conn->child_dev = to_coresight_device(dev); /* and put reference from 'bus_find_device()' */

@@ -1080,9 +1078,11 @@ static int coresight_remove_match(struct device *dev, void *data) if (conn->child_dev == NULL) continue;

• if (!strcmp(dev_name(&csdev->dev), conn->child_name)) {
  

• if (csdev->dev.fwnode == conn->child_fwnode) {
  iterator->orphan = true;
  conn->child_dev = NULL;
  

• 	/* Drop the reference to the handle for connection */
  

Same as above, please comment where this gets incremented.

• 	fwnode_handle_put(conn->child_fwnode);
  /* No need to continue */
  break;
  

  }

@@ -1198,6 +1198,8 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) csdev->dev.parent = desc->dev; csdev->dev.release = coresight_device_release; csdev->dev.bus = &coresight_bustype;

• csdev->dev.fwnode = fwnode_handle_get(dev_fwnode(desc->dev));
• dev_set_name(&csdev->dev, "%s", desc->pdata->name);

ret = device_register(&csdev->dev); @@ -1247,6 +1249,7 @@ void coresight_unregister(struct coresight_device *csdev) etm_perf_del_symlink_sink(csdev); /* Remove references of that device in the topology */ coresight_remove_conns(csdev);

• fwnode_handle_put(csdev->dev.fwnode); device_unregister(&csdev->dev);

} EXPORT_SYMBOL_GPL(coresight_unregister); diff --git a/include/linux/coresight.h b/include/linux/coresight.h index a48cd9b..76c31b2 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -128,14 +128,14 @@ struct coresight_desc { /**

• struct coresight_connection - representation of a single connection
• @outport: a connection's output port number.

• • @chid_name: remote component's name.

• • @chid_fwnode: remote component's fwnode handle.
  • @child_port: remote component's port number @output is connected to.
  • @child_dev: a @coresight_device representation of the component connected to @outport.
  */

struct coresight_connection { int outport;

• const char *child_name;

• struct fwnode_handle *child_fwnode;

Please drop this one line to group all the struct together.

int child_port; struct coresight_device *child_dev; }; -- 2.7.4

On Wed, Mar 20, 2019 at 06:49:39PM +0000, Suzuki K Poulose wrote:

So far we have reused the name of the "platform" device for the CoreSight device. But this is not very intuitive when we move to ACPI. Also, the ACPI device names have ":" in them (e.g, ARMHC97C:01), which the perf tool doesn't like very much. This patch introduces a generic naming scheme, givin more intuitive names for the devices that appear on the CoreSight bus. The names follow the pattern "prefix" followed by "index" (e.g, etm5). We maintain a list of allocated devices per "prefix" to make sure we don't allocate a new name when it is reprobed (e.g, due to unsatisifed device dependencies). So, we maintain the list of "fwnodes" of the parent devices to allocate a consistent name. All devices except the ETMs get an index allocated in the order of probing. ETMs get an index based on the CPU they are attached to.

TMC devices are named using "tmc_etf", "tmc_etb", and "tmc_etr" prefixes depending on the configuration of the device.

The replicators are not classified as dynamic/static anymore. One could easily figure that out by checking the presence of "mgmt" registers under sysfs.

Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com

---

drivers/hwtracing/coresight/coresight-catu.c | 7 +++ drivers/hwtracing/coresight/coresight-etb10.c | 6 +++ drivers/hwtracing/coresight/coresight-etm3x.c | 5 ++ drivers/hwtracing/coresight/coresight-etm4x.c | 4 ++ drivers/hwtracing/coresight/coresight-funnel.c | 6 +++ drivers/hwtracing/coresight/coresight-replicator.c | 7 +++ drivers/hwtracing/coresight/coresight-stm.c | 6 +++ drivers/hwtracing/coresight/coresight-tmc.c | 14 ++++++ drivers/hwtracing/coresight/coresight-tpiu.c | 6 +++ drivers/hwtracing/coresight/coresight.c | 58 ++++++++++++++++++++++ include/linux/coresight.h | 25 +++++++++- 11 files changed, 143 insertions(+), 1 deletion(-)

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index 4595c67..6492bce 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -28,6 +28,8 @@ #define catu_dbg(x, ...) do {} while (0) #endif +DEFINE_CORESIGHT_DEVLIST(catu_devs, "catu");

struct catu_etr_buf { struct tmc_sg_table *catu_table; dma_addr_t sladdr; @@ -510,6 +512,11 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) ret = PTR_ERR(pdata); goto out; }

• pdata->name = coresight_alloc_device_name(&catu_devs, dev);
• if (!pdata->name)

• return -ENOMEM;
  

• dev->platform_data = pdata;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index e4175849..42b525c 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -62,6 +62,8 @@ #define ETB_FFSR_BIT 1 #define ETB_FRAME_SIZE_WORDS 4 +DEFINE_CORESIGHT_DEVLIST(etb10_devs, "etb10_");

I would drop the "10_" and just call it "etb". Below we have "tmc_etb" so there is no chance of mistake.

/**

• struct etb_drvdata - specifics associated to an ETB component
• @base: memory mapped base address for this component.

@@ -692,6 +694,10 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) pdata = coresight_get_platform_data(dev); if (IS_ERR(pdata)) return PTR_ERR(pdata);

• pdata->name = coresight_alloc_device_name(&etb10_devs, dev);
• if (!pdata->name)

• return -ENOMEM;
  

• adev->dev.platform_data = pdata;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index b101464..35ed953 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -797,6 +797,11 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) if (IS_ERR(pdata)) return PTR_ERR(pdata);

• pdata->name = devm_kasprintf(dev, GFP_KERNEL,

• 		      "etm%d", pdata->cpu);
  

• if (!pdata->name)

• return -ENOMEM;
  

• adev->dev.platform_data = pdata; drvdata->use_cp14 = fwnode_property_read_bool(dev->fwnode, "arm,cp14"); dev_set_drvdata(dev, drvdata);

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index bfc23ab..55fcb78 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -982,6 +982,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) pdata = coresight_get_platform_data(dev); if (IS_ERR(pdata)) return PTR_ERR(pdata);

• pdata->name = devm_kasprintf(dev, GFP_KERNEL, "etm%d", pdata->cpu);
• if (!pdata->name)

• return -ENOMEM;
  

• adev->dev.platform_data = pdata;

dev_set_drvdata(dev, drvdata); diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index 2590744..96b6773 100644 --- a/drivers/hwtracing/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c @@ -27,6 +27,8 @@ #define FUNNEL_HOLDTIME (0x7 << FUNNEL_HOLDTIME_SHFT) #define FUNNEL_ENSx_MASK 0xff +DEFINE_CORESIGHT_DEVLIST(funnel_devs, "funnel");

/**

• struct funnel_drvdata - specifics associated to a funnel component
• @base: memory mapped base address for this component.

@@ -189,6 +191,10 @@ static int funnel_probe(struct amba_device *adev, const struct amba_id *id) pdata = coresight_get_platform_data(dev); if (IS_ERR(pdata)) return PTR_ERR(pdata);

• pdata->name = coresight_alloc_device_name(&funnel_devs, dev);
• if (!pdata->name)

• return -ENOMEM;
  

• adev->dev.platform_data = pdata;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 7eb3bf7..7b937c0 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -22,6 +22,8 @@ #define REPLICATOR_IDFILTER0 0x000 #define REPLICATOR_IDFILTER1 0x004 +DEFINE_CORESIGHT_DEVLIST(replicator_devs, "replicator");

/**

• struct replicator_drvdata - specifics associated to a replicator component
• @base: memory mapped base address for this component. Also indicates

@@ -184,6 +186,11 @@ static int replicator_probe(struct device *dev, struct resource *res) return PTR_ERR(pdata); dev->platform_data = pdata;

• pdata->name = coresight_alloc_device_name(&replicator_devs, dev);

Please remove the extra new line here.

• if (!pdata->name)

• return -ENOMEM;
  

• drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM;

diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c index 6514586..d94ae22 100644 --- a/drivers/hwtracing/coresight/coresight-stm.c +++ b/drivers/hwtracing/coresight/coresight-stm.c @@ -107,6 +107,8 @@ struct channel_space { unsigned long *guaranteed; }; +DEFINE_CORESIGHT_DEVLIST(stm_devs, "stm");

/**

• struct stm_drvdata - specifics associated to an STM component
• @base: memory mapped base address for this component.

@@ -813,6 +815,10 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) pdata = coresight_get_platform_data(dev); if (IS_ERR(pdata)) return PTR_ERR(pdata);

• pdata->name = coresight_alloc_device_name(&stm_devs, dev);
• if (!pdata->name)

• return -ENOMEM;
  

• adev->dev.platform_data = pdata; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata)

diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index 147ab17..030303d 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -25,6 +25,10 @@ #include "coresight-priv.h" #include "coresight-tmc.h" +DEFINE_CORESIGHT_DEVLIST(etb_devs, "tmc_etb"); +DEFINE_CORESIGHT_DEVLIST(etf_devs, "tmc_etf"); +DEFINE_CORESIGHT_DEVLIST(etr_devs, "tmc_etr");

void tmc_wait_for_tmcready(struct tmc_drvdata *drvdata) { /* Ensure formatter, unformatter and hardware fifo are empty */ @@ -394,6 +398,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) struct tmc_drvdata *drvdata; struct resource *res = &adev->res; struct coresight_desc desc = { 0 };

• struct coresight_dev_list *dev_list = NULL;

pdata = coresight_get_platform_data(dev); if (IS_ERR(pdata)) { @@ -440,6 +445,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) desc.type = CORESIGHT_DEV_TYPE_SINK; desc.subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_BUFFER; desc.ops = &tmc_etb_cs_ops;

• dev_list = &etb_devs;
  

  break; case TMC_CONFIG_TYPE_ETR: desc.type = CORESIGHT_DEV_TYPE_SINK;

@@ -449,11 +455,13 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) coresight_get_uci_data(id)); if (ret) goto out;

• dev_list = &etr_devs;
  

  break; case TMC_CONFIG_TYPE_ETF: desc.type = CORESIGHT_DEV_TYPE_LINKSINK; desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_FIFO; desc.ops = &tmc_etf_cs_ops;

• dev_list = &etf_devs;
  

  break; default: pr_err("%s: Unsupported TMC config\n", pdata->name);

@@ -461,6 +469,12 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) goto out; }

• pdata->name = coresight_alloc_device_name(dev_list, dev);
• if (!pdata->name) {

• ret = -ENOMEM;
  

• goto out;
  

• }
• drvdata->csdev = coresight_register(&desc); if (IS_ERR(drvdata->csdev)) { ret = PTR_ERR(drvdata->csdev);

diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c index 18a749a..f5cc457 100644 --- a/drivers/hwtracing/coresight/coresight-tpiu.c +++ b/drivers/hwtracing/coresight/coresight-tpiu.c @@ -46,6 +46,8 @@ #define FFCR_FON_MAN BIT(6) #define FFCR_STOP_FI BIT(12) +DEFINE_CORESIGHT_DEVLIST(tpiu_devs, "tpiu");

/**

• @base: memory mapped base address for this component.
• @dev: the coresight device entity associated to this component.

@@ -124,6 +126,10 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id) pdata = coresight_get_platform_data(dev); if (IS_ERR(pdata)) return PTR_ERR(pdata);

• pdata->name = coresight_alloc_device_name(&tpiu_devs, dev);
• if (!pdata->name)

• return -ENOMEM;
  

• adev->dev.platform_data = pdata;

drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index 9cdedab..ca40c55 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -1253,3 +1253,61 @@ void coresight_unregister(struct coresight_device *csdev) device_unregister(&csdev->dev); } EXPORT_SYMBOL_GPL(coresight_unregister);

Extra line

+/*

• • coresight_search_device_idx - Search the fwnode handle of a device
• • in the given dev_idx list. Must be called with the coresight_mutex held.
• • Returns the index of the entry, when found. Otherwise, -ENOENT.
• */

+static inline int coresight_search_device_idx(struct coresight_dev_list *dict,

• 			      struct fwnode_handle *fwnode)
  

+{

• int i;
• for (i = 0; i < dict->nr_idx; i++)

• if (dict->fwnode_list[i] == fwnode)
  

• 	return i;
  

• return -ENOENT;

+}

+/*

• • coresight_alloc_device_name - Get an index for a given device in the
• • device index list specific to a driver. An index is allocated for a
• • device and is tracked with the fwnode_handle to prevent allocating
• • duplicate indices for the same device (e.g, if we defer probing of
• • a device due to dependencies), in case the index is requested again.
• */

+char *coresight_alloc_device_name(struct coresight_dev_list *dict,

• 		  struct device *dev)
  

+{

• int idx;
• char *name = NULL;
• struct fwnode_handle **list;
• mutex_lock(&coresight_mutex);
• idx = coresight_search_device_idx(dict, dev_fwnode(dev));
• if (idx < 0) {

• /* Make space for the new entry */
  

• idx = dict->nr_idx;
  

• list = krealloc(dict->fwnode_list,
  

• 		(idx + 1) * sizeof(*dict->fwnode_list),
  

• 		GFP_KERNEL);
  

• if (ZERO_OR_NULL_PTR(list)) {
  

• 	idx = -ENOMEM;
  

This is not needed.

• 	goto done;
  

• }
  

• list[idx] = dev_fwnode(dev);
  

• dict->fwnode_list = list;
  

• dict->nr_idx = idx + 1;
  

• }
• name = devm_kasprintf(dev, GFP_KERNEL, "%s%d", dict->pfx, idx);

+done:

• mutex_unlock(&coresight_mutex);
• return name;

+} +EXPORT_SYMBOL_GPL(coresight_alloc_device_name); diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 76c31b2..9d933bb 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -174,6 +174,28 @@ struct coresight_device { struct dev_ext_attribute *ea; }; +/*

• • coresight_dev_list - Mapping for devices to "name" index for device
• • names.
• • @nr_idx: Number of entries already allocated.
• • @pfx: Prefix pattern for device name.
• • @fwnode_list: Array of fwnode_handles associated with each allocated

• • 	index, upto nr_idx entries.
    

• */

+struct coresight_dev_list {

• int nr_idx;
• const char *pfx;
• struct fwnode_handle **fwnode_list;

+};

+#define DEFINE_CORESIGHT_DEVLIST(var, dev_pfx) \ +static struct coresight_dev_list (var) = { \

• 				.pfx = dev_pfx,		\
  

• 				.nr_idx = 0,		\
  

• 				.fwnode_list = NULL,	\
  

+}

I like how you did this.

#define to_coresight_device(d) container_of(d, struct coresight_device, dev) #define source_ops(csdev) csdev->ops->source_ops @@ -266,7 +288,8 @@ extern int coresight_claim_device_unlocked(void __iomem *base); extern void coresight_disclaim_device(void __iomem *base); extern void coresight_disclaim_device_unlocked(void __iomem *base);

+extern char *coresight_alloc_device_name(struct coresight_dev_list *devs,

• 			 struct device *dev);
  

#else static inline struct coresight_device * coresight_register(struct coresight_desc *desc) { return NULL; } -- 2.7.4

On Wed, Mar 20, 2019 at 06:49:41PM +0000, Suzuki K Poulose wrote:

Add support for parsing the ACPI platform description for CoreSight. The connections are encoded in a DSD graph property with CoreSight specific variation of the property.

The ETMs are listed as the children device of the respective CPU.

Cc: "Rafael J. Wysocki" rjw@rjwysocki.net Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com

---

drivers/hwtracing/coresight/coresight-platform.c | 402 +++++++++++++++++++++++ 1 file changed, 402 insertions(+)

diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 5eee987..06b1188 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -3,6 +3,7 @@

• Copyright (c) 2012, The Linux Foundation. All rights reserved.

*/ +#include <linux/acpi.h> #include <linux/types.h> #include <linux/err.h> #include <linux/slab.h> @@ -289,10 +290,409 @@ of_get_coresight_platform_data(struct device *dev, } #endif +#ifdef CONFIG_ACPI

+#include <acpi/actypes.h> +#include <acpi/processor.h>

+/* ACPI Graph _DSD UUID : "ab02a46b-74c7-45a2-bd68-f7d344ef2153" */ +static const guid_t acpi_graph_uuid = GUID_INIT(0xab02a46b, 0x74c7, 0x45a2,

• 				0xbd, 0x68, 0xf7, 0xd3,
  

• 				0x44, 0xef, 0x21, 0x53);
  

+/* Coresight ACPI Graph UUID : "3ecbc8b6-1d0e-4fb3-8107-e627f805c6cd" */ +static const guid_t coresight_graph_uuid = GUID_INIT(0x3ecbc8b6, 0x1d0e, 0x4fb3,

• 				     0x81, 0x07, 0xe6, 0x27,
  

• 				     0xf8, 0x05, 0xc6, 0xcd);
  

+#define ACPI_CORESIGHT_LINK_SLAVE 0 +#define ACPI_CORESIGHT_LINK_MASTER 1

+static inline bool is_acpi_guid(const union acpi_object *obj) +{

• return (obj->type == ACPI_TYPE_BUFFER) && (obj->buffer.length == 16);

+}

+/*

• • acpi_guid_matches - Checks if the given object is a GUID object and
• • that it matches the supplied the GUID.
• */

+static inline bool acpi_guid_matches(const union acpi_object *obj,

• 		   const guid_t *guid)
  

+{

• return is_acpi_guid(obj) &&

•       guid_equal((guid_t *)obj->buffer.pointer, guid);
  

+}

+static inline bool is_acpi_dsd_graph_guid(const union acpi_object *obj) +{

• return acpi_guid_matches(obj, &acpi_graph_uuid);

+}

+static inline bool is_acpi_coresight_graph_guid(const union acpi_object *obj) +{

• return acpi_guid_matches(obj, &coresight_graph_uuid);

+}

+static inline bool is_acpi_coresight_graph(const union acpi_object *obj) +{

• const union acpi_object *graphid, *guid, *links;
• if (obj->type != ACPI_TYPE_PACKAGE ||

•    obj->package.count < 3)
  

• return false;
  

• graphid = &obj->package.elements[0];
• guid = &obj->package.elements[1];
• links = &obj->package.elements[2];
• if (graphid->type != ACPI_TYPE_INTEGER ||

•    links->type != ACPI_TYPE_INTEGER)
  

• return false;
  

• return is_acpi_coresight_graph_guid(guid);

+}

+/*

• • acpi_validate_dsd_graph - Make sure the given _DSD graph conforms
• • to the ACPI _DSD Graph specification.
• • ACPI Devices Graph property has the following format:
• • Revision - Integer, must be 0
• • NumberOfGraphs - Integer, N indicating the following list.
• • Graph[1],

• • ...
    

• • Graph[N]
• • And each Graph entry has the following format:
• • GraphID - Integer, identifying a graph the device belongs to.
• • UUID - UUID identifying the specification that governs

• • 	  this graph. (e.g, see is_acpi_coresight_graph())
    

• • NumberOfLinks - Number "N" of connections on this node of the graph.
• • Links[1]
• • ...
• • Links[N]
• */

+static inline bool acpi_validate_dsd_graph(const union acpi_object *graph) +{

• int i, n;
• const union acpi_object *rev, *nr_graphs;
• /* The graph must contain at least the Revision and Number of Graphs */
• if (graph->package.count < 2)

• return false;
  

• rev = &graph->package.elements[0];
• nr_graphs = &graph->package.elements[1];
• if (rev->type != ACPI_TYPE_INTEGER ||

•    nr_graphs->type != ACPI_TYPE_INTEGER)
  

• return false;
  

• /* We only support revision 0 */
• if (rev->integer.value != 0)

• return false;
  

• n = nr_graphs->integer.value;
• /* Make sure the package has right number of elements */
• if (graph->package.count != (n + 2))

• return false;
  

• /* Each entry must be a graph package with at least 3 members */
• for (i = 2; i < n + 2; i++) {

• const union acpi_object *obj = &graph->package.elements[i];
  

• if (obj->type != ACPI_TYPE_PACKAGE ||
  

•     obj->package.count < 3)
  

• 	return false;
  

• }
• return true;

+}

+/* acpi_get_dsd_graph - Find the _DSD Graph property for the given device. */ +const union acpi_object * +acpi_get_dsd_graph(struct acpi_device *adev) +{

• int i;
• struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER };
• acpi_status status;
• const union acpi_object *dsd;
• status = acpi_evaluate_object_typed(adev->handle, "_DSD", NULL,

• 			    &buf, ACPI_TYPE_PACKAGE);
  

• if (ACPI_FAILURE(status))

• return NULL;
  

• dsd = buf.pointer;
• for (i = 0; i + 1 < dsd->package.count; i += 2) {

• const union acpi_object *guid, *package;
  

• guid = &dsd->package.elements[i];
  

• package = &dsd->package.elements[i + 1];
  

• /* All _DSD elements must have a UUID and a Package */
  

• if (!is_acpi_guid(guid) || package->type != ACPI_TYPE_PACKAGE)
  

• 	break;
  

• /* Skip the non-Graph _DSD packages */
  

• if (!is_acpi_dsd_graph_guid(guid))
  

• 	continue;
  

• if (acpi_validate_dsd_graph(package))
  

• 	return package;
  

• /* Invalid graph format, continue */
  

• dev_warn(&adev->dev, "Invalid Graph _DSD property\n");
  

• }
• return NULL;

+}

+static inline bool +acpi_validate_coresight_graph(const union acpi_object *cs_graph) +{

• int nlinks;
• nlinks = cs_graph->package.elements[2].integer.value;
• if (cs_graph->package.count != (nlinks + 3))

• return false;
  

• /* The links are validated in acpi_coresight_parse_link() */
• return true;

+}

+/*

• • acpi_get_coresight_graph - Parse the device _DSD tables and find
• • the Graph property matching the CoreSight Graphs.
• • Returns the pointer to the CoreSight Graph Package when found. Otherwise
• • returns NULL.
• */

+const union acpi_object * +acpi_get_coresight_graph(struct acpi_device *adev) +{

• const union acpi_object *graph_list, *graph;
• int i, nr_graphs;
• graph_list = acpi_get_dsd_graph(adev);
• if (!graph_list)

• return graph_list;
  

• nr_graphs = graph_list->package.elements[1].integer.value;
• for (i = 2; i < nr_graphs + 2; i++) {

• graph = &graph_list->package.elements[i];
  

• if (!is_acpi_coresight_graph(graph))
  

• 	continue;
  

• if (acpi_validate_coresight_graph(graph))
  

• 	return graph;
  

• /* Invalid graph format */
  

• break;
  

• }
• return NULL;

+}

+/*

• • acpi_coresight_parse_link - Parse the given Graph connection
• • of the device and populate the coresight_connection for an output
• • connection.
• • CoreSight Graph specification mandates that the direction of the data
• • flow must be specified in the link. i.e,
• • SourcePortAddress, // Integer
• • DestinationPortAddress, // Integer
• • DestinationDeviceName, // Reference to another device
• • DirectionOfFlow, // 1 for output(master), 0 for input(slave)
• • Returns the direction of the data flow [ Input(slave) or Output(master) ]
• • upon success.
• • Returns an negative error number otherwise.
• */

+static int acpi_coresight_parse_link(struct acpi_device *adev,

• 		     const union acpi_object *link,
  

• 		     struct coresight_connection *conn)
  

+{

• int rc, dir;
• const union acpi_object *fields;
• struct acpi_device *r_adev;
• struct device *rdev;
• if (link->type != ACPI_TYPE_PACKAGE ||

•    link->package.count != 4)
  

• return -EINVAL;
  

• fields = link->package.elements;
• if (fields[0].type != ACPI_TYPE_INTEGER ||

•    fields[1].type != ACPI_TYPE_INTEGER ||
  

•    fields[2].type != ACPI_TYPE_LOCAL_REFERENCE ||
  

•    fields[3].type != ACPI_TYPE_INTEGER)
  

• return -EINVAL;
  

• rc = acpi_bus_get_device(fields[2].reference.handle, &r_adev);
• if (rc)

• return rc;
  

• dir = fields[3].integer.value;
• if (dir == ACPI_CORESIGHT_LINK_MASTER) {

• conn->outport = fields[0].integer.value;
  

• conn->child_port = fields[1].integer.value;
  

• rdev = coresight_find_device_by_fwnode(&r_adev->fwnode);
  

• if (!rdev)
  

• 	return -EPROBE_DEFER;
  

• conn->child_fwnode = fwnode_handle_get(&r_adev->fwnode);
  

• }
• return dir;

+}

+/*

• • acpi_coresight_parse_graph - Parse the _DSD CoreSight graph
• • connection information and populate the supplied coresight_platform_data
• • instance.
• */

+static int acpi_coresight_parse_graph(struct acpi_device *adev,

• 		      struct coresight_platform_data *pdata)
  

+{

• int rc, i, nlinks;
• const union acpi_object *graph;
• struct coresight_connection *conns, *ptr;
• pdata->nr_inport = pdata->nr_outport = 0;
• graph = acpi_get_coresight_graph(adev);
• if (!graph)

• return -ENOENT;
  

• nlinks = graph->package.elements[2].integer.value;
• if (!nlinks)

• return 0;
  

• /*

• * To avoid scanning the table twice (once for finding the number of
  

• * output links and then later for parsing the output links),
  

• * cache the links information in one go and then later copy
  

• * it to the pdata.
  

• */
  

• conns = devm_kcalloc(&adev->dev, nlinks, sizeof(*conns), GFP_KERNEL);
• if (!conns)

• return -ENOMEM;
  

• ptr = conns;
• for (i = 0; i < nlinks; i++) {

• const union acpi_object *link = &graph->package.elements[3 + i];
  

• int dir;
  

• dir = acpi_coresight_parse_link(adev, link, ptr);
  

• if (dir < 0)
  

• 	return dir;
  

• if (dir == ACPI_CORESIGHT_LINK_MASTER) {
  

• 	pdata->nr_outport++;
  

• 	ptr++;
  

• } else {
  

• 	pdata->nr_inport++;
  

• }
  

• }
• rc = coresight_alloc_conns(&adev->dev, pdata);
• if (rc)

• return rc;
  

• /* Copy the connection information to the final location */
• for (i = 0; i < pdata->nr_outport; i++)

• pdata->conns[i] = conns[i];
  

• devm_kfree(&adev->dev, conns);
• return 0;

+}

+/*

• • acpi_handle_to_logical_cpuid - Map a given acpi_handle to the

This looks a little weird... I think all tabs should be drop in the comments.

• • logical CPU id of the corresponding CPU device.
• • Returns the logical CPU id when found. Otherwise returns >= nr_cpus_id.
• */

+static int +acpi_handle_to_logical_cpuid(acpi_handle handle) +{

• int i;
• struct acpi_processor *pr;
• for_each_possible_cpu(i) {

• pr = per_cpu(processors, i);
  

• if (pr && pr->handle == handle)
  

• 	break;
  

• }
• return i;

+}

+/*

• • acpi_coresigh_get_cpu - Find the logical CPU id of the CPU associated
• • with this coresight device. With ACPI bindings, the CoreSight components
• • are listed as child device of the associated CPU.
• • Returns the logical CPU id when found. Otherwise returns < 0.
• */

+static int acpi_coresight_get_cpu(struct device *dev) +{

• int cpu;
• acpi_handle cpu_handle;
• acpi_status status;
• struct acpi_device *adev = ACPI_COMPANION(dev);
• if (!adev)

• return 0;
  

• status = acpi_get_parent(adev->handle, &cpu_handle);
• if (ACPI_FAILURE(status))

• return 0;
  

• cpu = acpi_handle_to_logical_cpuid(cpu_handle);
• if (cpu >= nr_cpu_ids)

• return 0;
  

• return cpu;

+}

+static struct coresight_platform_data * +acpi_get_coresight_platform_data(struct device *dev,

• 		 struct coresight_platform_data *pdata)
  

+{

• int rc = -EINVAL;
• struct acpi_device *adev;
• if (!dev)

• goto out;
  

If we are here dev is valid. Otherwise things would have blown up in coresight_get_platform_data() when calling is_acpi_device_node().

• adev = ACPI_COMPANION(dev);
• if (!adev)

• goto out;
  

• rc = acpi_coresight_parse_graph(adev, pdata);
• if (rc)

• goto out;
  

+out:

• if (rc)

• return ERR_PTR(rc);
  

• return pdata;

+}

+#else

+static inline struct coresight_platform_data * +acpi_get_coresight_platform_data(struct device *dev,

• 		 struct coresight_platform_data *pdata)
  

+{

• return NULL;

+}

+static inline int acpi_coresight_get_cpu(struct device *dev) +{

• return 0;

+} +#endif

int coresight_get_cpu(struct device *dev) { if (is_of_node(dev->fwnode)) return of_coresight_get_cpu(dev);

• else if (is_acpi_device_node(dev->fwnode))

• return acpi_coresight_get_cpu(dev);
  

  return 0;

If we failed both of and acpi discovery method I'd return an error.

I've only reviewed the bottom half of this patch but I'm out of time for today. I will continue next week.

Thanks, Mathieu

} EXPORT_SYMBOL_GPL(coresight_get_cpu); @@ -315,6 +715,8 @@ coresight_get_platform_data(struct device *dev) if (is_of_node(dev->fwnode)) return of_get_coresight_platform_data(dev, pdata);

• else if (is_acpi_device_node(dev->fwnode))

• return acpi_get_coresight_platform_data(dev, pdata);
  

return ERR_PTR(-ENOENT); } -- 2.7.4