[PATCH v1 2/9] coresight: catu: Support atclk

[Anshuman Khandual]

On 3/27/25 17:07, Leo Yan wrote:
> The atclk is an optional clock for the CoreSight CATU, but the driver
> misses to initialize it.
> 
> This change enables atclk in probe of the CATU driver, and dynamically
> control the clock during suspend and resume.
> 
> The checks for driver data and clocks in suspend and resume are not
> needed, remove them.  Add error handling in the resume function.
> 
> Fixes: fcacb5c154ba ("coresight: Introduce support for Coresight Address Translation Unit")
> Signed-off-by: Leo Yan <leo.yan at arm.com>
> ---
>  drivers/hwtracing/coresight/coresight-catu.c | 22 +++++++++++++++++-----
>  drivers/hwtracing/coresight/coresight-catu.h |  1 +
>  2 files changed, 18 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
> index fa170c966bc3..9fcda5e49253 100644
> --- a/drivers/hwtracing/coresight/coresight-catu.c
> +++ b/drivers/hwtracing/coresight/coresight-catu.c
> @@ -513,6 +513,10 @@ static int __catu_probe(struct device *dev, struct resource *res)
>  	struct coresight_platform_data *pdata = NULL;
>  	void __iomem *base;
>  
> +	drvdata->atclk = devm_clk_get_optional_enabled(dev, "atclk");
> +	if (IS_ERR(drvdata->atclk))
> +		return PTR_ERR(drvdata->atclk);
> +
>  	catu_desc.name = coresight_alloc_device_name(&catu_devs, dev);
>  	if (!catu_desc.name)
>  		return -ENOMEM;
> @@ -659,18 +663,26 @@ static int catu_runtime_suspend(struct device *dev)
>  {
>  	struct catu_drvdata *drvdata = dev_get_drvdata(dev);
>  
> -	if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))
> -		clk_disable_unprepare(drvdata->pclk);
> +	clk_disable_unprepare(drvdata->atclk);
> +	clk_disable_unprepare(drvdata->pclk);
> +
>  	return 0;
>  }
>  
>  static int catu_runtime_resume(struct device *dev)
>  {
>  	struct catu_drvdata *drvdata = dev_get_drvdata(dev);
> +	int ret;
>  
> -	if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))
> -		clk_prepare_enable(drvdata->pclk);
> -	return 0;
> +	ret = clk_prepare_enable(drvdata->pclk);
> +	if (ret)
> +		return ret;
> +
> +	ret = clk_prepare_enable(drvdata->atclk);
> +	if (ret)
> +		clk_disable_unprepare(drvdata->pclk);
> +
> +	return ret;
>  }
>  #endif
>  
> diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h
> index 141feac1c14b..2fe31fed6cf1 100644
> --- a/drivers/hwtracing/coresight/coresight-catu.h
> +++ b/drivers/hwtracing/coresight/coresight-catu.h
> @@ -62,6 +62,7 @@
>  
>  struct catu_drvdata {
>  	struct clk *pclk;
> +	struct clk *atclk;
>  	void __iomem *base;
>  	struct coresight_device *csdev;
>  	int irq;

Reviewed-by: Anshuman Khandual <anshuman.khandual at arm.com>