Since the new funnel device supports multi-port output scenarios, there may be more than one TPDM connected to one TPDA. In this way, when reading the element size of the TPDM, TPDA driver needs to find the expected TPDM corresponding to the filter source. When TPDA finds a TPDM or a filter source from a input connection, it will read the Devicetree to get the expected TPDM's element size. Signed-off-by: Tao Zhang <quic_taozha@xxxxxxxxxxx> --- drivers/hwtracing/coresight/coresight-tpda.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-tpda.c b/drivers/hwtracing/coresight/coresight-tpda.c index 52b0201090fb..fc5a4e46cf5d 100644 --- a/drivers/hwtracing/coresight/coresight-tpda.c +++ b/drivers/hwtracing/coresight/coresight-tpda.c @@ -110,9 +110,12 @@ static int tpda_get_element_size(struct tpda_drvdata *drvdata, csdev->pdata->in_conns[i]->dest_port != inport) continue; - if (coresight_device_is_tpdm(in)) { + if (coresight_device_is_tpdm(in) + || csdev->pdata->in_conns[i]->filter_src_dev) { if (drvdata->dsb_esize || drvdata->cmb_esize) return -EEXIST; + if (csdev->pdata->in_conns[i]->filter_src_dev) + in = csdev->pdata->in_conns[i]->filter_src_dev; rc = tpdm_read_element_size(drvdata, in); if (rc) return rc; @@ -124,7 +127,6 @@ static int tpda_get_element_size(struct tpda_drvdata *drvdata, } } - return rc; } -- 2.17.1