Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d68f0267 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: add CTI driver support in upstream implementation"

parents d65cb699 86466212

drivers/hwtracing/coresight/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -95,4 +95,12 @@ config CORESIGHT_STM 
	  instrumentation based tracing. This is primarily useful for

	  logging useful software events or data.



config CORESIGHT_CTI

	bool "CoreSight Cross Trigger Interface driver"

	help

	  This driver provides support for Cross Trigger Interface that is

	  used to input or output i.e. pass cross trigger events from one

	  hardware component to another. It can also be used to pass

	  software generated events.



endif

drivers/hwtracing/coresight/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.o 
obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o

obj-$(CONFIG_CORESIGHT_QCOM_REPLICATOR) += coresight-replicator-qcom.o

obj-$(CONFIG_CORESIGHT_STM) += coresight-stm.o

obj-$(CONFIG_CORESIGHT_CTI) += coresight-cti.o

drivers/hwtracing/coresight/coresight-cti.c

0 → 100644
+1567 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/hwtracing/coresight/coresight-priv.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define CORESIGHT_DEVTYPE	0xfcc



#define TIMEOUT_US		100

#define BM(lsb, msb)		((BIT(msb) - BIT(lsb)) + BIT(msb))

#define BMVAL(val, lsb, msb)	((val & GENMASK(msb, lsb)) >> lsb)

#define BVAL(val, n)		((val & BIT(n)) >> n)

drivers/hwtracing/coresight/of_coresight.c

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ struct coresight_platform_data *of_get_coresight_platform_data( 
		} while (ep);

	}



	/* Affinity defaults to CPU0 */

	pdata->cpu = 0;

	/* Affinity defaults to -1 (invalid) */

	pdata->cpu = -1;

	dn = of_parse_phandle(node, "cpu", 0);

	for (cpu = 0; dn && cpu < nr_cpu_ids; cpu++) {

		if (dn == of_get_cpu_node(cpu, NULL)) {