From: David Woodhouse <dwmw2@infradead.org>
To: Mark Rutland <mark.rutland@arm.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
Aaron Lu <aaron.lu@intel.com>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Bryan Wu <cooloney@gmail.com>,
"grant.likely@linaro.org" <grant.likely@linaro.org>,
Arnd Bergmann <arnd@arndb.de>,
Darren Hart <dvhart@linux.intel.com>
Subject: Re: [PATCH v4 00/13] Add ACPI _DSD and unified device properties support
Date: Wed, 14 Jan 2015 10:42:23 -0800 [thread overview]
Message-ID: <1421260943.14516.19.camel@infradead.org> (raw)
In-Reply-To: <20141015131551.GC20034@leverpostej>
[-- Attachment #1.1: Type: text/plain, Size: 1803 bytes --]
I'm looking again at updating of_serial to work with ACPI properties.
Specifically, I want to support a serial port with a non-standard baud
rate, something like this:
Device(COM1) {
Name(_HID, EisaId("PNP0501"))
Name(_CID, EisaId("PRP0001"))
Name(_DSD, Package() {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package () {"compatible", Package () {"ns16550a"}},
Package () {"clock-frequency", 2457600},
}
})
...
}
Firstly, the of_serial driver doesn't even get *invoked* unless I do
this:
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 0d08373..eb1201a 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2083,6 +2086,8 @@ static int acpi_add_single_object(struct acpi_device **child,
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Added %s [%s] parent %s\n",
dev_name(&device->dev), (char *) buffer.pointer,
device->parent ? dev_name(&device->parent->dev) : "(null)"));
+ if (device->data.of_compatible)
+ acpi_create_platform_device(device);
kfree(buffer.pointer);
*child = device;
return 0;
Now it doesn't work because it uses of_match_device() to look the device
up and find the corresponding *data* for that entry in its match table.
And without CONFIG_OF, I don't *have* of_match_device().
We've talked about the fact that the platform bus probe function doesn't
pass you the match ID. Is that something we could potentially fix now
that things are a little more unified?
Or do we expect drivers still to have to use something like
of_match_id() to do the lookup again for themselves... and in that case
should we make of_match_id() available or produce a new
device_match_id() that they are expected to switch to?
--
dwmw2
[-- Attachment #1.2: of-serial-dev-properties.patch --]
[-- Type: text/x-patch, Size: 7650 bytes --]
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index c79b43c..65cf850 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1114,14 +1114,14 @@ config SERIAL_NETX_CONSOLE
you can make it the console by answering Y to this option.
config SERIAL_OF_PLATFORM
- tristate "Serial port on Open Firmware platform bus"
- depends on OF
+ tristate "Serial port on firmware platform bus"
+ depends on OF || ACPI
depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL
help
- If you have a PowerPC based system that has serial ports
- on a platform specific bus, you should enable this option.
- Currently, only 8250 compatible ports are supported, but
- others can easily be added.
+ If you have a system which advertises its serial ports through
+ devicetree or ACPI, you should enable this option. Currently
+ only 8250 compatible and NWP ports and are supported, but others
+ can easily be added.
config SERIAL_OMAP
tristate "OMAP serial port support"
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index 64f1bab..54110e6 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -15,8 +15,7 @@
#include <linux/delay.h>
#include <linux/serial_core.h>
#include <linux/serial_reg.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
+#include <linux/property.h>
#include <linux/of_platform.h>
#include <linux/nwpserial.h>
#include <linux/clk.h>
@@ -54,22 +53,22 @@ static inline void tegra_serial_handle_break(struct uart_port *port)
/*
* Fill a struct uart_port for a given device node
*/
-static int of_platform_serial_setup(struct platform_device *ofdev,
+static int of_platform_serial_setup(struct platform_device *pdev,
int type, struct uart_port *port,
struct of_serial_info *info)
{
- struct resource resource;
- struct device_node *np = ofdev->dev.of_node;
u32 clk, spd, prop;
- int ret;
+ int iotype = -1;
+ u32 res_start;
+ int ret, i;
memset(port, 0, sizeof *port);
- if (of_property_read_u32(np, "clock-frequency", &clk)) {
+ if (device_property_read_u32(&pdev->dev, "clock-frequency", &clk)) {
/* Get clk rate through clk driver if present */
- info->clk = clk_get(&ofdev->dev, NULL);
+ info->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(info->clk)) {
- dev_warn(&ofdev->dev,
+ dev_warn(&pdev->dev,
"clk or clock-frequency not defined\n");
return PTR_ERR(info->clk);
}
@@ -78,57 +77,63 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
clk = clk_get_rate(info->clk);
}
/* If current-speed was set, then try not to change it. */
- if (of_property_read_u32(np, "current-speed", &spd) == 0)
+ if (device_property_read_u32(&pdev->dev, "current-speed", &spd) == 0)
port->custom_divisor = clk / (16 * spd);
- ret = of_address_to_resource(np, 0, &resource);
- if (ret) {
- dev_warn(&ofdev->dev, "invalid address\n");
+ /* Check for shifted address mapping */
+ if (device_property_read_u32(&pdev->dev, "reg-offset", &prop) != 0)
+ prop = 0;
+
+ for (i = 0; iotype == -1 && i < pdev->num_resources; i++) {
+ struct resource *resource = &pdev->resource[i];
+ if (resource_type(resource) == IORESOURCE_MEM) {
+ iotype = UPIO_MEM;
+ port->mapbase = res_start + prop;
+ } else if (resource_type(resource) == IORESOURCE_IO) {
+ iotype = UPIO_PORT;
+ port->iobase = res_start + prop;
+ }
+
+ res_start = resource->start;
+ }
+ if (iotype == -1) {
+ dev_warn(&pdev->dev, "invalid address\n");
goto out;
}
spin_lock_init(&port->lock);
- port->mapbase = resource.start;
-
- /* Check for shifted address mapping */
- if (of_property_read_u32(np, "reg-offset", &prop) == 0)
- port->mapbase += prop;
/* Check for registers offset within the devices address range */
- if (of_property_read_u32(np, "reg-shift", &prop) == 0)
+ if (device_property_read_u32(&pdev->dev, "reg-shift", &prop) == 0)
port->regshift = prop;
/* Check for fifo size */
- if (of_property_read_u32(np, "fifo-size", &prop) == 0)
+ if (device_property_read_u32(&pdev->dev, "fifo-size", &prop) == 0)
port->fifosize = prop;
- port->irq = irq_of_parse_and_map(np, 0);
- port->iotype = UPIO_MEM;
- if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
- switch (prop) {
- case 1:
- port->iotype = UPIO_MEM;
- break;
- case 4:
- port->iotype = UPIO_MEM32;
- break;
- default:
- dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",
+ port->irq = platform_get_irq(pdev, 0);
+
+ if (device_property_read_u32(&pdev->dev, "reg-io-width", &prop) == 0) {
+ if (prop == 4 && iotype == UPIO_MEM) {
+ iotype = UPIO_MEM32;
+ } else {
+ dev_warn(&pdev->dev, "unsupported reg-io-width (%d)\n",
prop);
ret = -EINVAL;
goto out;
}
}
+ port->iotype = iotype;
port->type = type;
port->uartclk = clk;
port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
| UPF_FIXED_PORT | UPF_FIXED_TYPE;
- if (of_find_property(np, "no-loopback-test", NULL))
+ if (device_property_present(&pdev->dev, "no-loopback-test"))
port->flags |= UPF_SKIP_TEST;
- port->dev = &ofdev->dev;
+ port->dev = &pdev->dev;
switch (type) {
case PORT_TEGRA:
@@ -151,19 +156,19 @@ out:
* Try to register a serial port
*/
static struct of_device_id of_platform_serial_table[];
-static int of_platform_serial_probe(struct platform_device *ofdev)
+static int of_platform_serial_probe(struct platform_device *pdev)
{
const struct of_device_id *match;
struct of_serial_info *info;
struct uart_port port;
int port_type;
int ret;
-
- match = of_match_device(of_platform_serial_table, &ofdev->dev);
+ printk("%s\n", __func__);
+ match = of_match_device(of_platform_serial_table, &pdev->dev);
if (!match)
return -EINVAL;
- if (of_find_property(ofdev->dev.of_node, "used-by-rtas", NULL))
+ if (device_property_present(&pdev->dev, "used-by-rtas"))
return -EBUSY;
info = kzalloc(sizeof(*info), GFP_KERNEL);
@@ -171,7 +176,7 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
return -ENOMEM;
port_type = (unsigned long)match->data;
- ret = of_platform_serial_setup(ofdev, port_type, &port, info);
+ ret = of_platform_serial_setup(pdev, port_type, &port, info);
if (ret)
goto out;
@@ -187,8 +192,7 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
if (port.fifosize)
port8250.capabilities = UART_CAP_FIFO;
- if (of_property_read_bool(ofdev->dev.of_node,
- "auto-flow-control"))
+ if (device_property_present(&pdev->dev, "auto-flow-control"))
port8250.capabilities |= UART_CAP_AFE;
ret = serial8250_register_8250_port(&port8250);
@@ -203,7 +207,7 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
default:
/* need to add code for these */
case PORT_UNKNOWN:
- dev_info(&ofdev->dev, "Unknown serial port found, ignored\n");
+ dev_info(&pdev->dev, "Unknown serial port found, ignored\n");
ret = -ENODEV;
break;
}
@@ -212,20 +216,19 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
info->type = port_type;
info->line = ret;
- platform_set_drvdata(ofdev, info);
+ platform_set_drvdata(pdev, info);
return 0;
out:
kfree(info);
- irq_dispose_mapping(port.irq);
return ret;
}
/*
* Release a line
*/
-static int of_platform_serial_remove(struct platform_device *ofdev)
+static int of_platform_serial_remove(struct platform_device *pdev)
{
- struct of_serial_info *info = platform_get_drvdata(ofdev);
+ struct of_serial_info *info = platform_get_drvdata(pdev);
switch (info->type) {
#ifdef CONFIG_SERIAL_8250
case PORT_8250 ... PORT_MAX_8250:
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 5745 bytes --]
next prev parent reply other threads:[~2015-01-14 18:42 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-07 0:10 [PATCH v4 00/13] Add ACPI _DSD and unified device properties support Rafael J. Wysocki
2014-10-07 0:12 ` [PATCH 01/13] ACPI: Add support for device specific properties Rafael J. Wysocki
2014-10-13 12:47 ` Grant Likely
2014-10-07 0:12 ` [PATCH 02/13] Driver core: Unified device properties interface for platform firmware Rafael J. Wysocki
2014-10-07 0:13 ` [PATCH 03/13] ACPI: Allow drivers to match using Device Tree compatible property Rafael J. Wysocki
2014-10-14 13:38 ` Grant Likely
2014-10-07 0:14 ` [PATCH 04/13] ACPI: Document ACPI device specific properties Rafael J. Wysocki
2014-10-13 12:41 ` Grant Likely
2014-10-14 9:42 ` Mika Westerberg
2014-10-07 0:14 ` [PATCH 05/13] misc: at25: Make use of device property API Rafael J. Wysocki
2014-10-07 9:10 ` Geert Uytterhoeven
2014-10-07 9:32 ` Mika Westerberg
2014-10-07 0:15 ` [PATCH 06/13] gpio / ACPI: Add support for _DSD device properties Rafael J. Wysocki
2014-10-14 13:44 ` Grant Likely
2014-10-15 8:46 ` Mika Westerberg
2014-10-07 0:15 ` [PATCH 07/13] gpio: sch: Consolidate core and resume banks Rafael J. Wysocki
2014-10-07 0:16 ` [PATCH 08/13] leds: leds-gpio: Add support for GPIO descriptors Rafael J. Wysocki
2014-10-07 0:16 ` [PATCH 09/12] input: gpio_keys_polled - " Rafael J. Wysocki
2014-10-07 17:29 ` Dmitry Torokhov
2014-10-07 0:17 ` [PATCH 10/13] Driver core: Child node properties for devices Rafael J. Wysocki
2014-10-07 0:18 ` [PATCH 11/13] gpio: Support for unified device properties interface Rafael J. Wysocki
2014-10-07 10:22 ` Alexandre Courbot
2014-10-07 10:40 ` Mika Westerberg
2014-10-07 10:52 ` Alexandre Courbot
2014-10-08 0:09 ` Rafael J. Wysocki
2014-10-08 2:55 ` Alexandre Courbot
2014-10-08 14:01 ` Rafael J. Wysocki
2014-10-07 0:18 ` [PATCH 12/13] leds: leds-gpio: Make use of device property API Rafael J. Wysocki
2014-10-08 14:04 ` Rafael J. Wysocki
2014-10-08 17:47 ` Bryan Wu
2014-10-08 22:02 ` Rafael J. Wysocki
2014-10-07 0:19 ` [PATCH 13/13] input: gpio_keys_polled - " Rafael J. Wysocki
2014-10-07 17:30 ` Dmitry Torokhov
2014-10-07 0:39 ` [PATCH v4 00/13] Add ACPI _DSD and unified device properties support Rafael J. Wysocki
2014-10-07 2:28 ` Greg Kroah-Hartman
2014-10-15 13:04 ` David Woodhouse
2014-10-15 13:15 ` Mark Rutland
2014-10-15 13:28 ` David Woodhouse
2014-10-15 13:42 ` Mark Rutland
2014-10-15 14:08 ` David Woodhouse
2014-10-15 14:46 ` Darren Hart
2014-10-15 15:11 ` David Woodhouse
2014-10-15 15:17 ` Mark Rutland
2014-10-15 15:43 ` Darren Hart
2014-10-16 10:05 ` Rafael J. Wysocki
2014-10-16 14:55 ` David Woodhouse
2014-10-18 8:37 ` Grant Likely
2014-10-18 8:39 ` Grant Likely
2014-10-18 8:35 ` Grant Likely
2014-10-21 21:50 ` [PATCH v4 00/13] Add ACPI _DSD and unified device properties? support Darren Hart
2015-01-14 18:42 ` David Woodhouse [this message]
2015-01-15 9:12 ` [PATCH v4 00/13] Add ACPI _DSD and unified device properties support Rafael J. Wysocki
2014-10-17 12:01 ` [PATCH v5 00/12] " Rafael J. Wysocki
2014-10-17 12:03 ` [PATCH v5 01/12] ACPI: Add support for device specific properties Rafael J. Wysocki
2014-10-17 12:04 ` [PATCH v5 02/12] Driver core: Unified device properties interface for platform firmware Rafael J. Wysocki
2014-10-20 0:07 ` [Update][PATCH " Rafael J. Wysocki
2014-10-17 12:05 ` [PATCH v5 03/12] ACPI: Allow drivers to match using Device Tree compatible property Rafael J. Wysocki
2014-10-20 14:05 ` Grant Likely
2014-10-20 22:19 ` Rafael J. Wysocki
2014-10-17 12:07 ` [PATCH v5 04/12] misc: at25: Make use of device property API Rafael J. Wysocki
2014-10-17 12:09 ` [PATCH v5 05/12] gpio / ACPI: Add support for _DSD device properties Rafael J. Wysocki
2014-10-17 12:10 ` [PATCH v5 06/12] gpio: sch: Consolidate core and resume banks Rafael J. Wysocki
2014-10-17 12:11 ` [PATCH v5 07/12] leds: leds-gpio: Add support for GPIO descriptors Rafael J. Wysocki
2014-10-28 15:26 ` Linus Walleij
2014-10-28 21:56 ` Rafael J. Wysocki
2014-10-29 8:53 ` Mika Westerberg
2014-10-30 15:40 ` Linus Walleij
2014-10-30 16:15 ` Mika Westerberg
2014-10-31 9:41 ` Linus Walleij
2014-10-31 9:55 ` Mika Westerberg
2014-10-30 15:34 ` Linus Walleij
2014-10-17 12:12 ` [PATCH v5 08/12] input: gpio_keys_polled - " Rafael J. Wysocki
2014-10-17 12:14 ` [PATCH v5 09/12] Driver core: Unified interface for firmware node properties Rafael J. Wysocki
2014-10-18 9:35 ` Arnd Bergmann
2014-10-19 23:30 ` Rafael J. Wysocki
2014-10-20 14:14 ` Arnd Bergmann
2014-10-18 14:55 ` Grant Likely
2014-10-19 23:46 ` Rafael J. Wysocki
2014-10-20 14:18 ` Grant Likely
2014-10-20 22:14 ` Rafael J. Wysocki
2014-10-20 14:19 ` Arnd Bergmann
2014-10-20 14:55 ` Grant Likely
2014-10-20 22:22 ` Rafael J. Wysocki
2014-10-19 22:14 ` Greg Kroah-Hartman
2014-10-19 23:31 ` Rafael J. Wysocki
2014-10-20 0:15 ` [Update][PATCH " Rafael J. Wysocki
2014-10-17 12:16 ` [PATCH v5 10/12] gpio: Support for unified device properties interface Rafael J. Wysocki
2014-10-17 18:09 ` Arnd Bergmann
2014-10-18 9:47 ` Arnd Bergmann
2014-10-19 23:58 ` Rafael J. Wysocki
2014-10-20 14:22 ` Arnd Bergmann
2014-10-20 6:12 ` Alexandre Courbot
2014-10-20 14:26 ` Arnd Bergmann
2014-10-17 12:17 ` [PATCH v5 11/12] leds: leds-gpio: Make use of device property API Rafael J. Wysocki
2014-10-17 12:18 ` [PATCH v5 12/12] input: gpio_keys_polled - " Rafael J. Wysocki
2014-10-17 12:22 ` [PATCH v5 00/12] Add ACPI _DSD and unified device properties support Rafael J. Wysocki
2014-10-17 15:40 ` Greg Kroah-Hartman
2014-10-17 19:23 ` Darren Hart
2014-10-17 21:49 ` Rafael J. Wysocki
2014-10-19 22:14 ` Greg Kroah-Hartman
2014-10-17 18:04 ` Arnd Bergmann
2014-10-17 22:50 ` Rafael J. Wysocki
2014-10-18 8:49 ` Grant Likely
2014-10-19 23:32 ` Rafael J. Wysocki
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=1421260943.14516.19.camel@infradead.org \
--to=dwmw2@infradead.org \
--cc=aaron.lu@intel.com \
--cc=arnd@arndb.de \
--cc=cooloney@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dvhart@linux.intel.com \
--cc=gnurou@gmail.com \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mika.westerberg@linux.intel.com \
--cc=rjw@rjwysocki.net \
/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).