ARM: drivers/amba: release and cleanup the resource to allow for deferred probe
PATCH v3 1/1 ARM: drivers/amba: release and cleanup the resource to allow for deferred probe
With commit "79bdcb202a35 ARM: 8906/1: drivers/amba: add reset control to amba bus probe", the amba bus driver needs to be deferred probe because the reset driver is probed later. However with a deferred probe, the call to request_resource() in the driver returns -EBUSY. The reason is the driver has not released the resource from the previous probe attempt.
This patch fixes how we handle the condition of EPROBE_DEFER that is returned from getting the reset controls. For this condition, the patch will jump to defer_probe, which will iounmap, dev_pm_domain_detach, and release the resource.
amba bus probe")
---
v3: jump to defer_probe where the driver will unmap and pm_detach the
driver resource for the next probe attempt
v2: release the resource when of_reset_control_array_get_optional_shared()
returns EPROBE_DEFER
--- drivers/amba/bus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/amba/bus.c +6 -2
@@ -409,9 +409,12 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)*/ rstc =of_reset_control_array_get_optional_shared (dev->dev.of_node);if (IS_ERR (rstc)) { -if (PTR_ERR (rstc) != -EPROBE_DEFER ) + ret =PTR_ERR (rstc); +if (ret == -EPROBE_DEFER ) + goto defer_probe; +else dev_err (&dev->dev,"Can't get amba reset!\n" ); -return PTR_ERR (rstc); +return ret; }reset_control_deassert (rstc);reset_control_put (rstc);
@@ -448,6 +451,7 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) ret = -ENODEV ; } + defer_probe:iounmap (tmp);dev_pm_domain_detach (&dev->dev, true);
Signature · 7 lines
2.20.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Russell King - ARM Linux admin
maintainerQuoted 29 lines · Dinh Nguyen
With commit "
79bdcb202a35ARM: 8906/1:drivers/amba: add reset control to amba bus probe", the amba bus driver needs to be deferred probe because the reset driver is probed later. However with a deferred probe, the call torequest_resource()in the driver returns-EBUSY. The reason is the driver has not released the resource from the previous probe attempt.This patch fixes how we handle the condition of
EPROBE_DEFERthat is returned from getting the reset controls. For this condition, the patch will jump todefer_probe, which will iounmap,dev_pm_domain_detach, and release the resource.Fixes 79bdcb202a35 ("ARM: 8906/1: drivers/amba: add reset control toamba bus probe")
Signed-off-by Dinh Nguyen <[email protected]>---
v3: jump todefer_probewhere the driver will unmap andpm_detachthe
driver resource for the next probe attempt
v2: release the resource whenof_reset_control_array_get_optional_shared()
returnsEPROBE_DEFER--- drivers/amba/bus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/amba/bus.c +0
-0@@ -409,9 +409,12 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)*/
drivers/amba/bus.c static int amba_device_try_add(struct amba_device *dev, struct resource *parent) · line 417
Quoted 10 lines
drivers/amba/bus.c +5
-2rstc =of_reset_control_array_get_optional_shared (dev->dev.of_node);if (IS_ERR (rstc)) { -if (PTR_ERR (rstc) != -EPROBE_DEFER ) + ret =PTR_ERR (rstc); +if (ret == -EPROBE_DEFER ) + goto defer_probe; +else dev_err (&dev->dev,"Can't get amba reset!\n" ); -return PTR_ERR (rstc); +return ret;
So, if of_reset_control_array_get_optional_shared() returns an error, we end up leaking the ioremap(), the resource claim, the pclk enable and pm domain? If it returns -EPROBE_DEFER, we end up leaking the pclk enable?
I think this is going to be quicker if I write the patch - I haven't build-tested this yet though. Please check whether this works for you.
Thanks.
8<=====
From: Russell King <[email protected]>
Subject: [PATCH] drivers/amba: fix reset control error handling
With commit 79bdcb202a35 ("ARM: 8906/1: drivers/amba: add reset control to amba bus probe") it is possible for the the amba bus driver to defer probing the device for its IDs because the reset driver may be probed later.
However when a subsequent probe occurs, the call to request_resource() in the driver returns -EBUSY as the driver has not released the resource from the initial probe attempt - or cleaned up any of the preceding actions.
Fix this both for the deferred probe case as well as a failure to get the reset.
--- drivers/amba/bus.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/amba/bus.c +11 -3
@@ -409,9 +409,11 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)*/ rstc =of_reset_control_array_get_optional_shared (dev->dev.of_node);if (IS_ERR (rstc)) { -if (PTR_ERR (rstc) != -EPROBE_DEFER ) -dev_err (&dev->dev,"Can't get amba reset!\n" ); -return PTR_ERR (rstc); + ret =PTR_ERR (rstc); +if (ret != -EPROBE_DEFER ) +dev_err (&dev->dev,"can't get reset: %d\n" , + ret); + goto err_reset; }reset_control_deassert (rstc);reset_control_put (rstc);
@@ -472,6 +474,12 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)release_resource (&dev->res); err_out:return ret; + + err_reset: +amba_put_disable_pclk (dev); +iounmap (tmp); +dev_pm_domain_detach (&dev->dev, true); + goto err_release; }/*
Signature · 7 lines
2.7.4 -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up
Dinh Nguyen
Tested-byQuoted 98 lines · Russell King - ARM Linux admin
Quoted 29 lines · Dinh Nguyen
With commit "
79bdcb202a35ARM: 8906/1:drivers/amba: add reset control to amba bus probe", the amba bus driver needs to be deferred probe because the reset driver is probed later. However with a deferred probe, the call torequest_resource()in the driver returns-EBUSY. The reason is the driver has not released the resource from the previous probe attempt.This patch fixes how we handle the condition of
EPROBE_DEFERthat is returned from getting the reset controls. For this condition, the patch will jump todefer_probe, which will iounmap,dev_pm_domain_detach, and release the resource.Fixes 79bdcb202a35 ("ARM: 8906/1: drivers/amba: add reset control toamba bus probe")
Signed-off-by Dinh Nguyen <[email protected]>---
v3: jump todefer_probewhere the driver will unmap andpm_detachthe
driver resource for the next probe attempt
v2: release the resource whenof_reset_control_array_get_optional_shared()
returnsEPROBE_DEFER--- drivers/amba/bus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/amba/bus.c +0
-0@@ -409,9 +409,12 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)*/ drivers/amba/bus.c static int amba_device_try_add(struct amba_device *dev, struct resource *parent) · line 417
Quoted 10 lines
drivers/amba/bus.c +5
-2rstc =of_reset_control_array_get_optional_shared (dev->dev.of_node);if (IS_ERR (rstc)) { -if (PTR_ERR (rstc) != -EPROBE_DEFER ) + ret =PTR_ERR (rstc); +if (ret == -EPROBE_DEFER ) + goto defer_probe; +else dev_err (&dev->dev,"Can't get amba reset!\n" ); -return PTR_ERR (rstc); +return ret;So, if
of_reset_control_array_get_optional_shared()returns an error, we end up leaking theioremap(), the resource claim, the pclk enable and pm domain? If it returns -EPROBE_DEFER, we end up leaking the pclk enable?I think this is going to be quicker if I write the patch - I haven't build-tested this yet though. Please check whether this works for you.
Thanks.
8<=====
From: Russell King <[email protected]>
Subject: [PATCH]drivers/amba: fix reset control error handlingWith commit
79bdcb202a35("ARM: 8906/1:drivers/amba: add reset control to amba bus probe") it is possible for the the amba bus driver to defer probing the device for its IDs because the reset driver may be probed later.However when a subsequent probe occurs, the call to
request_resource()in the driver returns-EBUSYas the driver has not released the resource from the initial probe attempt - or cleaned up any of the preceding actions.Fix this both for the deferred probe case as well as a failure to get the reset.
Fixes 79bdcb202a35 ("ARM: 8906/1: drivers/amba: add reset control to amba bus probe")Signed-off-by Russell King <[email protected]>--- drivers/amba/bus.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/amba/bus.c +5
-3@@ -409,9 +409,11 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)*/ rstc =of_reset_control_array_get_optional_shared (dev->dev.of_node);if (IS_ERR (rstc)) { -if (PTR_ERR (rstc) != -EPROBE_DEFER ) -dev_err (&dev->dev,"Can't get amba reset!\n" ); -return PTR_ERR (rstc); + ret =PTR_ERR (rstc); +if (ret != -EPROBE_DEFER ) +dev_err (&dev->dev,"can't get reset: %d\n" , + ret); + goto err_reset; }reset_control_deassert (rstc);reset_control_put (rstc);@@ -472,6 +474,12 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)release_resource (&dev->res); err_out:
drivers/amba/bus.c static int amba_device_try_add(struct amba_device *dev, struct resource *parent) · line 485
Quoted 10 lines
drivers/amba/bus.c +6
-0return ret; + + err_reset: +amba_put_disable_pclk (dev); +iounmap (tmp); +dev_pm_domain_detach (&dev->dev, true); + goto err_release; }/*
Thanks,
Dinh
Dinh Nguyen
Tested-byQuoted 98 lines · Russell King - ARM Linux admin
Quoted 29 lines · Dinh Nguyen
With commit "
79bdcb202a35ARM: 8906/1:drivers/amba: add reset control to amba bus probe", the amba bus driver needs to be deferred probe because the reset driver is probed later. However with a deferred probe, the call torequest_resource()in the driver returns-EBUSY. The reason is the driver has not released the resource from the previous probe attempt.This patch fixes how we handle the condition of
EPROBE_DEFERthat is returned from getting the reset controls. For this condition, the patch will jump todefer_probe, which will iounmap,dev_pm_domain_detach, and release the resource.Fixes 79bdcb202a35 ("ARM: 8906/1: drivers/amba: add reset control toamba bus probe")
Signed-off-by Dinh Nguyen <[email protected]>---
v3: jump todefer_probewhere the driver will unmap andpm_detachthe
driver resource for the next probe attempt
v2: release the resource whenof_reset_control_array_get_optional_shared()
returnsEPROBE_DEFER--- drivers/amba/bus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/amba/bus.c +0
-0@@ -409,9 +409,12 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)*/ drivers/amba/bus.c static int amba_device_try_add(struct amba_device *dev, struct resource *parent) · line 417
Quoted 10 lines
drivers/amba/bus.c +5
-2rstc =of_reset_control_array_get_optional_shared (dev->dev.of_node);if (IS_ERR (rstc)) { -if (PTR_ERR (rstc) != -EPROBE_DEFER ) + ret =PTR_ERR (rstc); +if (ret == -EPROBE_DEFER ) + goto defer_probe; +else dev_err (&dev->dev,"Can't get amba reset!\n" ); -return PTR_ERR (rstc); +return ret;So, if
of_reset_control_array_get_optional_shared()returns an error, we end up leaking theioremap(), the resource claim, the pclk enable and pm domain? If it returns -EPROBE_DEFER, we end up leaking the pclk enable?I think this is going to be quicker if I write the patch - I haven't build-tested this yet though. Please check whether this works for you.
Thanks.
8<=====
From: Russell King <[email protected]>
Subject: [PATCH]drivers/amba: fix reset control error handlingWith commit
79bdcb202a35("ARM: 8906/1:drivers/amba: add reset control to amba bus probe") it is possible for the the amba bus driver to defer probing the device for its IDs because the reset driver may be probed later.However when a subsequent probe occurs, the call to
request_resource()in the driver returns-EBUSYas the driver has not released the resource from the initial probe attempt - or cleaned up any of the preceding actions.Fix this both for the deferred probe case as well as a failure to get the reset.
Fixes 79bdcb202a35 ("ARM: 8906/1: drivers/amba: add reset control to amba bus probe")Signed-off-by Russell King <[email protected]>--- drivers/amba/bus.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/amba/bus.c +5
-3@@ -409,9 +409,11 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)*/ rstc =of_reset_control_array_get_optional_shared (dev->dev.of_node);if (IS_ERR (rstc)) { -if (PTR_ERR (rstc) != -EPROBE_DEFER ) -dev_err (&dev->dev,"Can't get amba reset!\n" ); -return PTR_ERR (rstc); + ret =PTR_ERR (rstc); +if (ret != -EPROBE_DEFER ) +dev_err (&dev->dev,"can't get reset: %d\n" , + ret); + goto err_reset; }reset_control_deassert (rstc);reset_control_put (rstc);@@ -472,6 +474,12 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)release_resource (&dev->res); err_out:
drivers/amba/bus.c static int amba_device_try_add(struct amba_device *dev, struct resource *parent) · line 485
Quoted 10 lines
drivers/amba/bus.c +6
-0return ret; + + err_reset: +amba_put_disable_pclk (dev); +iounmap (tmp); +dev_pm_domain_detach (&dev->dev, true); + goto err_release; }/*
Thanks,
Dinh