Re: [PATCH v3 RESEND 01/10] coresight: core: Refactoring ctcu_get_active_port and make it generic

[Jie Gan]

On 7/16/2025 6:20 PM, Mike Leach wrote:
> Hi,
>
> On Mon, 14 Jul 2025 at 07:31, Jie Gan <jie.gan@xxxxxxxxxxxxxxxx> wrote:
> > Remove ctcu_get_active_port from CTCU module and add it to the core
> > framework.
> >
> > The port number is crucial for the CTCU device to identify which ETR
> > it serves. With the port number we can correctly get required parameters
> > of the CTCU device in TMC module.
> >
> > Signed-off-by: Jie Gan <jie.gan@xxxxxxxxxxxxxxxx>
> > ---
> >   drivers/hwtracing/coresight/coresight-core.c  | 24 +++++++++++++++++++
> >   .../hwtracing/coresight/coresight-ctcu-core.c | 19 +--------------
> >   drivers/hwtracing/coresight/coresight-priv.h  |  2 ++
> >   3 files changed, 27 insertions(+), 18 deletions(-)
> >
> > diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
> > index 1accd7cbd54b..5297a5ff7921 100644
> > --- a/drivers/hwtracing/coresight/coresight-core.c
> > +++ b/drivers/hwtracing/coresight/coresight-core.c
> > @@ -580,6 +580,30 @@ struct coresight_device *coresight_get_sink(struct coresight_path *path)
> >   }
> >   EXPORT_SYMBOL_GPL(coresight_get_sink);
> >
> > +/**
> > + * coresight_get_port_helper: get the in-port number of the helper device
> > + * that is connected to the csdev.
> > + *
>
> As written this looks at all connections, not just those that are
> helpers. That is fine, so perhaps rename as such.
>
> e.g. coresight_get_in_port_dest
>
> and name the input parameters src , dest respectively.

Make sense for me, will update in next version.
Thanks for the suggestion.

> > + * @csdev: csdev of the device that is connected to helper.
> > + * @helper: csdev of the helper device.
> > + *
> > + * Return: port number upson success or -EINVAL for fail.
>
> sp: upon/upson
>
> > + */
> > +int coresight_get_port_helper(struct coresight_device *csdev,
> > +                             struct coresight_device *helper)
> > +{
> > +       struct coresight_platform_data *pdata = helper->pdata;
> > +       int i;
> > +
> > +       for (i = 0; i < pdata->nr_inconns; ++i) {
> > +               if (pdata->in_conns[i]->src_dev == csdev)
> > +                       return pdata->in_conns[i]->dest_port;
> > +       }
> > +
> > +       return -EINVAL;
> > +}
> > +EXPORT_SYMBOL_GPL(coresight_get_port_helper);
> > +
> >   u32 coresight_get_sink_id(struct coresight_device *csdev)
> >   {
> >          if (!csdev->ea)
> > diff --git a/drivers/hwtracing/coresight/coresight-ctcu-core.c b/drivers/hwtracing/coresight/coresight-ctcu-core.c
> > index c6bafc96db96..28ea4a216345 100644
> > --- a/drivers/hwtracing/coresight/coresight-ctcu-core.c
> > +++ b/drivers/hwtracing/coresight/coresight-ctcu-core.c
> > @@ -118,23 +118,6 @@ static int __ctcu_set_etr_traceid(struct coresight_device *csdev, u8 traceid, in
> >          return 0;
> >   }
> >
> > -/*
> > - * Searching the sink device from helper's view in case there are multiple helper devices
> > - * connected to the sink device.
> > - */
> > -static int ctcu_get_active_port(struct coresight_device *sink, struct coresight_device *helper)
> > -{
> > -       struct coresight_platform_data *pdata = helper->pdata;
> > -       int i;
> > -
> > -       for (i = 0; i < pdata->nr_inconns; ++i) {
> > -               if (pdata->in_conns[i]->src_dev == sink)
> > -                       return pdata->in_conns[i]->dest_port;
> > -       }
> > -
> > -       return -EINVAL;
> > -}
> > -
> >   static int ctcu_set_etr_traceid(struct coresight_device *csdev, struct coresight_path *path,
> >                                  bool enable)
> >   {
> > @@ -147,7 +130,7 @@ static int ctcu_set_etr_traceid(struct coresight_device *csdev, struct coresight
> >                  return -EINVAL;
> >          }
> >
> > -       port_num = ctcu_get_active_port(sink, csdev);
> > +       port_num = coresight_get_port_helper(sink, csdev);
> >          if (port_num < 0)
> >                  return -EINVAL;
> >
> > diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h
> > index 33e22b1ba043..07a5f03de81d 100644
> > --- a/drivers/hwtracing/coresight/coresight-priv.h
> > +++ b/drivers/hwtracing/coresight/coresight-priv.h
> > @@ -156,6 +156,8 @@ void coresight_remove_links(struct coresight_device *orig,
> >   u32 coresight_get_sink_id(struct coresight_device *csdev);
> >   void coresight_path_assign_trace_id(struct coresight_path *path,
> >                                     enum cs_mode mode);
> > +int coresight_get_port_helper(struct coresight_device *csdev,
> > +                             struct coresight_device *helper);
> rename here too

will do.

Best Regards,
Jie

> >   #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM3X)
> >   int etm_readl_cp14(u32 off, unsigned int *val);
> > --
> > 2.34.1
>
> regards
>
> Mike