From: Felipe Balbi <balbi@ti.com>
To: alan@linux.intel.com
Cc: Tony Lindgren <tony@atomide.com>, Kevin Hilman <khilman@ti.com>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux ARM Kernel Mailing List
<linux-arm-kernel@lists.infradead.org>,
linux-serial@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Santosh Shilimkar <santosh.shilimkar@ti.com>,
Shubhrajyoti Datta <shubhrajyoti@ti.com>,
Felipe Balbi <balbi@ti.com>
Subject: [RFC/PATCH 10/13] serial: omap: stick to put_autosuspend
Date: Tue, 21 Aug 2012 12:15:52 +0300 [thread overview]
Message-ID: <1345540555-24359-11-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1345540555-24359-1-git-send-email-balbi@ti.com>
Everytime we're done using our TTY, we want
the pm timer to be reinitilized. By sticking
to pm_runtime_pm_autosuspend() we make sure
that this will always be the case.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/tty/serial/omap-serial.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 6ea24c5..458d77c 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -164,7 +164,8 @@ static void serial_omap_enable_ms(struct uart_port *port)
pm_runtime_get_sync(up->dev);
up->ier |= UART_IER_MSI;
serial_out(up, UART_IER, up->ier);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static void serial_omap_stop_tx(struct uart_port *port)
@@ -412,7 +413,8 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port)
spin_lock_irqsave(&up->port.lock, flags);
ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
spin_unlock_irqrestore(&up->port.lock, flags);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
return ret;
}
@@ -424,7 +426,8 @@ static unsigned int serial_omap_get_mctrl(struct uart_port *port)
pm_runtime_get_sync(up->dev);
status = check_modem_status(up);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->port.line);
@@ -460,7 +463,8 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
up->mcr = serial_in(up, UART_MCR);
up->mcr |= mcr;
serial_out(up, UART_MCR, up->mcr);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static void serial_omap_break_ctl(struct uart_port *port, int break_state)
@@ -477,7 +481,8 @@ static void serial_omap_break_ctl(struct uart_port *port, int break_state)
up->lcr &= ~UART_LCR_SBC;
serial_out(up, UART_LCR, up->lcr);
spin_unlock_irqrestore(&up->port.lock, flags);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static int serial_omap_startup(struct uart_port *port)
@@ -575,7 +580,8 @@ static void serial_omap_shutdown(struct uart_port *port)
if (serial_in(up, UART_LSR) & UART_LSR_DR)
(void) serial_in(up, UART_RX);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
free_irq(up->port.irq, up);
}
@@ -846,7 +852,8 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
serial_omap_configure_xonxoff(up, termios);
spin_unlock_irqrestore(&up->port.lock, flags);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->port.line);
}
@@ -877,7 +884,8 @@ serial_omap_pm(struct uart_port *port, unsigned int state,
pm_runtime_allow(up->dev);
}
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static void serial_omap_release_port(struct uart_port *port)
@@ -959,7 +967,8 @@ static void serial_omap_poll_put_char(struct uart_port *port, unsigned char ch)
pm_runtime_get_sync(up->dev);
wait_for_xmitr(up);
serial_out(up, UART_TX, ch);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static int serial_omap_poll_get_char(struct uart_port *port)
@@ -973,7 +982,8 @@ static int serial_omap_poll_get_char(struct uart_port *port)
return NO_POLL_CHAR;
status = serial_in(up, UART_RX);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
return status;
}
@@ -1305,7 +1315,8 @@ static int serial_omap_probe(struct platform_device *pdev)
if (ret != 0)
goto err_add_port;
- pm_runtime_put(&pdev->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
platform_set_drvdata(pdev, up);
return 0;
--
1.7.12.rc3
WARNING: multiple messages have this Message-ID (diff)
From: balbi@ti.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC/PATCH 10/13] serial: omap: stick to put_autosuspend
Date: Tue, 21 Aug 2012 12:15:52 +0300 [thread overview]
Message-ID: <1345540555-24359-11-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1345540555-24359-1-git-send-email-balbi@ti.com>
Everytime we're done using our TTY, we want
the pm timer to be reinitilized. By sticking
to pm_runtime_pm_autosuspend() we make sure
that this will always be the case.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/tty/serial/omap-serial.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 6ea24c5..458d77c 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -164,7 +164,8 @@ static void serial_omap_enable_ms(struct uart_port *port)
pm_runtime_get_sync(up->dev);
up->ier |= UART_IER_MSI;
serial_out(up, UART_IER, up->ier);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static void serial_omap_stop_tx(struct uart_port *port)
@@ -412,7 +413,8 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port)
spin_lock_irqsave(&up->port.lock, flags);
ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
spin_unlock_irqrestore(&up->port.lock, flags);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
return ret;
}
@@ -424,7 +426,8 @@ static unsigned int serial_omap_get_mctrl(struct uart_port *port)
pm_runtime_get_sync(up->dev);
status = check_modem_status(up);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->port.line);
@@ -460,7 +463,8 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
up->mcr = serial_in(up, UART_MCR);
up->mcr |= mcr;
serial_out(up, UART_MCR, up->mcr);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static void serial_omap_break_ctl(struct uart_port *port, int break_state)
@@ -477,7 +481,8 @@ static void serial_omap_break_ctl(struct uart_port *port, int break_state)
up->lcr &= ~UART_LCR_SBC;
serial_out(up, UART_LCR, up->lcr);
spin_unlock_irqrestore(&up->port.lock, flags);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static int serial_omap_startup(struct uart_port *port)
@@ -575,7 +580,8 @@ static void serial_omap_shutdown(struct uart_port *port)
if (serial_in(up, UART_LSR) & UART_LSR_DR)
(void) serial_in(up, UART_RX);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
free_irq(up->port.irq, up);
}
@@ -846,7 +852,8 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
serial_omap_configure_xonxoff(up, termios);
spin_unlock_irqrestore(&up->port.lock, flags);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->port.line);
}
@@ -877,7 +884,8 @@ serial_omap_pm(struct uart_port *port, unsigned int state,
pm_runtime_allow(up->dev);
}
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static void serial_omap_release_port(struct uart_port *port)
@@ -959,7 +967,8 @@ static void serial_omap_poll_put_char(struct uart_port *port, unsigned char ch)
pm_runtime_get_sync(up->dev);
wait_for_xmitr(up);
serial_out(up, UART_TX, ch);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
}
static int serial_omap_poll_get_char(struct uart_port *port)
@@ -973,7 +982,8 @@ static int serial_omap_poll_get_char(struct uart_port *port)
return NO_POLL_CHAR;
status = serial_in(up, UART_RX);
- pm_runtime_put(up->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
return status;
}
@@ -1305,7 +1315,8 @@ static int serial_omap_probe(struct platform_device *pdev)
if (ret != 0)
goto err_add_port;
- pm_runtime_put(&pdev->dev);
+ pm_runtime_mark_last_busy(up->dev);
+ pm_runtime_put_autosuspend(up->dev);
platform_set_drvdata(pdev, up);
return 0;
--
1.7.12.rc3
next prev parent reply other threads:[~2012-08-21 9:20 UTC|newest]
Thread overview: 129+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-21 9:15 [RFC/PATCH 00/13] OMAP UART patches Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 01/13] serial: omap: define and use to_uart_omap_port() Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 02/13] serial: omap: always return IRQ_HANDLED Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 11:50 ` Alan Cox
2012-08-21 11:50 ` Alan Cox
2012-08-21 11:50 ` Alan Cox
2012-08-21 11:54 ` Felipe Balbi
2012-08-21 11:54 ` Felipe Balbi
2012-08-21 11:54 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 03/13] serial: omap: define helpers for pdata function pointers Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 04/13] serial: omap: don't access the platform_device Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 05/13] serial: omap: drop DMA support Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:44 ` Shilimkar, Santosh
2012-08-21 9:44 ` Shilimkar, Santosh
2012-08-21 9:44 ` Shilimkar, Santosh
2012-08-21 10:20 ` Felipe Balbi
2012-08-21 10:20 ` Felipe Balbi
2012-08-21 10:20 ` Felipe Balbi
2012-08-21 10:35 ` Shilimkar, Santosh
2012-08-21 10:35 ` Shilimkar, Santosh
2012-08-21 10:35 ` Shilimkar, Santosh
2012-08-21 10:34 ` Felipe Balbi
2012-08-21 10:34 ` Felipe Balbi
2012-08-21 10:34 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 06/13] serial: add OMAP-specific defines Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 07/13] serial: omap: simplify IRQ handling Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 08/13] serial: omap: refactor receive_chars() into rdi/rlsi handlers Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 09/13] serial: omap: move THRE check to transmit_chars() Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi [this message]
2012-08-21 9:15 ` [RFC/PATCH 10/13] serial: omap: stick to put_autosuspend Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 10:42 ` Shilimkar, Santosh
2012-08-21 10:42 ` Shilimkar, Santosh
2012-08-21 10:42 ` Shilimkar, Santosh
2012-08-21 10:57 ` Felipe Balbi
2012-08-21 10:57 ` Felipe Balbi
2012-08-21 10:57 ` Felipe Balbi
2012-08-21 11:05 ` Shilimkar, Santosh
2012-08-21 11:05 ` Shilimkar, Santosh
2012-08-21 11:05 ` Shilimkar, Santosh
2012-08-21 11:02 ` Felipe Balbi
2012-08-21 11:02 ` Felipe Balbi
2012-08-21 11:02 ` Felipe Balbi
2012-08-21 11:09 ` Felipe Balbi
2012-08-21 11:09 ` Felipe Balbi
2012-08-21 11:09 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 11/13] serial: omap: set dev->drvdata before enabling pm_runtime Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 12/13] serial: omap: drop unnecessary check from remove Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 13/13] serial: omap: make sure to suspend device before remove Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 9:15 ` Felipe Balbi
2012-08-21 10:43 ` [RFC/PATCH 00/13] OMAP UART patches Shilimkar, Santosh
2012-08-21 10:43 ` Shilimkar, Santosh
2012-08-21 10:43 ` Shilimkar, Santosh
2012-08-21 12:15 ` [PATCH v2 00/13] OMAP Serial patches Felipe Balbi
2012-08-21 12:15 ` Felipe Balbi
2012-08-21 12:15 ` Felipe Balbi
2012-08-21 12:15 ` [PATCH v2 01/13] serial: omap: define and use to_uart_omap_port() Felipe Balbi
2012-08-21 12:15 ` Felipe Balbi
2012-08-21 12:15 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 02/13] serial: omap: define helpers for pdata function pointers Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 03/13] serial: omap: don't access the platform_device Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 04/13] serial: omap: drop DMA support Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 05/13] serial: add OMAP-specific defines Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 06/13] serial: omap: simplify IRQ handling Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 07/13] serial: omap: refactor receive_chars() into rdi/rlsi handlers Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 08/13] serial: omap: move THRE check to transmit_chars() Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 09/13] serial: omap: stick to put_autosuspend Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 10/13] serial: omap: set dev->drvdata before enabling pm_runtime Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 11/13] serial: omap: drop unnecessary check from remove Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 12/13] serial: omap: make sure to suspend device before remove Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 13/13] serial: omap: don't save IRQ flags on hardirq Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi
2012-08-21 13:01 ` [PATCH v2 00/13] OMAP Serial patches Felipe Balbi
2012-08-21 13:01 ` Felipe Balbi
2012-08-21 13:01 ` Felipe Balbi
2012-08-21 15:07 ` Felipe Balbi
2012-08-21 15:07 ` Felipe Balbi
2012-08-21 15:07 ` Felipe Balbi
2012-08-23 6:26 ` Felipe Balbi
2012-08-23 6:26 ` Felipe Balbi
2012-08-23 6:26 ` Felipe Balbi
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=1345540555-24359-11-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=alan@linux.intel.com \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=santosh.shilimkar@ti.com \
--cc=shubhrajyoti@ti.com \
--cc=tony@atomide.com \
/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 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.