From: Esben Haabendal <esben@geanix.com>
To: linux-serial@vger.kernel.org
Cc: Enrico Weigelt <lkml@metux.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Darwin Dingel <darwin.dingel@alliedtelesis.co.nz>,
Jisheng Zhang <Jisheng.Zhang@synaptics.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
He Zhe <zhe.he@windriver.com>, Marek Vasut <marex@denx.de>,
Douglas Anderson <dianders@chromium.org>,
Paul Burton <paul.burton@mips.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] serial: 8250: Add support for using platform_device resources
Date: Tue, 30 Apr 2019 16:04:13 +0200 [thread overview]
Message-ID: <20190430140416.4707-1-esben@geanix.com> (raw)
Allow getting memory resource (mapbase or iobase) as well as irq from
platform_device resources.
The UPF_DEV_RESOURCES flag must be set for devices where platform_device
resources are to be used. When not set, driver behaves as before.
This allows use of the serial8250 driver together with devices with
resources added by platform_device_add_resources(), such as mfd child
devices added with mfd_add_devices().
Remaining platform_data fields (other than mapbase, iobase, mapsize and
irq) are used just as before. Note
Signed-off-by: Esben Haabendal <esben@geanix.com>
---
drivers/tty/serial/8250/8250_core.c | 56 +++++++++++++++++++++++++++++++++----
drivers/tty/serial/8250/8250_port.c | 15 ++++++----
include/linux/serial_core.h | 1 +
3 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index e441221..9df6a98 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -788,6 +788,48 @@ void serial8250_resume_port(int line)
}
EXPORT_SYMBOL(serial8250_resume_port);
+static int serial8250_probe_resources(struct platform_device *pdev,
+ unsigned int num,
+ struct plat_serial8250_port *p,
+ struct uart_8250_port *uart)
+{
+ struct resource *r;
+ int irq;
+
+ switch (p->iotype) {
+ case UPIO_AU:
+ case UPIO_TSI:
+ case UPIO_MEM32:
+ case UPIO_MEM32BE:
+ case UPIO_MEM16:
+ case UPIO_MEM:
+ r = platform_get_resource(pdev, IORESOURCE_MEM, num);
+ if (!r)
+ return -ENODEV;
+ uart->port.mapbase = r->start;
+ uart->port.mapsize = resource_size(r);
+ uart->port.flags |= UPF_IOREMAP;
+ break;
+ case UPIO_HUB6:
+ case UPIO_PORT:
+ r = platform_get_resource(pdev, IORESOURCE_IO, num);
+ if (!r)
+ return -ENODEV;
+ uart->port.iobase = r->start;
+ uart->port.mapsize = resource_size(r);
+ break;
+ }
+
+ irq = platform_get_irq(pdev, num);
+ if (irq == -ENXIO)
+ uart->port.irq = 0; /* no interrupt -> use polling */
+ else if (irq < 0)
+ return irq;
+ uart->port.irq = irq;
+
+ return 0;
+}
+
/*
* Register a set of serial devices attached to a platform device. The
* list is terminated with a zero flags entry, which means we expect
@@ -805,15 +847,19 @@ static int serial8250_probe(struct platform_device *dev)
irqflag = IRQF_SHARED;
for (i = 0; p && p->flags != 0; p++, i++) {
- uart.port.iobase = p->iobase;
- uart.port.membase = p->membase;
- uart.port.irq = p->irq;
+ uart.port.flags = p->flags;
+ if (p->flags & UPF_DEV_RESOURCES) {
+ serial8250_probe_resources(dev, i, p, &uart);
+ } else {
+ uart.port.iobase = p->iobase;
+ uart.port.mapbase = p->mapbase;
+ uart.port.membase = p->membase;
+ uart.port.irq = p->irq;
+ }
uart.port.irqflags = p->irqflags;
uart.port.uartclk = p->uartclk;
uart.port.regshift = p->regshift;
uart.port.iotype = p->iotype;
- uart.port.flags = p->flags;
- uart.port.mapbase = p->mapbase;
uart.port.hub6 = p->hub6;
uart.port.private_data = p->private_data;
uart.port.type = p->type;
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index d2f3310..7fa1e49 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -2863,7 +2863,8 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
if (!port->mapbase)
break;
- if (!request_mem_region(port->mapbase, size, "serial")) {
+ if (!(port->flags & UPF_DEV_RESOURCES) &&
+ !request_mem_region(port->mapbase, size, "serial")) {
ret = -EBUSY;
break;
}
@@ -2871,7 +2872,8 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
if (port->flags & UPF_IOREMAP) {
port->membase = ioremap_nocache(port->mapbase, size);
if (!port->membase) {
- release_mem_region(port->mapbase, size);
+ if (!(port->flags & UPF_DEV_RESOURCES))
+ release_mem_region(port->mapbase, size);
ret = -ENOMEM;
}
}
@@ -2879,7 +2881,8 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
case UPIO_HUB6:
case UPIO_PORT:
- if (!request_region(port->iobase, size, "serial"))
+ if (!(port->flags & UPF_DEV_RESOURCES) &&
+ !request_region(port->iobase, size, "serial"))
ret = -EBUSY;
break;
}
@@ -2906,12 +2909,14 @@ static void serial8250_release_std_resource(struct uart_8250_port *up)
port->membase = NULL;
}
- release_mem_region(port->mapbase, size);
+ if (!(port->flags & UPF_DEV_RESOURCES))
+ release_mem_region(port->mapbase, size);
break;
case UPIO_HUB6:
case UPIO_PORT:
- release_region(port->iobase, size);
+ if (!(port->flags & UPF_DEV_RESOURCES))
+ release_region(port->iobase, size);
break;
}
}
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 5fe2b03..87b4ed3 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -207,6 +207,7 @@ struct uart_port {
#define UPF_BUGGY_UART ((__force upf_t) ASYNC_BUGGY_UART /* 14 */ )
#define UPF_MAGIC_MULTIPLIER ((__force upf_t) ASYNC_MAGIC_MULTIPLIER /* 16 */ )
+#define UPF_DEV_RESOURCES ((__force upf_t) (1 << 18))
#define UPF_NO_THRE_TEST ((__force upf_t) (1 << 19))
/* Port has hardware-assisted h/w flow control */
#define UPF_AUTO_CTS ((__force upf_t) (1 << 20))
--
2.4.11
next reply other threads:[~2019-04-30 14:04 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 14:04 Esben Haabendal [this message]
2019-04-30 15:37 ` [PATCH] serial: 8250: Add support for using platform_device resources Andy Shevchenko
2019-05-01 7:17 ` Esben Haabendal
2019-05-02 10:45 ` Andy Shevchenko
2019-05-02 12:41 ` Esben Haabendal
2019-05-02 15:31 ` Andy Shevchenko
2019-05-06 15:46 ` Esben Haabendal
2019-05-06 16:44 ` Andy Shevchenko
2019-05-06 17:40 ` Esben Haabendal
2019-05-06 21:04 ` Andy Shevchenko
2019-05-07 9:32 ` Lee Jones
2019-05-07 9:36 ` Lee Jones
2019-05-07 11:32 ` Esben Haabendal
2019-05-07 11:35 ` Esben Haabendal
2019-05-07 11:53 ` Andy Shevchenko
2019-05-07 12:22 ` Esben Haabendal
2019-05-07 15:08 ` Andy Shevchenko
2019-05-14 7:22 ` Esben Haabendal
2019-05-14 9:23 ` Andy Shevchenko
2019-05-14 9:37 ` Andy Shevchenko
2019-05-14 12:02 ` Esben Haabendal
2019-05-14 12:42 ` Andy Shevchenko
2019-05-14 12:02 ` Esben Haabendal
2019-05-14 12:38 ` Andy Shevchenko
2019-05-14 7:37 ` Esben Haabendal
2019-05-02 19:41 ` Enrico Weigelt, metux IT consult
2019-05-06 15:19 ` Esben Haabendal
2019-05-21 11:34 ` [PATCH resend] " Esben Haabendal
2019-05-21 12:42 ` Andy Shevchenko
2019-05-21 14:43 ` Esben Haabendal
2019-05-21 17:03 ` Andy Shevchenko
2019-05-21 13:11 ` Greg Kroah-Hartman
2019-05-21 14:45 ` Esben Haabendal
2019-05-21 14:53 ` Greg Kroah-Hartman
2019-06-11 18:11 ` Enrico Weigelt, metux IT consult
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=20190430140416.4707-1-esben@geanix.com \
--to=esben@geanix.com \
--cc=Jisheng.Zhang@synaptics.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bigeasy@linutronix.de \
--cc=darwin.dingel@alliedtelesis.co.nz \
--cc=dianders@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=lkml@metux.net \
--cc=marex@denx.de \
--cc=paul.burton@mips.com \
--cc=zhe.he@windriver.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 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).