From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ulf Hansson Subject: Re: [PATCH 7/7] ARM: OMAP2+: Fix omap_device for module reload on PM runtime forbid Date: Fri, 12 Feb 2016 13:54:21 +0100 Message-ID: References: <1455145370-20301-1-git-send-email-tony@atomide.com> <1455145370-20301-8-git-send-email-tony@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: In-Reply-To: <1455145370-20301-8-git-send-email-tony@atomide.com> Sender: linux-mmc-owner@vger.kernel.org To: Tony Lindgren Cc: linux-omap , "linux-arm-kernel@lists.infradead.org" , Alan Stern , Kevin Hilman , Nishanth Menon , "Rafael J . Wysocki" , Tero Kristo , Greg Kroah-Hartman , "linux-i2c@vger.kernel.org" , linux-mmc , linux-serial@vger.kernel.org, "linux-spi@vger.kernel.org" , Mark Brown , Peter Hurley , Wolfram Sang List-Id: linux-i2c@vger.kernel.org On 11 February 2016 at 00:02, Tony Lindgren wrote: > 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 > Cc: Kevin Hilman > Cc: Nishanth Menon > Cc: Rafael J. Wysocki > Cc: Tero Kristo > Reported-by: Ulf Hansson > Signed-off-by: Tony Lindgren Acked-by: Ulf Hansson Kind regards Uffe > --- > 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: ulf.hansson@linaro.org (Ulf Hansson) Date: Fri, 12 Feb 2016 13:54:21 +0100 Subject: [PATCH 7/7] ARM: OMAP2+: Fix omap_device for module reload on PM runtime forbid In-Reply-To: <1455145370-20301-8-git-send-email-tony@atomide.com> References: <1455145370-20301-1-git-send-email-tony@atomide.com> <1455145370-20301-8-git-send-email-tony@atomide.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 11 February 2016 at 00:02, Tony Lindgren wrote: > 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 > Cc: Kevin Hilman > Cc: Nishanth Menon > Cc: Rafael J. Wysocki > Cc: Tero Kristo > Reported-by: Ulf Hansson > Signed-off-by: Tony Lindgren Acked-by: Ulf Hansson Kind regards Uffe > --- > 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 >