From: khilman@ti•com (Kevin Hilman)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 11/12] OMAP2: Serial: Add has_async_wake flag.
Date: Fri, 24 Jun 2011 17:29:25 -0700 [thread overview]
Message-ID: <87y60qpxcq.fsf@ti.com> (raw)
In-Reply-To: <1307532194-13039-12-git-send-email-govindraj.raja@ti.com> (Govindraj R.'s message of "Wed, 8 Jun 2011 16:53:13 +0530")
"Govindraj.R" <govindraj.raja@ti•com> writes:
> Prior to this patch the uart_clock was cut using prepare/resume calls since
> these funcs are no more available with runtime changes use has_async_wake
> flag to keep clock active during bootup otherwise uart port will disabled
> during boot-up and cannot be enabled back.
Is this only a bootup issue, or a runtime PM issue? It appears to me
that with this patch, runtime PM is effectively disabled for the whole
time.
Why not just use pm_runtime_disable() in _probe() for devices with no
async wakeup.
> Also based on this flag we can disable uart port during suspend and
> enable back during resume for omap_socs that have not set
> has_async_wake.
Then you can use pm_runtime_enable() in ->prepare() and
pm_runtime_disable() in ->complete()
Kevin
> Signed-off-by: Govindraj.R <govindraj.raja@ti•com>
> ---
> arch/arm/mach-omap2/serial.c | 1 +
> arch/arm/plat-omap/include/plat/omap-serial.h | 3 +++
> drivers/tty/serial/omap-serial.c | 14 ++++++++++++++
> 3 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
> index 4bc5914..0a95c95 100644
> --- a/arch/arm/mach-omap2/serial.c
> +++ b/arch/arm/mach-omap2/serial.c
> @@ -266,6 +266,7 @@ static void omap_uart_idle_init(struct omap_uart_port_info *uart,
> break;
> }
> uart->wk_mask = wk_mask;
> + uart->has_async_wake = true;
> } else if (cpu_is_omap24xx()) {
> u32 wk_mask = 0;
> u32 wk_en = PM_WKEN1, wk_st = PM_WKST1;
> diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
> index b5117bd..69e6d4b 100644
> --- a/arch/arm/plat-omap/include/plat/omap-serial.h
> +++ b/arch/arm/plat-omap/include/plat/omap-serial.h
> @@ -79,6 +79,7 @@ struct omap_uart_port_info {
> void __iomem *wk_st;
> void __iomem *wk_en;
> u32 wk_mask;
> + bool has_async_wake;
> };
>
> struct uart_omap_dma {
> @@ -134,6 +135,8 @@ struct uart_omap_port {
> unsigned int errata;
> void (*enable_wakeup)(struct platform_device *, bool);
> bool (*chk_wakeup)(struct platform_device *);
> +
> + bool has_async_wake;
> };
>
> #endif /* __OMAP_SERIAL_H__ */
> diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
> index c3561dd..dbe76f3 100644
> --- a/drivers/tty/serial/omap-serial.c
> +++ b/drivers/tty/serial/omap-serial.c
> @@ -1181,6 +1181,13 @@ static int serial_omap_suspend(struct device *dev)
> uart_suspend_port(&serial_omap_reg, &up->port);
> console_trylock();
> serial_omap_pm(&up->port, 3, 0);
> +
> + /* OMAP2 dont have async wakeup from prcm.
> + * For such socs clocks will be kept active from probe and
> + * cut only in suspend path.
> + */
> + if (!up->has_async_wake)
> + serial_omap_port_disable(up);
> }
> return 0;
> }
> @@ -1192,6 +1199,9 @@ static int serial_omap_resume(struct device *dev)
> if (up) {
> uart_resume_port(&serial_omap_reg, &up->port);
> console_unlock();
> +
> + if (!up->has_async_wake)
> + serial_omap_port_enable(up);
> }
>
> return 0;
> @@ -1415,6 +1425,7 @@ static int serial_omap_probe(struct platform_device *pdev)
> up->errata = omap_up_info->errata;
> up->enable_wakeup = omap_up_info->enable_wakeup;
> up->chk_wakeup = omap_up_info->chk_wakeup;
> + up->has_async_wake = omap_up_info->has_async_wake;
>
> if (omap_up_info->dma_enabled) {
> up->uart_dma.uart_dma_tx = dma_tx->start;
> @@ -1443,6 +1454,9 @@ static int serial_omap_probe(struct platform_device *pdev)
> serial_omap_port_disable(up);
> }
>
> + if (!up->has_async_wake)
> + serial_omap_port_enable(up);
> +
> ui[pdev->id] = up;
> serial_omap_add_console_port(up);
next prev parent reply other threads:[~2011-06-25 0:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-08 11:23 [PATCH v3 00/12] OMAP2+: Serial: Runtime adaptation + cleanup Govindraj.R
2011-06-08 11:23 ` [PATCH v3 01/12] OMAP2+: UART: Remove certain uart calls from sram_idle Govindraj.R
2011-06-08 11:23 ` [PATCH v3 02/12] OMAP2+: UART: Remove uart clock handling code from serial.c Govindraj.R
2011-06-24 22:28 ` Kevin Hilman
2011-06-27 12:49 ` Govindraj
2011-06-08 11:23 ` [PATCH v3 03/12] OMAP2+: Serial: Add default mux for all uarts Govindraj.R
2011-06-08 11:23 ` [PATCH v3 04/12] Serial: OMAP: Add runtime pm support for omap-serial driver Govindraj.R
2011-06-08 20:39 ` Jon Hunter
2011-06-09 4:35 ` Govindraj
2011-06-09 20:49 ` Jon Hunter
2011-06-09 20:51 ` Jon Hunter
2011-06-24 23:30 ` Kevin Hilman
2011-06-27 14:31 ` Govindraj
2011-06-27 22:57 ` Kevin Hilman
2011-06-08 11:23 ` [PATCH v3 05/12] OMAP: Serial: Hold console lock for console usage Govindraj.R
2011-06-25 0:06 ` Kevin Hilman
2011-06-27 13:35 ` Govindraj
2011-06-27 22:41 ` Kevin Hilman
2011-06-08 11:23 ` [PATCH v3 06/12] Serial: OMAP2+: Move erratum handling from serial.c Govindraj.R
2011-06-08 11:23 ` [PATCH v3 07/12] OMAP: Serial: Allow UART parameters to be configured from board file Govindraj.R
2011-06-25 0:12 ` Kevin Hilman
2011-06-27 12:53 ` Govindraj
2011-06-08 11:23 ` [PATCH v3 08/12] Serial: OMAP2+: Make the RX_TIMEOUT for DMA configurable for each UART Govindraj.R
2011-06-25 0:16 ` Kevin Hilman
2011-06-08 11:23 ` [PATCH v3 09/12] OMAP3: Serial: Remove uart pads from 3430 board file Govindraj.R
2011-06-24 22:29 ` Kevin Hilman
2011-06-27 12:51 ` Govindraj
2011-06-08 11:23 ` [PATCH v3 10/12] OMAP: Serial: Use resume call from prcm to enable uart Govindraj.R
2011-06-25 0:23 ` Kevin Hilman
2011-06-27 15:03 ` Govindraj
2011-06-08 11:23 ` [PATCH v3 11/12] OMAP2: Serial: Add has_async_wake flag Govindraj.R
2011-06-25 0:29 ` Kevin Hilman [this message]
2011-06-27 13:09 ` Govindraj
2011-06-27 22:28 ` Kevin Hilman
2011-06-08 11:23 ` [PATCH v3 12/12] OMAP4: Serial: Set TX_FIFO_THRESHOLD if uart in dma mode for es2.0 Govindraj.R
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=87y60qpxcq.fsf@ti.com \
--to=khilman@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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