2021-10-10 18:40:31

by Mikhail Rudenko

Subject: [PATCH] media: rockchip: rkisp1: use device name for debugfs subdir name

While testing Rockchip RK3399 with both ISPs enabled, a dmesg error
was observed:
```
[ 15.559141] debugfs: Directory 'rkisp1' with parent '/' already present!
```

Fix it by using the device name for the debugfs subdirectory name
instead of the driver name, thus preventing name collision.

Signed-off-by: Mikhail Rudenko <[email protected]>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index 7474150b94ed..560f928c3752 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -426,7 +426,7 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
{
struct rkisp1_debug *debug = &rkisp1->debug;

- debug->debugfs_dir = debugfs_create_dir(RKISP1_DRIVER_NAME, NULL);
+ debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL);
debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir,
&debug->data_loss);
debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir,
--
2.33.0

2021-10-12 03:26:37

by Ezequiel Garcia

Subject: Re: [PATCH] media: rockchip: rkisp1: use device name for debugfs subdir name

On Sun, Oct 10, 2021 at 08:54:57PM +0300, Mikhail Rudenko wrote:
> While testing Rockchip RK3399 with both ISPs enabled, a dmesg error
> was observed:
> ```
> [ 15.559141] debugfs: Directory 'rkisp1' with parent '/' already present!
> ```
>
> Fix it by using the device name for the debugfs subdirectory name
> instead of the driver name, thus preventing name collision.
>
> Signed-off-by: Mikhail Rudenko <[email protected]>

Reviewed-by: Ezequiel Garcia <[email protected]>

Thanks!

> ---
> drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index 7474150b94ed..560f928c3752 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -426,7 +426,7 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
> {
> struct rkisp1_debug *debug = &rkisp1->debug;
>
> - debug->debugfs_dir = debugfs_create_dir(RKISP1_DRIVER_NAME, NULL);
> + debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL);
> debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir,
> &debug->data_loss);
> debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir,
> --
> 2.33.0
>

2021-10-12 12:52:09

by Kieran Bingham

Subject: Re: [PATCH] media: rockchip: rkisp1: use device name for debugfs subdir name

Hi Mikhail,

Quoting Mikhail Rudenko (2021-10-10 18:54:57)
> While testing Rockchip RK3399 with both ISPs enabled, a dmesg error
> was observed:
> ```
> [ 15.559141] debugfs: Directory 'rkisp1' with parent '/' already present!
> ```
>
> Fix it by using the device name for the debugfs subdirectory name
> instead of the driver name, thus preventing name collision.
>
> Signed-off-by: Mikhail Rudenko <[email protected]>
> ---
> drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index 7474150b94ed..560f928c3752 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -426,7 +426,7 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
> {
> struct rkisp1_debug *debug = &rkisp1->debug;
>
> - debug->debugfs_dir = debugfs_create_dir(RKISP1_DRIVER_NAME, NULL);
> + debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL);

I would wonder if they should be grouped under a subdir called rkisp1
... but that would then still keep the same issue that whichever was
second to probe would find that /rkisp1 was already present. I suspect
debugfs would make it possible to check if the parent was already there
and only create it if it exists, but anyway, it would then be harder to
clean up too.

So separate based on the nodes sounds perfectly reasonable to me.

Reviewed-by: Kieran Bingham <[email protected]>

> debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir,
> &debug->data_loss);
> debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir,
> --
> 2.33.0
>

2021-11-13 23:40:05

by Mikhail Rudenko

Subject: Re: [PATCH] media: rockchip: rkisp1: use device name for debugfs subdir name

On 2021-10-10 at 20:54 +03, Mikhail Rudenko <[email protected]> wrote:
> While testing Rockchip RK3399 with both ISPs enabled, a dmesg error
> was observed:
> ```
> [ 15.559141] debugfs: Directory 'rkisp1' with parent '/' already present!
> ```
>
> Fix it by using the device name for the debugfs subdirectory name
> instead of the driver name, thus preventing name collision.
>
> Signed-off-by: Mikhail Rudenko <[email protected]>
> ---
> drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index 7474150b94ed..560f928c3752 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -426,7 +426,7 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
> {
> struct rkisp1_debug *debug = &rkisp1->debug;
>
> - debug->debugfs_dir = debugfs_create_dir(RKISP1_DRIVER_NAME, NULL);
> + debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL);
> debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir,
> &debug->data_loss);
> debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir,

Gentle ping. Could this be merged please?

--
Best regards,
Mikhail Rudenko