This is a note to let you know that I've just added the patch titled
serial: 8250_omap: Fix probe and remove for PM runtime
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
serial-8250_omap-fix-probe-and-remove-for-pm-runtime.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4e0f5cc65098ea32a1e77baae74215b9bd5276b1 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri, 20 Jan 2017 12:22:31 -0800
Subject: serial: 8250_omap: Fix probe and remove for PM runtime
From: Tony Lindgren <tony@xxxxxxxxxxx>
commit 4e0f5cc65098ea32a1e77baae74215b9bd5276b1 upstream.
Otherwise the interconnect related code implementing PM runtime will
produce these errors on a failed probe:
omap_uart 48066000.serial: omap_device: omap_device_enable() called from invalid state 1
omap_uart 48066000.serial: use pm_runtime_put_sync_suspend() in driver?
Note that we now also need to check for priv in omap8250_runtime_suspend()
as it has not yet been registered if probe fails. And we need to use
pm_runtime_put_sync() to properly idle the device like we already do
in omap8250_remove().
Fixes: 61929cf0169d ("tty: serial: Add 8250-core based omap driver")
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/tty/serial/8250/8250_omap.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -1237,7 +1237,8 @@ static int omap8250_probe(struct platfor
pm_runtime_put_autosuspend(&pdev->dev);
return 0;
err:
- pm_runtime_put(&pdev->dev);
+ pm_runtime_dont_use_autosuspend(&pdev->dev);
+ pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
return ret;
}
@@ -1246,6 +1247,7 @@ static int omap8250_remove(struct platfo
{
struct omap8250_priv *priv = platform_get_drvdata(pdev);
+ pm_runtime_dont_use_autosuspend(&pdev->dev);
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
serial8250_unregister_port(priv->line);
@@ -1345,6 +1347,10 @@ static int omap8250_runtime_suspend(stru
struct omap8250_priv *priv = dev_get_drvdata(dev);
struct uart_8250_port *up;
+ /* In case runtime-pm tries this before we are setup */
+ if (!priv)
+ return 0;
+
up = serial8250_get_port(priv->line);
/*
* When using 'no_console_suspend', the console UART must not be
Patches currently in stable-queue which might be from tony@xxxxxxxxxxx are
queue-4.9/power-supply-bq24190_charger-handle-fault-before-status-on-interrupt.patch
queue-4.9/power-supply-bq24190_charger-call-power_supply_changed-for-relevant-component.patch
queue-4.9/power-supply-bq24190_charger-install-irq_handler_thread-at-end-of-probe.patch
queue-4.9/power-supply-bq24190_charger-call-set_mode_host-on-pm_resume.patch
queue-4.9/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch
queue-4.9/serial-8250_omap-fix-probe-and-remove-for-pm-runtime.patch
queue-4.9/power-supply-bq24190_charger-don-t-read-fault-register-outside-irq_handle_thread.patch
queue-4.9/power-supply-bq24190_charger-fix-irq-trigger-to-irqf_trigger_falling.patch