Commit 0f5f9b6b authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

coresight: Use platform agnostic names 



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 and funnels are not classified as dynamic/static
anymore. One could easily figure that out by checking the presence
of "mgmt" registers under sysfs.

Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37ea1ffd

drivers/hwtracing/coresight/coresight-catu.c

+6 −1
Original line number Diff line number Diff line
@@ -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;
@@ -505,6 +507,10 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) 
	struct device *dev = &adev->dev;

	void __iomem *base;



	catu_desc.name = coresight_alloc_device_name(&catu_devs, dev);

	if (!catu_desc.name)

		return -ENOMEM;



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

	if (!drvdata) {

		ret = -ENOMEM;
@@ -551,7 +557,6 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) 
	catu_desc.type = CORESIGHT_DEV_TYPE_HELPER;

	catu_desc.subtype.helper_subtype = CORESIGHT_DEV_SUBTYPE_HELPER_CATU;

	catu_desc.ops = &catu_ops;

	catu_desc.name = dev_name(dev);



	drvdata->csdev = coresight_register(&catu_desc);

	if (IS_ERR(drvdata->csdev))

drivers/hwtracing/coresight/coresight-etb10.c

+6 −1
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
#define ETB_FFSR_BIT		1

#define ETB_FRAME_SIZE_WORDS	4



DEFINE_CORESIGHT_DEVLIST(etb_devs, "etb");



/**

 * struct etb_drvdata - specifics associated to an ETB component

 * @base:	memory mapped base address for this component.
@@ -733,6 +735,10 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) 
	struct resource *res = &adev->res;

	struct coresight_desc desc = { 0 };



	desc.name = coresight_alloc_device_name(&etb_devs, dev);

	if (!desc.name)

		return -ENOMEM;



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

	if (!drvdata)

		return -ENOMEM;
@@ -777,7 +783,6 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) 
	desc.ops = &etb_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.name = dev_name(dev);

	desc.groups = coresight_etb_groups;

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev))

drivers/hwtracing/coresight/coresight-etm3x.c

+3 −1
Original line number Diff line number Diff line
@@ -815,6 +815,9 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) 
	}



	drvdata->cpu = coresight_get_cpu(dev);

	desc.name  = devm_kasprintf(dev, GFP_KERNEL, "etm%d", drvdata->cpu);

	if (!desc.name)

		return -ENOMEM;



	cpus_read_lock();

	etmdrvdata[drvdata->cpu] = drvdata;
@@ -856,7 +859,6 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) 
	desc.ops = &etm_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.name = dev_name(dev);

	desc.groups = coresight_etm_groups;

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev)) {

drivers/hwtracing/coresight/coresight-etm4x.c

+3 −1
Original line number Diff line number Diff line
@@ -1101,6 +1101,9 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) 
	spin_lock_init(&drvdata->spinlock);



	drvdata->cpu = coresight_get_cpu(dev);

	desc.name = devm_kasprintf(dev, GFP_KERNEL, "etm%d", drvdata->cpu);

	if (!desc.name)

		return -ENOMEM;



	cpus_read_lock();

	etmdrvdata[drvdata->cpu] = drvdata;
@@ -1144,7 +1147,6 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) 
	desc.pdata = pdata;

	desc.dev = dev;

	desc.groups = coresight_etmv4_groups;

	desc.name = dev_name(dev);

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev)) {

		ret = PTR_ERR(drvdata->csdev);

drivers/hwtracing/coresight/coresight-funnel.c

+6 −1
Original line number Diff line number Diff line
@@ -29,6 +29,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.
@@ -192,6 +194,10 @@ static int funnel_probe(struct device *dev, struct resource *res) 
	    of_device_is_compatible(dev->of_node, "arm,coresight-funnel"))

		pr_warn_once("Uses OBSOLETE CoreSight funnel binding\n");



	desc.name = coresight_alloc_device_name(&funnel_devs, dev);

	if (!desc.name)

		return -ENOMEM;



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

	if (!drvdata)

		return -ENOMEM;
@@ -231,7 +237,6 @@ static int funnel_probe(struct device *dev, struct resource *res) 
	desc.ops = &funnel_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.name = dev_name(dev);

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev)) {

		ret = PTR_ERR(drvdata->csdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE