[PATCH] coresight: Handle build path error

Mathieu Poirier mathieu.poirier at linaro.org
Fri May 6 07:43:23 PDT 2016


On 6 May 2016 at 08:35, Suzuki K Poulose <suzuki.poulose at arm.com> wrote:
> Enabling a component via sysfs (echo 1 > enable_source), would
> trigger building a path from the enabled sources to the sink.
> If there is an error in the process (e.g, sink not enabled or
> the device (CPU corresponding to ETM) is not online), we never report
> failure, except for leaving a message in the dmesg.
>
> Do proper error checking for the build path and return the error.
>
> Before:
>  $ echo 0 > /sys/devices/system/cpu/cpu2/online
>  $ echo 1 > /sys/devices/cs_etm/cpu2/enable_source
>  $ echo $?
>  0
>
> After:
>  $ echo 0 > /sys/devices/system/cpu/cpu2/online
>  $ echo 1 > /sys/devices/cs_etm/cpu2/enable_source
>  -bash: echo: write error: No such device or address
>
> Cc: Mathieu Poirier <mathieu.poirier at linaro.org>
> Signed-off-by: Suzuki K Poulose <suzuki.poulose at arm.com>
> ---
>  drivers/hwtracing/coresight/coresight.c |    9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
> index 2ea5961..e0c5166 100644
> --- a/drivers/hwtracing/coresight/coresight.c
> +++ b/drivers/hwtracing/coresight/coresight.c
> @@ -393,6 +393,7 @@ out:
>  struct list_head *coresight_build_path(struct coresight_device *csdev)
>  {
>         struct list_head *path;
> +       int rc;
>
>         path = kzalloc(sizeof(struct list_head), GFP_KERNEL);
>         if (!path)
> @@ -400,9 +401,10 @@ struct list_head *coresight_build_path(struct coresight_device *csdev)
>
>         INIT_LIST_HEAD(path);
>
> -       if (_coresight_build_path(csdev, path)) {
> +       rc = _coresight_build_path(csdev, path);
> +       if (rc) {
>                 kfree(path);
> -               path = NULL;
> +               return ERR_PTR(rc);
>         }
>
>         return path;
> @@ -448,8 +450,9 @@ int coresight_enable(struct coresight_device *csdev)
>                 goto out;
>
>         path = coresight_build_path(csdev);
> -       if (!path) {
> +       if (IS_ERR(path)) {
>                 pr_err("building path(s) failed\n");
> +               ret = PTR_ERR(path);
>                 goto out;
>         }
>
> --
> 1.7.9.5
>

Thanks for the correction:

Acked-by: Mathieu Poirier <mathieu.poirier at linaro.org>

Greg, given how small the changes are can you pick this up?  Otherwise
I'll simply keep it in my tree.

Thanks,
Mathieu



More information about the linux-arm-kernel mailing list