From: Tony Lindgren <tony@atomide.com> To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Alan Stern <stern@rowland.harvard.edu>, Kevin Hilman <khilman@baylibre.com>, Nishanth Menon <nm@ti.com>, "Rafael J . Wysocki" <rafael@kernel.org>, Tero Kristo <t-kristo@ti.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-i2c@vger.kernel.org, linux-mmc@vger.kernel.org, linux-serial@vger.kernel.org, linux-spi@vger.kernel.org, Mark Brown <broonie@kernel.org>, Peter Hurley <peter@hurleysoftware.com>, Ulf Hansson <ulf.hansson@linaro.org>, Wolfram Sang <wsa@the-dreams.de> Subject: [PATCH 7/7] ARM: OMAP2+: Fix omap_device for module reload on PM runtime forbid Date: Wed, 10 Feb 2016 15:02:50 -0800 [thread overview] Message-ID: <1455145370-20301-8-git-send-email-tony@atomide.com> (raw) In-Reply-To: <1455145370-20301-1-git-send-email-tony@atomide.com> If a driver PM runtime is disabled via sysfs, and the module is unloaded, PM runtime can't do anything to disable the device. Let's let the interconnect disable the device on BUS_NOTIFY_UNBOUND_DRIVER. Otherwise omap_device will produce and error on the following module reload. This can be easily tested with something like: # modprobe omap_hsmmc # echo on > /sys/devices/platform/68000000.ocp/4809c000.mmc/power/control # rmmod omap_hsmmc # modprobe omap_hsmmc Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Kevin Hilman <khilman@baylibre.com> Cc: Nishanth Menon <nm@ti.com> Cc: Rafael J. Wysocki <rafael@kernel.org> Cc: Tero Kristo <t-kristo@ti.com> Reported-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/omap_device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index ebd8369..f7ff3b9 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -191,12 +191,22 @@ static int _omap_device_notifier_call(struct notifier_block *nb, { struct platform_device *pdev = to_platform_device(dev); struct omap_device *od; + int err; switch (event) { case BUS_NOTIFY_DEL_DEVICE: if (pdev->archdata.od) omap_device_delete(pdev->archdata.od); break; + case BUS_NOTIFY_UNBOUND_DRIVER: + od = to_omap_device(pdev); + if (od && (od->_state == OMAP_DEVICE_STATE_ENABLED)) { + dev_info(dev, "enabled after unload, idling\n"); + err = omap_device_idle(pdev); + if (err) + dev_err(dev, "failed to idle\n"); + } + break; case BUS_NOTIFY_ADD_DEVICE: if (pdev->dev.of_node) omap_device_build_from_dt(pdev); -- 2.7.0
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 7/7] ARM: OMAP2+: Fix omap_device for module reload on PM runtime forbid Date: Wed, 10 Feb 2016 15:02:50 -0800 [thread overview] Message-ID: <1455145370-20301-8-git-send-email-tony@atomide.com> (raw) In-Reply-To: <1455145370-20301-1-git-send-email-tony@atomide.com> If a driver PM runtime is disabled via sysfs, and the module is unloaded, PM runtime can't do anything to disable the device. Let's let the interconnect disable the device on BUS_NOTIFY_UNBOUND_DRIVER. Otherwise omap_device will produce and error on the following module reload. This can be easily tested with something like: # modprobe omap_hsmmc # echo on > /sys/devices/platform/68000000.ocp/4809c000.mmc/power/control # rmmod omap_hsmmc # modprobe omap_hsmmc Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Kevin Hilman <khilman@baylibre.com> Cc: Nishanth Menon <nm@ti.com> Cc: Rafael J. Wysocki <rafael@kernel.org> Cc: Tero Kristo <t-kristo@ti.com> Reported-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/omap_device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index ebd8369..f7ff3b9 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -191,12 +191,22 @@ static int _omap_device_notifier_call(struct notifier_block *nb, { struct platform_device *pdev = to_platform_device(dev); struct omap_device *od; + int err; switch (event) { case BUS_NOTIFY_DEL_DEVICE: if (pdev->archdata.od) omap_device_delete(pdev->archdata.od); break; + case BUS_NOTIFY_UNBOUND_DRIVER: + od = to_omap_device(pdev); + if (od && (od->_state == OMAP_DEVICE_STATE_ENABLED)) { + dev_info(dev, "enabled after unload, idling\n"); + err = omap_device_idle(pdev); + if (err) + dev_err(dev, "failed to idle\n"); + } + break; case BUS_NOTIFY_ADD_DEVICE: if (pdev->dev.of_node) omap_device_build_from_dt(pdev); -- 2.7.0
next prev parent reply other threads:[~2016-02-10 23:02 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-10 23:02 [PATCH 0/7] PM runtime regression fixes for omaps Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-10 23:02 ` [PATCH 1/7] mmc: omap_hsmmc: Fix PM regression with deferred probe for pm_runtime_reinit Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-11 10:18 ` Ulf Hansson 2016-02-11 10:18 ` Ulf Hansson 2016-02-11 15:02 ` Tony Lindgren 2016-02-11 15:02 ` Tony Lindgren [not found] ` <20160211150240.GR19432-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2016-02-11 15:13 ` Ulf Hansson 2016-02-11 15:13 ` Ulf Hansson 2016-02-11 17:26 ` Tony Lindgren 2016-02-11 17:26 ` Tony Lindgren 2016-02-12 12:59 ` Ulf Hansson 2016-02-12 12:59 ` Ulf Hansson 2016-02-22 17:54 ` Tony Lindgren 2016-02-22 17:54 ` Tony Lindgren 2016-02-10 23:02 ` [PATCH 2/7] i2c: omap: " Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren [not found] ` <1455145370-20301-3-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2016-02-11 17:34 ` Wolfram Sang 2016-02-11 17:34 ` Wolfram Sang 2016-02-11 17:56 ` Tony Lindgren 2016-02-11 17:56 ` Tony Lindgren 2016-02-12 12:50 ` Ulf Hansson 2016-02-12 12:50 ` Ulf Hansson 2016-02-12 18:43 ` Wolfram Sang 2016-02-12 18:43 ` Wolfram Sang 2016-02-10 23:02 ` [PATCH 3/7] spi: omap2-mcspi: " Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-11 11:51 ` Mark Brown 2016-02-11 11:51 ` Mark Brown [not found] ` <20160211115128.GF13270-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> 2016-02-11 15:08 ` Tony Lindgren 2016-02-11 15:08 ` Tony Lindgren 2016-02-11 15:52 ` Mark Brown 2016-02-11 15:52 ` Mark Brown [not found] ` <20160211155255.GA1953-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> 2016-02-11 17:36 ` Tony Lindgren 2016-02-11 17:36 ` Tony Lindgren 2016-02-11 18:36 ` Mark Brown 2016-02-11 18:36 ` Mark Brown 2016-02-11 18:52 ` Tony Lindgren 2016-02-11 18:52 ` Tony Lindgren 2016-02-12 12:51 ` Ulf Hansson 2016-02-12 12:51 ` Ulf Hansson 2016-02-10 23:02 ` [PATCH 4/7] serial: 8250_omap: " Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-12 3:17 ` Greg Kroah-Hartman 2016-02-12 3:17 ` Greg Kroah-Hartman 2016-02-12 12:52 ` Ulf Hansson 2016-02-12 12:52 ` Ulf Hansson 2016-02-10 23:02 ` [PATCH 5/7] serial: omap: " Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-12 12:52 ` Ulf Hansson 2016-02-12 12:52 ` Ulf Hansson [not found] ` <1455145370-20301-1-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2016-02-10 23:02 ` [PATCH 6/7] ARM: OMAP2+: Improve omap_device error for driver writers Tony Lindgren 2016-02-10 23:02 ` Tony Lindgren 2016-02-12 1:13 ` Kevin Hilman 2016-02-12 1:13 ` Kevin Hilman [not found] ` <1455145370-20301-7-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2016-02-12 12:53 ` Ulf Hansson 2016-02-12 12:53 ` Ulf Hansson 2016-02-10 23:02 ` Tony Lindgren [this message] 2016-02-10 23:02 ` [PATCH 7/7] ARM: OMAP2+: Fix omap_device for module reload on PM runtime forbid Tony Lindgren 2016-02-12 1:13 ` Kevin Hilman 2016-02-12 1:13 ` Kevin Hilman 2016-02-12 12:54 ` Ulf Hansson 2016-02-12 12:54 ` Ulf Hansson
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=1455145370-20301-8-git-send-email-tony@atomide.com \ --to=tony@atomide.com \ --cc=broonie@kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=khilman@baylibre.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=nm@ti.com \ --cc=peter@hurleysoftware.com \ --cc=rafael@kernel.org \ --cc=stern@rowland.harvard.edu \ --cc=t-kristo@ti.com \ --cc=ulf.hansson@linaro.org \ --cc=wsa@the-dreams.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.