From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Russell King <linux@armlinux.org.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de,
Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH v3 1/5] amba: Fix resource leak for drivers without .remove
Date: Tue, 26 Jan 2021 17:58:31 +0100 [thread overview]
Message-ID: <20210126165835.687514-2-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20210126165835.687514-1-u.kleine-koenig@pengutronix.de>
Consider an amba driver with a .probe but without a .remove callback (e.g.
pl061_gpio_driver). The function amba_probe() is called to bind a device
and so dev_pm_domain_attach() and others are called. As there is no remove
callback amba_remove() isn't called at unbind time however and so calling
dev_pm_domain_detach() is missed and the pm domain keeps active.
To fix this always use the core driver callbacks and handle missing amba
callbacks there. For probe refuse registration as a driver without probe
doesn't make sense.
Fixes: 7cfe249475fd ("ARM: AMBA: Add pclk support to AMBA bus infrastructure")
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/amba/bus.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index ecc304149067..b5f5ca4e3f34 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -299,10 +299,11 @@ static int amba_remove(struct device *dev)
{
struct amba_device *pcdev = to_amba_device(dev);
struct amba_driver *drv = to_amba_driver(dev->driver);
- int ret;
+ int ret = 0;
pm_runtime_get_sync(dev);
- ret = drv->remove(pcdev);
+ if (drv->remove)
+ ret = drv->remove(pcdev);
pm_runtime_put_noidle(dev);
/* Undo the runtime PM settings in amba_probe() */
@@ -319,7 +320,9 @@ static int amba_remove(struct device *dev)
static void amba_shutdown(struct device *dev)
{
struct amba_driver *drv = to_amba_driver(dev->driver);
- drv->shutdown(to_amba_device(dev));
+
+ if (drv->shutdown)
+ drv->shutdown(to_amba_device(dev));
}
/**
@@ -332,12 +335,13 @@ static void amba_shutdown(struct device *dev)
*/
int amba_driver_register(struct amba_driver *drv)
{
- drv->drv.bus = &amba_bustype;
+ if (!drv->probe)
+ return -EINVAL;
-#define SETFN(fn) if (drv->fn) drv->drv.fn = amba_##fn
- SETFN(probe);
- SETFN(remove);
- SETFN(shutdown);
+ drv->drv.bus = &amba_bustype;
+ drv->drv.probe = amba_probe;
+ drv->drv.remove = amba_remove;
+ drv->drv.shutdown = amba_shutdown;
return driver_register(&drv->drv);
}
--
2.29.2
next prev parent reply other threads:[~2021-01-27 7:45 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 16:58 [PATCH v3 0/5] amba: minor fix and various cleanups Uwe Kleine-König
2021-01-26 16:58 ` Uwe Kleine-König [this message]
2021-01-26 16:58 ` [PATCH v3 2/5] amba: reorder functions Uwe Kleine-König
2021-01-26 16:58 ` [PATCH v3 3/5] vfio: platform: simplify device removal Uwe Kleine-König
2021-01-26 16:58 ` [PATCH v3 4/5] amba: Make the remove callback return void Uwe Kleine-König
2021-01-26 17:08 ` Suzuki K Poulose
2021-01-26 17:56 ` Uwe Kleine-König
2021-01-26 19:05 ` Russell King - ARM Linux admin
2021-01-26 17:30 ` Vinod Koul
2021-01-26 19:24 ` Guenter Roeck
2021-01-27 6:47 ` Wolfram Sang
2021-01-27 6:50 ` Takashi Iwai
2021-01-27 8:12 ` Vladimir Zapolskiy
2021-01-27 12:03 ` Greg Kroah-Hartman
2021-02-03 13:18 ` Auger Eric
2021-01-26 16:58 ` [PATCH v3 5/5] amba: Make use of bus_type functions Uwe Kleine-König
2021-02-02 10:49 ` [PATCH v3 0/5] amba: minor fix and various cleanups Russell King - ARM Linux admin
2021-02-03 7:45 ` Uwe Kleine-König
2021-02-02 13:53 ` [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Uwe Kleine-König
2021-02-02 14:06 ` Greg Kroah-Hartman
2021-02-04 16:52 ` Russell King - ARM Linux admin
2021-02-04 16:56 ` Greg Kroah-Hartman
2021-02-04 16:59 ` Russell King - ARM Linux admin
2021-02-04 18:15 ` Uwe Kleine-König
2021-02-05 9:37 ` Uwe Kleine-König
2021-02-05 10:18 ` Greg Kroah-Hartman
2021-02-05 10:56 ` Uwe Kleine-König
2021-02-05 11:07 ` Greg Kroah-Hartman
2021-02-02 19:43 ` [PATCH] mailbox: arm_mhuv2: make remove callback return void Uwe Kleine-König
2021-02-03 2:57 ` Viresh Kumar
2021-02-02 21:35 ` [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210126165835.687514-2-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).