Re: [PATCH v2 2/9] coresight: Change name of pdata->conns

On 10/03/2023 16:06, James Clark wrote:

conns is actually for output connections. Change the name to make it clearer and so that we can add input connections later.

No functional changes.

Signed-off-by: James Clark james.clark@arm.com

drivers/hwtracing/coresight/coresight-core.c | 26 +++++++++---------- .../hwtracing/coresight/coresight-platform.c | 12 ++++----- .../hwtracing/coresight/coresight-tmc-etr.c | 2 +- include/linux/coresight.h | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index e3b63fd52b9c..c0eda7407fb8 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -119,7 +119,7 @@ static int coresight_find_link_inport(struct coresight_device *csdev, struct coresight_connection *conn; for (i = 0; i < parent->pdata->nr_outport; i++) {

• conn = &parent->pdata->conns[i];
  

• conn = &parent->pdata->out_conns[i];
  

  if (conn->child_dev == csdev) return conn->child_port; }

@@ -137,7 +137,7 @@ static int coresight_find_link_outport(struct coresight_device *csdev, struct coresight_connection *conn; for (i = 0; i < csdev->pdata->nr_outport; i++) {

• conn = &csdev->pdata->conns[i];
  

• conn = &csdev->pdata->out_conns[i];
  

  if (conn->child_dev == child) return conn->outport; }

@@ -606,7 +606,7 @@ coresight_find_enabled_sink(struct coresight_device *csdev) for (i = 0; i < csdev->pdata->nr_outport; i++) { struct coresight_device *child_dev;

• child_dev = csdev->pdata->conns[i].child_dev;
  

• child_dev = csdev->pdata->out_conns[i].child_dev;
  

  if (child_dev) sink = coresight_find_enabled_sink(child_dev); if (sink)

@@ -722,7 +722,7 @@ static int coresight_grab_device(struct coresight_device *csdev) for (i = 0; i < csdev->pdata->nr_outport; i++) { struct coresight_device *child;

• child  = csdev->pdata->conns[i].child_dev;
  

• child = csdev->pdata->out_conns[i].child_dev;
  

  if (child && child->type == CORESIGHT_DEV_TYPE_HELPER) if (!coresight_get_ref(child)) goto err;

@@ -733,7 +733,7 @@ static int coresight_grab_device(struct coresight_device *csdev) for (i--; i >= 0; i--) { struct coresight_device *child;

• child  = csdev->pdata->conns[i].child_dev;
  

• child = csdev->pdata->out_conns[i].child_dev;
  

  if (child && child->type == CORESIGHT_DEV_TYPE_HELPER) coresight_put_ref(child); }

@@ -752,7 +752,7 @@ static void coresight_drop_device(struct coresight_device *csdev) for (i = 0; i < csdev->pdata->nr_outport; i++) { struct coresight_device *child;

• child  = csdev->pdata->conns[i].child_dev;
  

• child = csdev->pdata->out_conns[i].child_dev;
  

  if (child && child->type == CORESIGHT_DEV_TYPE_HELPER) coresight_put_ref(child); }

@@ -794,7 +794,7 @@ static int _coresight_build_path(struct coresight_device *csdev, for (i = 0; i < csdev->pdata->nr_outport; i++) { struct coresight_device *child_dev;

• child_dev = csdev->pdata->conns[i].child_dev;
  

• child_dev = csdev->pdata->out_conns[i].child_dev;
  

  if (child_dev && _coresight_build_path(child_dev, sink, path) == 0) { found = true;

@@ -964,7 +964,7 @@ coresight_find_sink(struct coresight_device *csdev, int *depth) struct coresight_device *child_dev, *sink = NULL; int child_depth = curr_depth;

• child_dev = csdev->pdata->conns[i].child_dev;
  

• child_dev = csdev->pdata->out_conns[i].child_dev;
  

  if (child_dev) sink = coresight_find_sink(child_dev, &child_depth);

@@ -1334,7 +1334,7 @@ static int coresight_orphan_match(struct device *dev, void *data) * an orphan connection whose name matches @csdev, link it. */ for (i = 0; i < i_csdev->pdata->nr_outport; i++) {

• conn = &i_csdev->pdata->conns[i];
  

• conn = &i_csdev->pdata->out_conns[i];
  

/* Skip the port if FW doesn't describe it */ if (!conn->child_fwnode) @@ -1375,7 +1375,7 @@ static int coresight_fixup_device_conns(struct coresight_device *csdev) int i, ret = 0; for (i = 0; i < csdev->pdata->nr_outport; i++) {

• struct coresight_connection *conn = &csdev->pdata->conns[i];
  

• struct coresight_connection *conn = &csdev->pdata->out_conns[i];
  

if (!conn->child_fwnode) continue; @@ -1412,7 +1412,7 @@ static int coresight_remove_match(struct device *dev, void *data) * a connection whose name matches @csdev, remove it. */ for (i = 0; i < iterator->pdata->nr_outport; i++) {

• conn = &iterator->pdata->conns[i];
  

• conn = &iterator->pdata->out_conns[i];
  

if (conn->child_dev == NULL || conn->child_fwnode == NULL) continue; @@ -1548,7 +1548,7 @@ void coresight_release_platform_data(struct coresight_device *csdev, struct coresight_platform_data *pdata) { int i;

• struct coresight_connection *conns = pdata->conns;

• struct coresight_connection *conns = pdata->out_conns;

for (i = 0; i < pdata->nr_outport; i++) { /* If we have made the links, remove them now */ @@ -1560,7 +1560,7 @@ void coresight_release_platform_data(struct coresight_device *csdev, */ if (conns[i].child_fwnode) { fwnode_handle_put(conns[i].child_fwnode);

• 	pdata->conns[i].child_fwnode = NULL;
  

• 	pdata->out_conns[i].child_fwnode = NULL;
  

  } } if (csdev)

diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 475899714104..5085525a32bb 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -27,9 +27,9 @@ static int coresight_alloc_conns(struct device *dev, struct coresight_platform_data *pdata) { if (pdata->nr_outport) {

• pdata->conns = devm_kcalloc(dev, pdata->nr_outport,
  

• 			    sizeof(*pdata->conns), GFP_KERNEL);
  

• if (!pdata->conns)
  

• pdata->out_conns = devm_kcalloc(dev, pdata->nr_outport,
  

• 			    sizeof(*pdata->out_conns), GFP_KERNEL);
  

• if (!pdata->out_conns)
  return -ENOMEM;
  

  }

@@ -251,7 +251,7 @@ static int of_coresight_parse_endpoint(struct device *dev, break; }

• conn = &pdata->conns[endpoint.port];
  

• conn = &pdata->out_conns[endpoint.port];
  

  if (conn->child_fwnode) { dev_warn(dev, "Duplicate output port %d\n", endpoint.port);

@@ -744,8 +744,8 @@ static int acpi_coresight_parse_graph(struct acpi_device *adev, int port = conns[i].outport; /* Duplicate output port */

• WARN_ON(pdata->conns[port].child_fwnode);
  

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

• WARN_ON(pdata->out_conns[port].child_fwnode);
  

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

  }

devm_kfree(&adev->dev, conns); diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c index ed589cfff1b5..86d4a08aa833 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -782,7 +782,7 @@ tmc_etr_get_catu_device(struct tmc_drvdata *drvdata) return NULL; for (i = 0; i < etr->pdata->nr_outport; i++) {

• tmp = etr->pdata->conns[i].child_dev;
  

• tmp = etr->pdata->out_conns[i].child_dev;
  

  if (tmp && coresight_is_catu_device(tmp)) return tmp; }

diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 1f878e8ed8c4..322d7273e122 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -109,7 +109,7 @@ union coresight_dev_subtype { struct coresight_platform_data { int nr_inport; int nr_outport;

• struct coresight_connection *conns;

• struct coresight_connection *out_conns;

The comment above this structure might need to reflect the name change.

Otherwise looks good to me.

Suzuki

}; /**