From: Claire Chang <tientzu@chromium.org>
To: robh@kernel.org, gregkh@linuxfoundation.org, jslaby@suse.com,
long.cheng@mediatek.com, changqi.hu@mediatek.com
Cc: linux-serial@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-kernel@vger.kernel.org, Claire Chang <tientzu@chromium.org>
Subject: [PATCH 2/3] tty: serial_core: add wakeup_irq to support in-band wakeup
Date: Wed, 6 May 2020 15:23:13 +0800 [thread overview]
Message-ID: <20200506072314.112409-3-tientzu@chromium.org> (raw)
In-Reply-To: <20200506072314.112409-1-tientzu@chromium.org>
Since some uart controllers may be off in S3, we won't be able to use
the normal in-band wakeup.
Take 8250_mtk.c as an example. The driver needs to allocate an edge
sensitive interrupt as the wakeup_irq and use an addtional pinctrl to
reconfigure Rx pin to normal GPIO in sleep state. Once host detects Rx
falling, an interrupt is triggered, and the system leaves sleep state.
Add the wakeup_irq logic in core to simplify and make the code more
generic. Also, we can align with the original wakeup behavior and
power/wakeup node.
Signed-off-by: Claire Chang <tientzu@chromium.org>
---
drivers/tty/serial/8250/8250_core.c | 1 +
drivers/tty/serial/serial_core.c | 8 +++++---
include/linux/serial_core.h | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 45d9117cab680..06214e9fdc8ff 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -1001,6 +1001,7 @@ int serial8250_register_8250_port(struct uart_8250_port *up)
uart->port.membase = up->port.membase;
uart->port.irq = up->port.irq;
uart->port.irqflags = up->port.irqflags;
+ uart->port.wakeup_irq = up->port.wakeup_irq;
uart->port.uartclk = up->port.uartclk;
uart->port.fifosize = up->port.fifosize;
uart->port.regshift = up->port.regshift;
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 66a5e2faf57ea..1796a33986613 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2165,12 +2165,13 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
struct tty_port *port = &state->port;
struct device *tty_dev;
struct uart_match match = {uport, drv};
+ int irq = uport->wakeup_irq > 0 ? uport->wakeup_irq : uport->irq;
mutex_lock(&port->mutex);
tty_dev = device_find_child(uport->dev, &match, serial_match_port);
if (tty_dev && device_may_wakeup(tty_dev)) {
- enable_irq_wake(uport->irq);
+ enable_irq_wake(irq);
put_device(tty_dev);
mutex_unlock(&port->mutex);
return 0;
@@ -2228,13 +2229,14 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
struct device *tty_dev;
struct uart_match match = {uport, drv};
struct ktermios termios;
+ int irq = uport->wakeup_irq > 0 ? uport->wakeup_irq : uport->irq;
mutex_lock(&port->mutex);
tty_dev = device_find_child(uport->dev, &match, serial_match_port);
if (!uport->suspended && device_may_wakeup(tty_dev)) {
- if (irqd_is_wakeup_set(irq_get_irq_data((uport->irq))))
- disable_irq_wake(uport->irq);
+ if (irqd_is_wakeup_set(irq_get_irq_data((irq))))
+ disable_irq_wake(irq);
put_device(tty_dev);
mutex_unlock(&port->mutex);
return 0;
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 92f5eba860528..5764687b90a36 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -136,6 +136,7 @@ struct uart_port {
struct serial_iso7816 *iso7816);
unsigned int irq; /* irq number */
unsigned long irqflags; /* irq flags */
+ unsigned int wakeup_irq; /* wakeup irq number */
unsigned int uartclk; /* base uart clock */
unsigned int fifosize; /* tx fifo size */
unsigned char x_char; /* xon/xoff char */
--
2.26.2.526.g744177e7f7-goog
next prev parent reply other threads:[~2020-05-06 7:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 7:23 [PATCH 0/3] add wakeup_irq for in-band wakeup support Claire Chang
2020-05-06 7:23 ` [PATCH 1/3] serdev: ttyport: add devt for tty port Claire Chang
2020-05-15 12:46 ` Greg KH
2020-05-18 10:04 ` Claire Chang
2020-05-18 14:56 ` Johan Hovold
2020-05-06 7:23 ` Claire Chang [this message]
2020-05-06 7:23 ` [PATCH 3/3] uart: mediatek: move the in-band wakeup logic to core Claire Chang
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=20200506072314.112409-3-tientzu@chromium.org \
--to=tientzu@chromium.org \
--cc=changqi.hu@mediatek.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-serial@vger.kernel.org \
--cc=long.cheng@mediatek.com \
--cc=robh@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).