* [PATCH] modify pl011 driver to let it work as wakeup source
@ 2015-09-17 8:31 Zhaoyang Huang
2015-09-17 10:31 ` Russell King - ARM Linux
2015-09-17 10:39 ` Sudeep Holla
0 siblings, 2 replies; 4+ messages in thread
From: Zhaoyang Huang @ 2015-09-17 8:31 UTC (permalink / raw)
To: linux-pm, linux, gregkh, jslaby, linux-serial, linux-kernel
Cc: amit.kucheria, sudeep.holla, daniel.lezcano
the commit use the latest dev_pm_set_wake_irq API instead
of the enable_irq_wake and IRQF_NO_SUSPEND to configure the
ttyAMA device to work as the wakeup source
Signed-off-by: Zhaoyang Huang <zhaoyang.huang@linaro.org>
---
drivers/tty/serial/amba-pl011.c | 47 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index fd27e98..1923b94 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -59,6 +59,11 @@
#include <linux/sizes.h>
#include <linux/io.h>
#include <linux/acpi.h>
+#include <linux/suspend.h>
+#include <linux/pm_wakeirq.h>
+#include <linux/irq.h>
+
+static struct device *uart_dev;
#define UART_NR 14
@@ -2353,11 +2358,29 @@ static int pl011_register_port(struct uart_amba_port *uap)
return ret;
}
+struct uart_match {
+ struct uart_port *port;
+ struct uart_driver *driver;
+};
+
+static int match_uart_port(struct device *dev, void *data)
+{
+ struct uart_match *match = data;
+
+ dev_t devt = MKDEV(match->driver->major, match->driver->minor) +
+ match->port->line;
+
+ pr_info("the match data of ttyAMA0 is %d %d\n",
+ (int)devt, (int)dev->devt);
+
+ return dev->devt == devt; /* Actually, only one tty per port */
+}
static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
{
struct uart_amba_port *uap;
struct vendor_data *vendor = id->data;
int portnr, ret;
+ struct uart_match match;
portnr = pl011_find_free_port();
if (portnr < 0)
@@ -2387,13 +2410,35 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
amba_set_drvdata(dev, uap);
- return pl011_register_port(uap);
+ ret = pl011_register_port(uap);
+
+ if (!of_find_property(dev->dev.of_node, "linux,wakeup", NULL)) {
+ uart_dev = NULL;
+ return ret;
+ }
+
+ match.port = &uap->port;
+ match.driver = &amba_reg;
+
+ uart_dev = device_find_child(&dev->dev, &match, match_uart_port);
+
+ if (uart_dev) {
+ device_init_wakeup(uart_dev, true);
+ dev_pm_set_wake_irq(uart_dev, uap->port.irq);
+ }
+
+ return ret;
}
static int pl011_remove(struct amba_device *dev)
{
struct uart_amba_port *uap = amba_get_drvdata(dev);
+ if (uart_dev) {
+ dev_pm_clear_wake_irq(uart_dev);
+ device_init_wakeup(uart_dev, false);
+ }
+
uart_remove_one_port(&amba_reg, &uap->port);
pl011_unregister_port(uap);
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] modify pl011 driver to let it work as wakeup source
2015-09-17 8:31 [PATCH] modify pl011 driver to let it work as wakeup source Zhaoyang Huang
@ 2015-09-17 10:31 ` Russell King - ARM Linux
2015-09-17 10:39 ` Sudeep Holla
1 sibling, 0 replies; 4+ messages in thread
From: Russell King - ARM Linux @ 2015-09-17 10:31 UTC (permalink / raw)
To: Zhaoyang Huang
Cc: linux-pm, gregkh, jslaby, linux-serial, linux-kernel,
amit.kucheria, sudeep.holla, daniel.lezcano
On Thu, Sep 17, 2015 at 04:31:56PM +0800, Zhaoyang Huang wrote:
> +struct uart_match {
> + struct uart_port *port;
> + struct uart_driver *driver;
> +};
> +
> +static int match_uart_port(struct device *dev, void *data)
> +{
> + struct uart_match *match = data;
> +
> + dev_t devt = MKDEV(match->driver->major, match->driver->minor) +
> + match->port->line;
> +
> + pr_info("the match data of ttyAMA0 is %d %d\n",
> + (int)devt, (int)dev->devt);
> +
> + return dev->devt == devt; /* Actually, only one tty per port */
> +}
...
> + ret = pl011_register_port(uap);
> +
> + if (!of_find_property(dev->dev.of_node, "linux,wakeup", NULL)) {
> + uart_dev = NULL;
> + return ret;
> + }
> +
> + match.port = &uap->port;
> + match.driver = &amba_reg;
> +
> + uart_dev = device_find_child(&dev->dev, &match, match_uart_port);
> +
> + if (uart_dev) {
> + device_init_wakeup(uart_dev, true);
> + dev_pm_set_wake_irq(uart_dev, uap->port.irq);
> + }
> +
> + return ret;
I can only describe this code as a hack. This looks like something
which should be handled by generic infrastructure at an appropriate
point (somewhere inside uart_add_one_port()), not by hacky code in
each driver.
--
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] modify pl011 driver to let it work as wakeup source
2015-09-17 8:31 [PATCH] modify pl011 driver to let it work as wakeup source Zhaoyang Huang
2015-09-17 10:31 ` Russell King - ARM Linux
@ 2015-09-17 10:39 ` Sudeep Holla
[not found] ` <CAN2waFt+OsiBP_TJ7cw0RAkaNgT5nWRPppe74mfr6A6oSuXdBA@mail.gmail.com>
1 sibling, 1 reply; 4+ messages in thread
From: Sudeep Holla @ 2015-09-17 10:39 UTC (permalink / raw)
To: Zhaoyang Huang, linux-pm, linux, gregkh, jslaby, linux-serial,
linux-kernel
Cc: Sudeep Holla, amit.kucheria, daniel.lezcano
On 17/09/15 09:31, Zhaoyang Huang wrote:
> the commit use the latest dev_pm_set_wake_irq API instead
> of the enable_irq_wake and IRQF_NO_SUSPEND to configure the
> ttyAMA device to work as the wakeup source
>
As I mentioned earlier[1], if this a based on Juno platform, then
it gets NACK. Please add this feature when it's needed on a real
platform on which hardware supports UART/PL011 as a wake source.
Do you have any such platform to test ? On Juno, it can't be used as
wakeup source.
Regards,
Sudeep
[1] https://www.marc.info/?l=linux-pm&m=144239396227080&w=2
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-17 11:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-17 8:31 [PATCH] modify pl011 driver to let it work as wakeup source Zhaoyang Huang
2015-09-17 10:31 ` Russell King - ARM Linux
2015-09-17 10:39 ` Sudeep Holla
[not found] ` <CAN2waFt+OsiBP_TJ7cw0RAkaNgT5nWRPppe74mfr6A6oSuXdBA@mail.gmail.com>
2015-09-17 11:29 ` Sudeep Holla
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).