On Tue, Feb 11, 2025 at 10:39:37AM +0000, James Clark wrote:

These look like they set the whole tags register as one value, but they only set and clear the self hosted bit using a SET/CLR bits mechanism. Rename the functions to reflect this better.

Signed-off-by: James Clark james.clark@linaro.org

Reviewed-by: Leo Yan leo.yan@arm.com

---

drivers/hwtracing/coresight/coresight-core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index 0a9380350fb5..523dbb381f90 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -142,14 +142,14 @@ static inline bool coresight_is_claimed_any(struct coresight_device *csdev) return coresight_read_claim_tags(csdev) != 0; }

-static inline void coresight_set_claim_tags(struct coresight_device *csdev) +static inline void coresight_set_self_claim_tag(struct coresight_device *csdev) { csdev_access_relaxed_write32(&csdev->access, CORESIGHT_CLAIM_SELF_HOSTED, CORESIGHT_CLAIMSET); isb(); }

-static inline void coresight_clear_claim_tags(struct coresight_device *csdev) +static inline void coresight_clear_self_claim_tag(struct coresight_device *csdev) { csdev_access_relaxed_write32(&csdev->access, CORESIGHT_CLAIM_SELF_HOSTED, CORESIGHT_CLAIMCLR); @@ -174,11 +174,11 @@ int coresight_claim_device_unlocked(struct coresight_device *csdev) if (coresight_is_claimed_any(csdev)) return -EBUSY;

•   coresight_set_claim_tags(csdev);
  

•   coresight_set_self_claim_tag(csdev);
    if (coresight_is_claimed_self_hosted(csdev))
            return 0;
  

•   /* There was a race setting the tags, clean up and fail */
  

•   coresight_clear_claim_tags(csdev);
  

•   /* There was a race setting the tag, clean up and fail */
  

•   coresight_clear_self_claim_tag(csdev);
    return -EBUSY;
  

} EXPORT_SYMBOL_GPL(coresight_claim_device_unlocked); @@ -199,7 +199,7 @@ int coresight_claim_device(struct coresight_device *csdev) EXPORT_SYMBOL_GPL(coresight_claim_device);

/*

• • coresight_disclaim_device_unlocked : Clear the claim tags for the device.

• • coresight_disclaim_device_unlocked : Clear the claim tag for the device.
  • Called with CS_UNLOCKed for the component.
  */

void coresight_disclaim_device_unlocked(struct coresight_device *csdev) @@ -209,7 +209,7 @@ void coresight_disclaim_device_unlocked(struct coresight_device *csdev) return;

    if (coresight_is_claimed_self_hosted(csdev))

•           coresight_clear_claim_tags(csdev);
  

•           coresight_clear_self_claim_tag(csdev);
    else
            /*
             * The external agent may have not honoured our claim
  

-- 2.34.1

---

CoreSight mailing list -- coresight@lists.linaro.org To unsubscribe send an email to coresight-leave@lists.linaro.org

On 13/03/2025 2:40 pm, Leo Yan wrote:

On Tue, Feb 11, 2025 at 10:39:40AM +0000, James Clark wrote:

...

Add a dev_dbg() message so that external debugger conflicts are more visible. There are multiple reasons for -EBUSY so a message for this particular one could be helpful. Add errors for and enumerate all the other cases that are impossible.

Signed-off-by: James Clark james.clark@linaro.org

drivers/hwtracing/coresight/coresight-core.c | 48 ++++++++++++-------- drivers/hwtracing/coresight/coresight-priv.h | 5 +- 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index 7b53165c93af..7fe5d5d432c4 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -133,16 +133,6 @@ static inline u32 coresight_read_claim_tags(struct csdev_access *csa) csdev_access_relaxed_read32(csa, CORESIGHT_CLAIMCLR)); }

-static inline bool coresight_is_claimed_self_hosted(struct csdev_access *csa) -{

•   return coresight_read_claim_tags(csa) == CORESIGHT_CLAIM_SELF_HOSTED;
  

-}

-static inline bool coresight_is_claimed_any(struct coresight_device *csdev) -{

•   return coresight_read_claim_tags(&csdev->access) != 0;
  

-}

• static inline void coresight_set_self_claim_tag(struct csdev_access *csa) { csdev_access_relaxed_write32(csa, CORESIGHT_CLAIM_SELF_HOSTED,

@@ -169,18 +159,40 @@ static inline void coresight_clear_self_claim_tag(struct csdev_access *csa) */ int coresight_claim_device_unlocked(struct coresight_device *csdev) {

•   int tag;
  

•   struct csdev_access *csa;
  

•    if (WARN_ON(!csdev))
             return -EINVAL;
  
  

•   if (coresight_is_claimed_any(csdev))
  

•   csa = &csdev->access;
  

•   tag = coresight_read_claim_tags(csa);
  

•   switch (tag) {
  

•   case CORESIGHT_CLAIM_FREE:
  

•           coresight_set_self_claim_tag(csa);
  

•           if (coresight_read_claim_tags(csa) == CORESIGHT_CLAIM_SELF_HOSTED)
  

•                   return 0;
  

It would be a rare case if a failure happens here. Seems to me, it would be valuable to print a log for this edge case.

Otherwise, looks good to me.

Yeah I can add dev_dbg("Busy: Couldn't set self claim tag"). Just to distinguish this race case from the other busy case.

Hi James,

On Tue, 11 Feb 2025 at 10:40, James Clark james.clark@linaro.org wrote:

This can be left behind from a crashed kernel after a kexec so clear it when probing each device. Similarly to coresight_disclaim_device_unlocked(), only clear it if it's already set to avoid races with an external debugger.

We need a csdev_access struct in etm_init_arch_data() so just replace the iomem pointer with a full csdev_access struct. This means all usages need to be updated to go through csa->base.

Signed-off-by: James Clark james.clark@linaro.org

drivers/hwtracing/coresight/coresight-catu.c | 1 + drivers/hwtracing/coresight/coresight-core.c | 48 +++++++++++++++---- .../hwtracing/coresight/coresight-cti-core.c | 2 + drivers/hwtracing/coresight/coresight-etb10.c | 2 + drivers/hwtracing/coresight/coresight-etm.h | 6 +-- .../coresight/coresight-etm3x-core.c | 28 +++++------ .../coresight/coresight-etm3x-sysfs.c | 8 ++-- .../coresight/coresight-etm4x-core.c | 2 + .../hwtracing/coresight/coresight-funnel.c | 2 + .../coresight/coresight-replicator.c | 1 + .../hwtracing/coresight/coresight-tmc-core.c | 1 + include/linux/coresight.h | 3 ++ 12 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index d9259c0b6e64..575c2d247a90 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -558,6 +558,7 @@ static int __catu_probe(struct device *dev, struct resource *res) catu_desc.subtype.helper_subtype = CORESIGHT_DEV_SUBTYPE_HELPER_CATU; catu_desc.ops = &catu_ops;

•   coresight_reset_claim(&catu_desc.access);
    drvdata->csdev = coresight_register(&catu_desc);
    if (IS_ERR(drvdata->csdev))
            ret = PTR_ERR(drvdata->csdev);
  

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index 7fe5d5d432c4..97f33ffad05e 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -212,20 +212,48 @@ int coresight_claim_device(struct coresight_device *csdev) EXPORT_SYMBOL_GPL(coresight_claim_device);

/*

• • coresight_disclaim_device_unlocked : Clear the claim tag for the device.

• • Clear the claim tag for the device.
• • Returns an error if the device wasn't already claimed.
• */

+int coresight_reset_claim(struct csdev_access *csa)

Given the iusue being fixed - i.e. previous sessions having residual claims - and the fact that this funtion is only ever called from device initialisation as far as I can tell, would this be better to be called coresight_init_claim() and return / log an error only if the device _was_ actually claimed.

As it stands it seems to return an error if the device was not claimed - which on initialisation is the correct state!

Since the retrun code is ignored by all of the callees, the rerun could be dropped and a warning issued withing this function if the claim needed clearing.

+{

•   int ret;
  

•   CS_UNLOCK(csa->base);
  

•   ret = coresight_reset_claim_unlocked(csa);
  

•   CS_LOCK(csa->base);
  

•   return ret;
  

+} +EXPORT_SYMBOL_GPL(coresight_reset_claim);

+/*

• • Clear the claim tag for the device. Called with CS_UNLOCKed for the component.
• • Returns an error if the device wasn't already claimed.
• */

+int coresight_reset_claim_unlocked(struct csdev_access *csa)

Given the comment and the function - this could be named "coresight_clear_claim_unlocked()"

Regards

Mike

+{

•   if (coresight_read_claim_tags(csa) == CORESIGHT_CLAIM_SELF_HOSTED) {
  

•           coresight_clear_self_claim_tag(csa);
  

•           return 0;
  

•   }
  

•   return -EINVAL;
  

+} +EXPORT_SYMBOL_GPL(coresight_reset_claim_unlocked);

+/*

• • coresight_disclaim_device_unlocked : Clear the claim tag for the device
• • and warn if the device wasn't already claimed.
  • Called with CS_UNLOCKed for the component.
  */

void coresight_disclaim_device_unlocked(struct csdev_access *csa) {

•   if (coresight_read_claim_tags(csa) == CORESIGHT_CLAIM_SELF_HOSTED)
  

•           coresight_clear_self_claim_tag(csa);
  

•   else
  

•           /*
  

•            * The external agent may have not honoured our claim
  

•            * and has manipulated it. Or something else has seriously
  

•            * gone wrong in our driver.
  

•            */
  

•           WARN_ON_ONCE(1);
  

•   /*
  

•    * Warn if the external agent hasn't honoured our claim
  

•    * and has manipulated it. Or something else has seriously
  

•    * gone wrong in our driver.
  

•    */
  

•   WARN_ON_ONCE(coresight_reset_claim_unlocked(csa));
  

} EXPORT_SYMBOL_GPL(coresight_disclaim_device_unlocked);

diff --git a/drivers/hwtracing/coresight/coresight-cti-core.c b/drivers/hwtracing/coresight/coresight-cti-core.c index 073f67a41af9..389a72362f0c 100644 --- a/drivers/hwtracing/coresight/coresight-cti-core.c +++ b/drivers/hwtracing/coresight/coresight-cti-core.c @@ -931,6 +931,8 @@ static int cti_probe(struct amba_device *adev, const struct amba_id *id) cti_desc.ops = &cti_ops; cti_desc.groups = drvdata->ctidev.con_groups; cti_desc.dev = dev;

•   coresight_reset_claim(&cti_desc.access);
    drvdata->csdev = coresight_register(&cti_desc);
    if (IS_ERR(drvdata->csdev)) {
            ret = PTR_ERR(drvdata->csdev);
  

diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index d8bc3e776c88..b598b2c0c9bb 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -772,6 +772,8 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) desc.pdata = pdata; desc.dev = dev; desc.groups = coresight_etb_groups;

•   coresight_reset_claim(&desc.access);
    drvdata->csdev = coresight_register(&desc);
    if (IS_ERR(drvdata->csdev))
            return PTR_ERR(drvdata->csdev);
  

diff --git a/drivers/hwtracing/coresight/coresight-etm.h b/drivers/hwtracing/coresight/coresight-etm.h index e02c3ea972c9..a89736309c27 100644 --- a/drivers/hwtracing/coresight/coresight-etm.h +++ b/drivers/hwtracing/coresight/coresight-etm.h @@ -229,7 +229,7 @@ struct etm_config {

• @config: structure holding configuration parameters.

*/ struct etm_drvdata {

•   void __iomem                    *base;
  

•   struct csdev_access             csa;
    struct clk                      *atclk;
    struct coresight_device         *csdev;
    spinlock_t                      spinlock;
  

@@ -260,7 +260,7 @@ static inline void etm_writel(struct etm_drvdata *drvdata, "invalid CP14 access to ETM reg: %#x", off); } } else {

•           writel_relaxed(val, drvdata->base + off);
  

•           writel_relaxed(val, drvdata->csa.base + off);
    }
  

}

@@ -274,7 +274,7 @@ static inline unsigned int etm_readl(struct etm_drvdata *drvdata, u32 off) "invalid CP14 access to ETM reg: %#x", off); } } else {

•           val = readl_relaxed(drvdata->base + off);
  

•           val = readl_relaxed(drvdata->csa.base + off);
    }
  
    return val;
  

diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c index 509f53b69e42..0b010683b883 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c @@ -86,9 +86,9 @@ static void etm_set_pwrup(struct etm_drvdata *drvdata) { u32 etmpdcr;

•   etmpdcr = readl_relaxed(drvdata->base + ETMPDCR);
  

•   etmpdcr = readl_relaxed(drvdata->csa.base + ETMPDCR);
    etmpdcr |= ETMPDCR_PWD_UP;
  

•   writel_relaxed(etmpdcr, drvdata->base + ETMPDCR);
  

•   writel_relaxed(etmpdcr, drvdata->csa.base + ETMPDCR);
    /* Ensure pwrup completes before subsequent cp14 accesses */
    mb();
    isb();
  

@@ -101,9 +101,9 @@ static void etm_clr_pwrup(struct etm_drvdata *drvdata) /* Ensure pending cp14 accesses complete before clearing pwrup */ mb(); isb();

•   etmpdcr = readl_relaxed(drvdata->base + ETMPDCR);
  

•   etmpdcr = readl_relaxed(drvdata->csa.base + ETMPDCR);
    etmpdcr &= ~ETMPDCR_PWD_UP;
  

•   writel_relaxed(etmpdcr, drvdata->base + ETMPDCR);
  

•   writel_relaxed(etmpdcr, drvdata->csa.base + ETMPDCR);
  

}

/** @@ -365,7 +365,7 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) struct etm_config *config = &drvdata->config; struct coresight_device *csdev = drvdata->csdev;

•   CS_UNLOCK(drvdata->base);
  

•   CS_UNLOCK(drvdata->csa.base);
  
    rc = coresight_claim_device_unlocked(csdev);
    if (rc)
  

@@ -427,7 +427,7 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) etm_clr_prog(drvdata);

done:

•   CS_LOCK(drvdata->base);
  

•   CS_LOCK(drvdata->csa.base);
  
    dev_dbg(&drvdata->csdev->dev, "cpu: %d enable smp call done: %d\n",
            drvdata->cpu, rc);
  

@@ -589,7 +589,7 @@ static void etm_disable_hw(void *info) struct etm_config *config = &drvdata->config; struct coresight_device *csdev = drvdata->csdev;

•   CS_UNLOCK(drvdata->base);
  

•   CS_UNLOCK(drvdata->csa.base);
    etm_set_prog(drvdata);
  
    /* Read back sequencer and counters for post trace analysis */
  

@@ -601,7 +601,7 @@ static void etm_disable_hw(void *info) etm_set_pwrdwn(drvdata); coresight_disclaim_device_unlocked(&csdev->access);

•   CS_LOCK(drvdata->base);
  

•   CS_LOCK(drvdata->csa.base);
  
    dev_dbg(&drvdata->csdev->dev,
            "cpu: %d disable smp call done\n", drvdata->cpu);
  

@@ -614,7 +614,7 @@ static void etm_disable_perf(struct coresight_device *csdev) if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) return;

•   CS_UNLOCK(drvdata->base);
  

•   CS_UNLOCK(drvdata->csa.base);
  
    /* Setting the prog bit disables tracing immediately */
    etm_set_prog(drvdata);
  

@@ -626,7 +626,7 @@ static void etm_disable_perf(struct coresight_device *csdev) etm_set_pwrdwn(drvdata); coresight_disclaim_device_unlocked(&csdev->access);

•   CS_LOCK(drvdata->base);
  

•   CS_LOCK(drvdata->csa.base);
  
    /*
     * perf will release trace ids when _free_aux()
  

@@ -772,7 +772,7 @@ static void etm_init_arch_data(void *info) /* Make sure all registers are accessible */ etm_os_unlock(drvdata);

•   CS_UNLOCK(drvdata->base);
  

•   CS_UNLOCK(drvdata->csa.base);
  
    /* First dummy read */
    (void)etm_readl(drvdata, ETMPDSR);
  

@@ -803,9 +803,10 @@ static void etm_init_arch_data(void *info) drvdata->nr_ext_out = BMVAL(etmccr, 20, 22); drvdata->nr_ctxid_cmp = BMVAL(etmccr, 24, 25);

•   coresight_reset_claim_unlocked(&drvdata->csa);
    etm_set_pwrdwn(drvdata);
    etm_clr_pwrup(drvdata);
  

•   CS_LOCK(drvdata->base);
  

•   CS_LOCK(drvdata->csa.base);
  

}

static int __init etm_hp_setup(void) @@ -866,8 +867,7 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) if (IS_ERR(base)) return PTR_ERR(base);

•   drvdata->base = base;
  

•   desc.access = CSDEV_ACCESS_IOMEM(base);
  

•   desc.access = drvdata->csa = CSDEV_ACCESS_IOMEM(base);
  
    spin_lock_init(&drvdata->spinlock);
  
  

diff --git a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c index 68c644be9813..af566b62785c 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c @@ -50,11 +50,11 @@ static ssize_t etmsr_show(struct device *dev,

    pm_runtime_get_sync(dev->parent);
    spin_lock_irqsave(&drvdata->spinlock, flags);

•   CS_UNLOCK(drvdata->base);
  

•   CS_UNLOCK(drvdata->csa.base);
  
    val = etm_readl(drvdata, ETMSR);
  
  

•   CS_LOCK(drvdata->base);
  

•   CS_LOCK(drvdata->csa.base);
    spin_unlock_irqrestore(&drvdata->spinlock, flags);
    pm_runtime_put(dev->parent);
  
  

@@ -949,9 +949,9 @@ static ssize_t seq_curr_state_show(struct device *dev, pm_runtime_get_sync(dev->parent); spin_lock_irqsave(&drvdata->spinlock, flags);

•   CS_UNLOCK(drvdata->base);
  

•   CS_UNLOCK(drvdata->csa.base);
    val = (etm_readl(drvdata, ETMSQR) & ETM_SQR_MASK);
  

•   CS_LOCK(drvdata->base);
  

•   CS_LOCK(drvdata->csa.base);
  
    spin_unlock_irqrestore(&drvdata->spinlock, flags);
    pm_runtime_put(dev->parent);
  

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 45b30a4b3eba..3609bb74c4ec 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -1337,6 +1337,8 @@ static void etm4_init_arch_data(void *info) drvdata->nrseqstate = FIELD_GET(TRCIDR5_NUMSEQSTATE_MASK, etmidr5); /* NUMCNTR, bits[30:28] number of counters available for tracing */ drvdata->nr_cntr = FIELD_GET(TRCIDR5_NUMCNTR_MASK, etmidr5);

•   coresight_reset_claim_unlocked(csa);
    etm4_cs_lock(drvdata, csa);
    cpu_detect_trace_filtering(drvdata);
  

} diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index e986922d555b..be2a47636ef3 100644 --- a/drivers/hwtracing/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c @@ -255,6 +255,7 @@ static int funnel_probe(struct device *dev, struct resource *res) drvdata->base = base; desc.groups = coresight_funnel_groups; desc.access = CSDEV_ACCESS_IOMEM(base);

•           coresight_reset_claim(&desc.access);
    }
  
    dev_set_drvdata(dev, drvdata);
  

@@ -272,6 +273,7 @@ static int funnel_probe(struct device *dev, struct resource *res) desc.ops = &funnel_cs_ops; desc.pdata = pdata; desc.dev = dev;

•   drvdata->csdev = coresight_register(&desc);
    if (IS_ERR(drvdata->csdev)) {
            ret = PTR_ERR(drvdata->csdev);
  

diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 5d42a9a8c460..679a36effbe8 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -284,6 +284,7 @@ static int replicator_probe(struct device *dev, struct resource *res) desc.pdata = dev->platform_data; desc.dev = dev;

•   coresight_reset_claim(&desc.access);
    drvdata->csdev = coresight_register(&desc);
    if (IS_ERR(drvdata->csdev)) {
            ret = PTR_ERR(drvdata->csdev);
  

diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c index e9876252a789..5ac4e3c706ac 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-core.c +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c @@ -558,6 +558,7 @@ static int __tmc_probe(struct device *dev, struct resource *res) dev->platform_data = pdata; desc.pdata = pdata;

•   coresight_reset_claim(&desc.access);
    drvdata->csdev = coresight_register(&desc);
    if (IS_ERR(drvdata->csdev)) {
            ret = PTR_ERR(drvdata->csdev);
  

diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 937931d107e0..11808aee9d1d 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -655,6 +655,9 @@ extern int coresight_claim_device_unlocked(struct coresight_device *csdev);

extern void coresight_disclaim_device(struct csdev_access *csa); extern void coresight_disclaim_device_unlocked(struct csdev_access *csa); +int coresight_reset_claim_unlocked(struct csdev_access *csa); +int coresight_reset_claim(struct csdev_access *csa);

extern char *coresight_alloc_device_name(struct coresight_dev_list *devs, struct device *dev);

-- 2.34.1

On Tue, Feb 11, 2025 at 10:39:41AM +0000, James Clark wrote:

This can be left behind from a crashed kernel after a kexec so clear it when probing each device. Similarly to coresight_disclaim_device_unlocked(), only clear it if it's already set to avoid races with an external debugger.

We need a csdev_access struct in etm_init_arch_data() so just replace the iomem pointer with a full csdev_access struct. This means all usages need to be updated to go through csa->base.

Signed-off-by: James Clark james.clark@linaro.org

drivers/hwtracing/coresight/coresight-catu.c | 1 + drivers/hwtracing/coresight/coresight-core.c | 48 +++++++++++++++---- .../hwtracing/coresight/coresight-cti-core.c | 2 + drivers/hwtracing/coresight/coresight-etb10.c | 2 + drivers/hwtracing/coresight/coresight-etm.h | 6 +-- .../coresight/coresight-etm3x-core.c | 28 +++++------ .../coresight/coresight-etm3x-sysfs.c | 8 ++-- .../coresight/coresight-etm4x-core.c | 2 + .../hwtracing/coresight/coresight-funnel.c | 2 + .../coresight/coresight-replicator.c | 1 + .../hwtracing/coresight/coresight-tmc-core.c | 1 + include/linux/coresight.h | 3 ++ 12 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index d9259c0b6e64..575c2d247a90 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -558,6 +558,7 @@ static int __catu_probe(struct device *dev, struct resource *res) catu_desc.subtype.helper_subtype = CORESIGHT_DEV_SUBTYPE_HELPER_CATU; catu_desc.ops = &catu_ops;

•   coresight_reset_claim(&catu_desc.access);
    drvdata->csdev = coresight_register(&catu_desc);
    if (IS_ERR(drvdata->csdev))
            ret = PTR_ERR(drvdata->csdev);
  

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index 7fe5d5d432c4..97f33ffad05e 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -212,20 +212,48 @@ int coresight_claim_device(struct coresight_device *csdev) EXPORT_SYMBOL_GPL(coresight_claim_device);

/*

• • coresight_disclaim_device_unlocked : Clear the claim tag for the device.

• • Clear the claim tag for the device.
• • Returns an error if the device wasn't already claimed.
• */

+int coresight_reset_claim(struct csdev_access *csa) +{

•   int ret;
  

•   CS_UNLOCK(csa->base);
  

•   ret = coresight_reset_claim_unlocked(csa);
  

•   CS_LOCK(csa->base);
  

•   return ret;
  

+} +EXPORT_SYMBOL_GPL(coresight_reset_claim);

Maybe my question is overlapping with Mike's comment.

Callers never check the return values from coresight_reset_claim(). I am wandering if coresight_reset_claim() can directly call coresight_clear_self_claim_tag() for _trying_ to clear self-host tag in probe phase. Any self claim tag issues will be deferred to detect until enable the component.

For consistent, we might rename coresight_reset_claim() to coresight_reset_self_claim_tag(), which acquires CS lock and clear self claim tag.

+/*

• • Clear the claim tag for the device. Called with CS_UNLOCKed for the component.
• • Returns an error if the device wasn't already claimed.
• */

+int coresight_reset_claim_unlocked(struct csdev_access *csa) +{

•   if (coresight_read_claim_tags(csa) == CORESIGHT_CLAIM_SELF_HOSTED) {
  

•           coresight_clear_self_claim_tag(csa);
  

•           return 0;
  

•   }
  

•   return -EINVAL;
  

+} +EXPORT_SYMBOL_GPL(coresight_reset_claim_unlocked);

+/*

• • coresight_disclaim_device_unlocked : Clear the claim tag for the device
• • and warn if the device wasn't already claimed.
  • Called with CS_UNLOCKed for the component.
  */

void coresight_disclaim_device_unlocked(struct csdev_access *csa) {

•   if (coresight_read_claim_tags(csa) == CORESIGHT_CLAIM_SELF_HOSTED)
  

•           coresight_clear_self_claim_tag(csa);
  

•   else
  

•           /*
  

•            * The external agent may have not honoured our claim
  

•            * and has manipulated it. Or something else has seriously
  

•            * gone wrong in our driver.
  

•            */
  

•           WARN_ON_ONCE(1);
  

•   /*
  

•    * Warn if the external agent hasn't honoured our claim
  

•    * and has manipulated it. Or something else has seriously
  

•    * gone wrong in our driver.
  

•    */
  

•   WARN_ON_ONCE(coresight_reset_claim_unlocked(csa));
  

} EXPORT_SYMBOL_GPL(coresight_disclaim_device_unlocked);

diff --git a/drivers/hwtracing/coresight/coresight-cti-core.c b/drivers/hwtracing/coresight/coresight-cti-core.c index 073f67a41af9..389a72362f0c 100644 --- a/drivers/hwtracing/coresight/coresight-cti-core.c +++ b/drivers/hwtracing/coresight/coresight-cti-core.c @@ -931,6 +931,8 @@ static int cti_probe(struct amba_device *adev, const struct amba_id *id) cti_desc.ops = &cti_ops; cti_desc.groups = drvdata->ctidev.con_groups; cti_desc.dev = dev;

•   coresight_reset_claim(&cti_desc.access);
    drvdata->csdev = coresight_register(&cti_desc);
    if (IS_ERR(drvdata->csdev)) {
            ret = PTR_ERR(drvdata->csdev);
  

diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index d8bc3e776c88..b598b2c0c9bb 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -772,6 +772,8 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) desc.pdata = pdata; desc.dev = dev; desc.groups = coresight_etb_groups;

•   coresight_reset_claim(&desc.access);
    drvdata->csdev = coresight_register(&desc);
    if (IS_ERR(drvdata->csdev))
            return PTR_ERR(drvdata->csdev);
  

diff --git a/drivers/hwtracing/coresight/coresight-etm.h b/drivers/hwtracing/coresight/coresight-etm.h index e02c3ea972c9..a89736309c27 100644 --- a/drivers/hwtracing/coresight/coresight-etm.h +++ b/drivers/hwtracing/coresight/coresight-etm.h @@ -229,7 +229,7 @@ struct etm_config {

• @config: structure holding configuration parameters.

*/ struct etm_drvdata {

•   void __iomem                    *base;
  

•   struct csdev_access             csa;
  

I would like to extract the change for using `csdev_access` in the ETMv3 driver into a new patch, which is irrelevant to reset self claim tags and would significantly reduce the complexity in this patch.

Thanks, Leo

On Tue, Feb 11, 2025 at 10:39:42AM +0000, James Clark wrote:

These are all static and in one compilation unit so the inline has no effect on the binary.

I read the doc coding-style.rst, the section "15) The inline disease", my understanding is though the inline is not encouraged, I prefer we can follow up the rule:

A reasonable rule of thumb is to not put inline at functions that have more than 3 lines of code in them. An exception to this rule are the cases where a parameter is known to be a compile time constant, and as a result of this constantness you *know* the compiler will be able to optimize most of your function away at compile time. For a good example of this later case, see the kmalloc() inline function.

Except if FTRACE is enabled, then some functions which were already not inlined now get the nops added which allows them to be traced.

I understand it is a side effect that we cannot use function tracer for inline functions. This is not a big issue for me, as we still can use "perf probe" and trace_printk() for debugging.

Thanks, Leo

Signed-off-by: James Clark james.clark@linaro.org

drivers/hwtracing/coresight/coresight-catu.c | 11 ++++---- drivers/hwtracing/coresight/coresight-core.c | 16 ++++++------ drivers/hwtracing/coresight/coresight-etb10.c | 2 +- .../coresight/coresight-etm4x-core.c | 8 +++--- .../coresight/coresight-etm4x-sysfs.c | 4 +-- .../hwtracing/coresight/coresight-platform.c | 26 +++++++++---------- .../coresight/coresight-replicator.c | 2 +- drivers/hwtracing/coresight/coresight-stm.c | 6 ++--- .../coresight/coresight-syscfg-configfs.c | 2 +- .../hwtracing/coresight/coresight-tmc-core.c | 8 +++--- .../hwtracing/coresight/coresight-tmc-etr.c | 16 +++++------- drivers/hwtracing/coresight/coresight-trbe.c | 18 ++++++------- 12 files changed, 58 insertions(+), 61 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index 575c2d247a90..ffa08ea3c296 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -113,9 +113,8 @@ typedef u64 cate_t;

• containing the data page pointer for @offset. If @daddrp is not NULL,
• @daddrp points the DMA address of the beginning of the table.

*/ -static inline cate_t *catu_get_table(struct tmc_sg_table *catu_table,

•                                unsigned long offset,
  

•                                dma_addr_t *daddrp)
  

+static cate_t *catu_get_table(struct tmc_sg_table *catu_table, unsigned long offset,

•                         dma_addr_t *daddrp)
  

{ unsigned long buf_size = tmc_sg_table_buf_size(catu_table); unsigned int table_nr, pg_idx, pg_offset; @@ -165,12 +164,12 @@ static void catu_dump_table(struct tmc_sg_table *catu_table) }

#else -static inline void catu_dump_table(struct tmc_sg_table *catu_table) +static void catu_dump_table(struct tmc_sg_table *catu_table) { } #endif

-static inline cate_t catu_make_entry(dma_addr_t addr) +static cate_t catu_make_entry(dma_addr_t addr) { return addr ? CATU_VALID_ENTRY(addr) : 0; } @@ -390,7 +389,7 @@ static const struct attribute_group *catu_groups[] = { };

-static inline int catu_wait_for_ready(struct catu_drvdata *drvdata) +static int catu_wait_for_ready(struct catu_drvdata *drvdata) { struct csdev_access *csa = &drvdata->csdev->access;

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index 97f33ffad05e..396218819f26 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -127,20 +127,20 @@ coresight_find_out_connection(struct coresight_device *csdev, return ERR_PTR(-ENODEV); }

-static inline u32 coresight_read_claim_tags(struct csdev_access *csa) +static u32 coresight_read_claim_tags(struct csdev_access *csa) { return FIELD_GET(CORESIGHT_CLAIM_MASK, csdev_access_relaxed_read32(csa, CORESIGHT_CLAIMCLR)); }

-static inline void coresight_set_self_claim_tag(struct csdev_access *csa) +static void coresight_set_self_claim_tag(struct csdev_access *csa) { csdev_access_relaxed_write32(csa, CORESIGHT_CLAIM_SELF_HOSTED, CORESIGHT_CLAIMSET); isb(); }

-static inline void coresight_clear_self_claim_tag(struct csdev_access *csa) +static void coresight_clear_self_claim_tag(struct csdev_access *csa) { csdev_access_relaxed_write32(csa, CORESIGHT_CLAIM_SELF_HOSTED, CORESIGHT_CLAIMCLR); @@ -610,7 +610,7 @@ struct coresight_device *coresight_get_sink_by_id(u32 id)

• Return true in successful case and power up the device.
• Return false when failed to get reference of module.

*/ -static inline bool coresight_get_ref(struct coresight_device *csdev) +static bool coresight_get_ref(struct coresight_device *csdev) { struct device *dev = csdev->dev.parent;

@@ -629,7 +629,7 @@ static inline bool coresight_get_ref(struct coresight_device *csdev)

• @csdev: The coresight device to decrement a reference from.

*/ -static inline void coresight_put_ref(struct coresight_device *csdev) +static void coresight_put_ref(struct coresight_device *csdev) { struct device *dev = csdev->dev.parent;

@@ -808,7 +808,7 @@ void coresight_release_path(struct list_head *path) }

/* return true if the device is a suitable type for a default sink */ -static inline bool coresight_is_def_sink_type(struct coresight_device *csdev) +static bool coresight_is_def_sink_type(struct coresight_device *csdev) { /* sink & correct subtype */ if (((csdev->type == CORESIGHT_DEV_TYPE_SINK) || @@ -1362,8 +1362,8 @@ EXPORT_SYMBOL_GPL(coresight_unregister);

• Returns the index of the entry, when found. Otherwise, -ENOENT.

*/ -static inline int coresight_search_device_idx(struct coresight_dev_list *dict,

•                                         struct fwnode_handle *fwnode)
  

+static int coresight_search_device_idx(struct coresight_dev_list *dict,

•                                  struct fwnode_handle *fwnode)
  

{ int i;

diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index b598b2c0c9bb..de6d3a6fb828 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -95,7 +95,7 @@ struct etb_drvdata { static int etb_set_buffer(struct coresight_device *csdev, struct perf_output_handle *handle);

-static inline unsigned int etb_get_buffer_depth(struct etb_drvdata *drvdata) +static unsigned int etb_get_buffer_depth(struct etb_drvdata *drvdata) { return readl_relaxed(drvdata->base + ETB_RAM_DEPTH_REG); } diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 3609bb74c4ec..9e7d423c1ae9 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -84,7 +84,7 @@ static int etm4_probe_cpu(unsigned int cpu);

•         TRCIDR4.NUMPC > 0b0000 .
  

•         TRCSSCSR<n>.PC == 0b1
  

*/ -static inline bool etm4x_sspcicrn_present(struct etmv4_drvdata *drvdata, int n) +static bool etm4x_sspcicrn_present(struct etmv4_drvdata *drvdata, int n) { return (n < drvdata->nr_ss_cmp) && drvdata->nr_pe && @@ -185,7 +185,7 @@ static void etm_write_os_lock(struct etmv4_drvdata *drvdata, isb(); }

-static inline void etm4_os_unlock_csa(struct etmv4_drvdata *drvdata, +static void etm4_os_unlock_csa(struct etmv4_drvdata *drvdata, struct csdev_access *csa) { WARN_ON(drvdata->cpu != smp_processor_id()); @@ -1035,7 +1035,7 @@ static const struct coresight_ops etm4_cs_ops = { .source_ops = &etm4_source_ops, };

-static inline bool cpu_supports_sysreg_trace(void) +static bool cpu_supports_sysreg_trace(void) { u64 dfr0 = read_sysreg_s(SYS_ID_AA64DFR0_EL1);

@@ -1343,7 +1343,7 @@ static void etm4_init_arch_data(void *info) cpu_detect_trace_filtering(drvdata); }

-static inline u32 etm4_get_victlr_access_type(struct etmv4_config *config) +static u32 etm4_get_victlr_access_type(struct etmv4_config *config) { return etm4_get_access_type(config) << __bf_shf(TRCVICTLR_EXLEVEL_MASK); } diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c index a9f19629f3f8..0465c32f7ed4 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c @@ -2440,7 +2440,7 @@ static u32 etmv4_cross_read(const struct etmv4_drvdata *drvdata, u32 offset) return reg.data; }

-static inline u32 coresight_etm4x_attr_to_offset(struct device_attribute *attr) +static u32 coresight_etm4x_attr_to_offset(struct device_attribute *attr) { struct dev_ext_attribute *eattr;

@@ -2464,7 +2464,7 @@ static ssize_t coresight_etm4x_reg_show(struct device *dev, return scnprintf(buf, PAGE_SIZE, "0x%x\n", val); }

-static inline bool +static bool etm4x_register_implemented(struct etmv4_drvdata *drvdata, u32 offset) { switch (offset) { diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 8192ba3279f0..0db64c5f4995 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -139,7 +139,7 @@ coresight_find_csdev_by_fwnode(struct fwnode_handle *r_fwnode) EXPORT_SYMBOL_GPL(coresight_find_csdev_by_fwnode);

#ifdef CONFIG_OF -static inline bool of_coresight_legacy_ep_is_input(struct device_node *ep) +static bool of_coresight_legacy_ep_is_input(struct device_node *ep) { return of_property_read_bool(ep, "slave-mode"); } @@ -159,7 +159,7 @@ static struct device_node *of_coresight_get_port_parent(struct device_node *ep) return parent; }

-static inline struct device_node * +static struct device_node * of_coresight_get_output_ports_node(const struct device_node *node) { return of_get_child_by_name(node, "out-ports"); @@ -327,14 +327,14 @@ static int of_get_coresight_platform_data(struct device *dev, return 0; } #else -static inline int +static int of_get_coresight_platform_data(struct device *dev, struct coresight_platform_data *pdata) { return -ENOENT; }

-static inline int of_coresight_get_cpu(struct device *dev) +static int of_coresight_get_cpu(struct device *dev) { return -ENODEV; } @@ -356,7 +356,7 @@ static const guid_t coresight_graph_uuid = GUID_INIT(0x3ecbc8b6, 0x1d0e, 0x4fb3, #define ACPI_CORESIGHT_LINK_SLAVE 0 #define ACPI_CORESIGHT_LINK_MASTER 1

-static inline bool is_acpi_guid(const union acpi_object *obj) +static bool is_acpi_guid(const union acpi_object *obj) { return (obj->type == ACPI_TYPE_BUFFER) && (obj->buffer.length == 16); } @@ -365,24 +365,24 @@ static inline bool is_acpi_guid(const union acpi_object *obj)

• acpi_guid_matches - Checks if the given object is a GUID object and
• that it matches the supplied the GUID.

*/ -static inline bool acpi_guid_matches(const union acpi_object *obj, +static bool acpi_guid_matches(const union acpi_object *obj, const guid_t *guid) { return is_acpi_guid(obj) && guid_equal((guid_t *)obj->buffer.pointer, guid); }

-static inline bool is_acpi_dsd_graph_guid(const union acpi_object *obj) +static bool is_acpi_dsd_graph_guid(const union acpi_object *obj) { return acpi_guid_matches(obj, &acpi_graph_uuid); }

-static inline bool is_acpi_coresight_graph_guid(const union acpi_object *obj) +static bool is_acpi_coresight_graph_guid(const union acpi_object *obj) { return acpi_guid_matches(obj, &coresight_graph_uuid); }

-static inline bool is_acpi_coresight_graph(const union acpi_object *obj) +static bool is_acpi_coresight_graph(const union acpi_object *obj) { const union acpi_object *graphid, *guid, *links;

@@ -469,7 +469,7 @@ static inline bool is_acpi_coresight_graph(const union acpi_object *obj)

• }, // End of ACPI Graph Property
  

• })

*/ -static inline bool acpi_validate_dsd_graph(const union acpi_object *graph) +static bool acpi_validate_dsd_graph(const union acpi_object *graph) { int i, n; const union acpi_object *rev, *nr_graphs; @@ -553,7 +553,7 @@ acpi_get_dsd_graph(struct acpi_device *adev, struct acpi_buffer *buf) return NULL; }

-static inline bool +static bool acpi_validate_coresight_graph(const union acpi_object *cs_graph) { int nlinks; @@ -794,14 +794,14 @@ acpi_get_coresight_platform_data(struct device *dev,

#else

-static inline int +static int acpi_get_coresight_platform_data(struct device *dev, struct coresight_platform_data *pdata) { return -ENOENT; }

-static inline int acpi_coresight_get_cpu(struct device *dev) +static int acpi_coresight_get_cpu(struct device *dev) { return -ENODEV; } diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 679a36effbe8..9f27374f1310 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -63,7 +63,7 @@ static void dynamic_replicator_reset(struct replicator_drvdata *drvdata) /*

• replicator_reset : Reset the replicator configuration to sane values.

*/ -static inline void replicator_reset(struct replicator_drvdata *drvdata) +static void replicator_reset(struct replicator_drvdata *drvdata) { if (drvdata->base) dynamic_replicator_reset(drvdata); diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c index b581a30a1cd9..5decc87d1fba 100644 --- a/drivers/hwtracing/coresight/coresight-stm.c +++ b/drivers/hwtracing/coresight/coresight-stm.c @@ -290,7 +290,7 @@ static const struct coresight_ops stm_cs_ops = { .source_ops = &stm_source_ops, };

-static inline bool stm_addr_unaligned(const void *addr, u8 write_bytes) +static bool stm_addr_unaligned(const void *addr, u8 write_bytes) { return ((unsigned long)addr & (write_bytes - 1)); } @@ -674,7 +674,7 @@ static int of_stm_get_stimulus_area(struct device *dev, struct resource *res) return of_address_to_resource(np, index, res); } #else -static inline int of_stm_get_stimulus_area(struct device *dev, +static int of_stm_get_stimulus_area(struct device *dev, struct resource *res) { return -ENOENT; @@ -718,7 +718,7 @@ static int acpi_stm_get_stimulus_area(struct device *dev, struct resource *res) return rc; } #else -static inline int acpi_stm_get_stimulus_area(struct device *dev, +static int acpi_stm_get_stimulus_area(struct device *dev, struct resource *res) { return -ENOENT; diff --git a/drivers/hwtracing/coresight/coresight-syscfg-configfs.c b/drivers/hwtracing/coresight/coresight-syscfg-configfs.c index 213b4159b062..2b40e556be87 100644 --- a/drivers/hwtracing/coresight/coresight-syscfg-configfs.c +++ b/drivers/hwtracing/coresight/coresight-syscfg-configfs.c @@ -10,7 +10,7 @@ #include "coresight-syscfg-configfs.h"

/* create a default ci_type. */ -static inline struct config_item_type *cscfg_create_ci_type(void) +static struct config_item_type *cscfg_create_ci_type(void) { struct config_item_type *ci_type;

diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c index 5ac4e3c706ac..2e3354b5c5c7 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-core.c +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c @@ -164,8 +164,8 @@ static int tmc_open(struct inode *inode, struct file *file) return 0; }

-static inline ssize_t tmc_get_sysfs_trace(struct tmc_drvdata *drvdata,

•                                     loff_t pos, size_t len, char **bufpp)
  

+static ssize_t tmc_get_sysfs_trace(struct tmc_drvdata *drvdata, loff_t pos, size_t len,

•                              char **bufpp)
  

{ switch (drvdata->config_type) { case TMC_CONFIG_TYPE_ETB: @@ -359,7 +359,7 @@ static const struct attribute_group *coresight_etr_groups[] = { NULL, };

-static inline bool tmc_etr_can_use_sg(struct device *dev) +static bool tmc_etr_can_use_sg(struct device *dev) { int ret; u8 val_u8; @@ -389,7 +389,7 @@ static inline bool tmc_etr_can_use_sg(struct device *dev) return false; }

-static inline bool tmc_etr_has_non_secure_access(struct tmc_drvdata *drvdata) +static bool tmc_etr_has_non_secure_access(struct tmc_drvdata *drvdata) { u32 auth = readl_relaxed(drvdata->base + TMC_AUTHSTATUS);

diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c index 7ba4f79191de..0d4e3af0d4b5 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -124,7 +124,7 @@ struct etr_sg_table {

• If we spill over to a new page for mapping 1 entry, we could as
• well replace the link entry of the previous page with the last entry.

*/ -static inline unsigned long __attribute_const__ +static unsigned long __attribute_const__ tmc_etr_sg_table_entries(int nr_pages) { unsigned long nr_sgpages = nr_pages * ETR_SG_PAGES_PER_SYSPAGE; @@ -238,13 +238,13 @@ static int tmc_pages_alloc(struct tmc_pages *tmc_pages, return -ENOMEM; }

-static inline long +static long tmc_sg_get_data_page_offset(struct tmc_sg_table *sg_table, dma_addr_t addr) { return tmc_pages_get_offset(&sg_table->data_pages, addr); }

-static inline void tmc_free_table_pages(struct tmc_sg_table *sg_table) +static void tmc_free_table_pages(struct tmc_sg_table *sg_table) { if (sg_table->table_vaddr) vunmap(sg_table->table_vaddr); @@ -480,7 +480,7 @@ static void tmc_etr_sg_table_dump(struct etr_sg_table *etr_table) dev_dbg(sg_table->dev, "******* End of Table *****\n"); } #else -static inline void tmc_etr_sg_table_dump(struct etr_sg_table *etr_table) {} +static void tmc_etr_sg_table_dump(struct etr_sg_table *etr_table) {} #endif

/* @@ -815,10 +815,8 @@ void tmc_etr_remove_catu_ops(void) } EXPORT_SYMBOL_GPL(tmc_etr_remove_catu_ops);

-static inline int tmc_etr_mode_alloc_buf(int mode,

•                                    struct tmc_drvdata *drvdata,
  

•                                    struct etr_buf *etr_buf, int node,
  

•                                    void **pages)
  

+static int tmc_etr_mode_alloc_buf(int mode, struct tmc_drvdata *drvdata, struct etr_buf *etr_buf,

•                             int node, void **pages)
  

{ int rc = -EINVAL;

@@ -936,7 +934,7 @@ static ssize_t tmc_etr_buf_get_data(struct etr_buf *etr_buf, return etr_buf->ops->get_data(etr_buf, (u64)offset, len, bufpp); }

-static inline s64 +static s64 tmc_etr_buf_insert_barrier_packet(struct etr_buf *etr_buf, u64 offset) { ssize_t len; diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c index 919804b12a67..e9a19ef52359 100644 --- a/drivers/hwtracing/coresight/coresight-trbe.c +++ b/drivers/hwtracing/coresight/coresight-trbe.c @@ -159,22 +159,22 @@ static void trbe_check_errata(struct trbe_cpudata *cpudata) } }

-static inline bool trbe_has_erratum(struct trbe_cpudata *cpudata, int i) +static bool trbe_has_erratum(struct trbe_cpudata *cpudata, int i) { return (i < TRBE_ERRATA_MAX) && test_bit(i, cpudata->errata); }

-static inline bool trbe_may_overwrite_in_fill_mode(struct trbe_cpudata *cpudata) +static bool trbe_may_overwrite_in_fill_mode(struct trbe_cpudata *cpudata) { return trbe_has_erratum(cpudata, TRBE_WORKAROUND_OVERWRITE_FILL_MODE); }

-static inline bool trbe_may_write_out_of_range(struct trbe_cpudata *cpudata) +static bool trbe_may_write_out_of_range(struct trbe_cpudata *cpudata) { return trbe_has_erratum(cpudata, TRBE_WORKAROUND_WRITE_OUT_OF_RANGE); }

-static inline bool trbe_needs_drain_after_disable(struct trbe_cpudata *cpudata) +static bool trbe_needs_drain_after_disable(struct trbe_cpudata *cpudata) { /* * Errata affected TRBE implementation will need TSB CSYNC and @@ -184,7 +184,7 @@ static inline bool trbe_needs_drain_after_disable(struct trbe_cpudata *cpudata) return trbe_has_erratum(cpudata, TRBE_NEEDS_DRAIN_AFTER_DISABLE); }

-static inline bool trbe_needs_ctxt_sync_after_enable(struct trbe_cpudata *cpudata) +static bool trbe_needs_ctxt_sync_after_enable(struct trbe_cpudata *cpudata) { /* * Errata affected TRBE implementation will need an additional @@ -195,7 +195,7 @@ static inline bool trbe_needs_ctxt_sync_after_enable(struct trbe_cpudata *cpudat return trbe_has_erratum(cpudata, TRBE_NEEDS_CTXT_SYNC_AFTER_ENABLE); }

-static inline bool trbe_is_broken(struct trbe_cpudata *cpudata) +static bool trbe_is_broken(struct trbe_cpudata *cpudata) { return trbe_has_erratum(cpudata, TRBE_IS_BROKEN); } @@ -207,13 +207,13 @@ static int trbe_alloc_node(struct perf_event *event) return cpu_to_node(event->cpu); }

-static inline void trbe_drain_buffer(void) +static void trbe_drain_buffer(void) { tsb_csync(); dsb(nsh); }

-static inline void set_trbe_enabled(struct trbe_cpudata *cpudata, u64 trblimitr) +static void set_trbe_enabled(struct trbe_cpudata *cpudata, u64 trblimitr) { /* * Enable the TRBE without clearing LIMITPTR which @@ -229,7 +229,7 @@ static inline void set_trbe_enabled(struct trbe_cpudata *cpudata, u64 trblimitr) isb(); }

-static inline void set_trbe_disabled(struct trbe_cpudata *cpudata) +static void set_trbe_disabled(struct trbe_cpudata *cpudata) { u64 trblimitr = read_sysreg_s(SYS_TRBLIMITR_EL1);

-- 2.34.1

---

CoreSight mailing list -- coresight@lists.linaro.org To unsubscribe send an email to coresight-leave@lists.linaro.org

On Tue, Feb 11, 2025 at 10:39:43AM +0000, James Clark wrote:

Function declarations are extern by default so remove the extra noise and inconsistency.

This change is consistent with the coding-style.rst:

"Do not use the ``extern`` keyword with function declarations as this makes lines longer and isn't strictly necessary."

Reviewed-by: Leo Yan leo.yan@arm.com

Signed-off-by: James Clark james.clark@linaro.org

drivers/hwtracing/coresight/coresight-priv.h | 14 ++++----- include/linux/coresight.h | 33 +++++++++----------- 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index a83113225797..e09071a720f0 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -57,10 +57,8 @@ struct cs_off_attribute { u32 off; };

-extern ssize_t coresight_simple_show32(struct device *_dev,

•                                struct device_attribute *attr, char *buf);
  

-extern ssize_t coresight_simple_show_pair(struct device *_dev,

•                                struct device_attribute *attr, char *buf);
  

+ssize_t coresight_simple_show32(struct device *_dev, struct device_attribute *attr, char *buf); +ssize_t coresight_simple_show_pair(struct device *_dev, struct device_attribute *attr, char *buf);

#define coresight_simple_reg32(name, offset) \ (&((struct cs_off_attribute[]) { \ @@ -155,8 +153,8 @@ void coresight_remove_links(struct coresight_device *orig, u32 coresight_get_sink_id(struct coresight_device *csdev);

#if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM3X) -extern int etm_readl_cp14(u32 off, unsigned int *val); -extern int etm_writel_cp14(u32 off, u32 val); +int etm_readl_cp14(u32 off, unsigned int *val); +int etm_writel_cp14(u32 off, u32 val); #else static inline int etm_readl_cp14(u32 off, unsigned int *val) { return 0; } static inline int etm_writel_cp14(u32 off, u32 val) { return 0; } @@ -167,8 +165,8 @@ struct cti_assoc_op { void (*remove)(struct coresight_device *csdev); };

-extern void coresight_set_cti_ops(const struct cti_assoc_op *cti_op); -extern void coresight_remove_cti_ops(void); +void coresight_set_cti_ops(const struct cti_assoc_op *cti_op); +void coresight_remove_cti_ops(void);

/*

• Macros and inline functions to handle CoreSight UCI data and driver

diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 11808aee9d1d..2b43698c0b25 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -642,26 +642,23 @@ static inline void coresight_set_mode(struct coresight_device *csdev, local_set(&csdev->mode, new_mode); }

-extern struct coresight_device * -coresight_register(struct coresight_desc *desc); -extern void coresight_unregister(struct coresight_device *csdev); -extern int coresight_enable_sysfs(struct coresight_device *csdev); -extern void coresight_disable_sysfs(struct coresight_device *csdev); -extern int coresight_timeout(struct csdev_access *csa, u32 offset,

•                        int position, int value);
  

-extern int coresight_claim_device(struct coresight_device *csdev); -extern int coresight_claim_device_unlocked(struct coresight_device *csdev);

-extern void coresight_disclaim_device(struct csdev_access *csa); -extern void coresight_disclaim_device_unlocked(struct csdev_access *csa); +struct coresight_device *coresight_register(struct coresight_desc *desc); +void coresight_unregister(struct coresight_device *csdev); +int coresight_enable_sysfs(struct coresight_device *csdev); +void coresight_disable_sysfs(struct coresight_device *csdev); +int coresight_timeout(struct csdev_access *csa, u32 offset, int position, int value);

+int coresight_claim_device(struct coresight_device *csdev); +int coresight_claim_device_unlocked(struct coresight_device *csdev);

+void coresight_disclaim_device(struct csdev_access *csa); +void coresight_disclaim_device_unlocked(struct csdev_access *csa); int coresight_reset_claim_unlocked(struct csdev_access *csa); int coresight_reset_claim(struct csdev_access *csa);

-extern char *coresight_alloc_device_name(struct coresight_dev_list *devs,

•                                    struct device *dev);
  

+char *coresight_alloc_device_name(struct coresight_dev_list *devs, struct device *dev);

-extern bool coresight_loses_context_with_cpu(struct device *dev); +bool coresight_loses_context_with_cpu(struct device *dev);

u32 coresight_relaxed_read32(struct coresight_device *csdev, u32 offset); u32 coresight_read32(struct coresight_device *csdev, u32 offset); @@ -674,8 +671,8 @@ void coresight_relaxed_write64(struct coresight_device *csdev, u64 val, u32 offset); void coresight_write64(struct coresight_device *csdev, u64 val, u32 offset);

-extern int coresight_get_cpu(struct device *dev); -extern int coresight_get_static_trace_id(struct device *dev, u32 *id); +int coresight_get_cpu(struct device *dev); +int coresight_get_static_trace_id(struct device *dev, u32 *id);

struct coresight_platform_data *coresight_get_platform_data(struct device *dev); struct coresight_connection * -- 2.34.1

---

CoreSight mailing list -- coresight@lists.linaro.org To unsubscribe send an email to coresight-leave@lists.linaro.org