| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20120409182203.317.81835.stgit@dwillia2-linux.jf.intel.com>
Date: Mon, 09 Apr 2012 11:22:03 -0700
From: Dan Williams <dan.j.williams@...el.com>
To: gregkh@...uxfoundation.org
Cc: Stephen Warren <swarren@...dia.com>, Arnd Bergmann <arnd@...db.de>,
linux-kernel@...r.kernel.org,
Grant Likely <grant.likely@...retlab.ca>,
linux-serial@...r.kernel.org, Colin Cross <ccross@...roid.com>,
Olof Johansson <olof@...om.net>, alan@...ux.intel.com
Subject: [PATCH v2 1/4] of_serial: add support for setup quirks
Benign conversion of of_serial.c to offer the option of 'setup' quirks
similar to how 8250_pci.c houses the pci-serial-device quirks.
A setup quirk allows custom uart_port ops to specified in the
of_serial_info data fed to each serial of_device_id.
Tegra's 'break' quirk is the target consumer.
Cc: Colin Cross <ccross@...roid.com>
Cc: Olof Johansson <olof@...om.net>
Cc: Stephen Warren <swarren@...dia.com>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Grant Likely <grant.likely@...retlab.ca>
Signed-off-by: Dan Williams <dan.j.williams@...el.com>
---
drivers/tty/serial/of_serial.c | 68 ++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index e8c9cee..4621cf9 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -22,13 +22,15 @@
struct of_serial_info {
int type;
int line;
+ void (*setup)(struct uart_port *);
};
/*
* Fill a struct uart_port for a given device node
*/
static int __devinit of_platform_serial_setup(struct platform_device *ofdev,
- int type, struct uart_port *port)
+ struct of_serial_info *info,
+ struct uart_port *port)
{
struct resource resource;
struct device_node *np = ofdev->dev.of_node;
@@ -78,12 +80,15 @@ static int __devinit of_platform_serial_setup(struct platform_device *ofdev,
}
}
- port->type = type;
+ port->type = info->type;
port->uartclk = clk;
port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
| UPF_FIXED_PORT | UPF_FIXED_TYPE;
port->dev = &ofdev->dev;
+ if (info->setup)
+ info->setup(port);
+
return 0;
}
@@ -96,7 +101,6 @@ static int __devinit of_platform_serial_probe(struct platform_device *ofdev)
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);
@@ -106,16 +110,12 @@ static int __devinit of_platform_serial_probe(struct platform_device *ofdev)
if (of_find_property(ofdev->dev.of_node, "used-by-rtas", NULL))
return -EBUSY;
- info = kmalloc(sizeof(*info), GFP_KERNEL);
- if (info == NULL)
- return -ENOMEM;
-
- port_type = (unsigned long)match->data;
- ret = of_platform_serial_setup(ofdev, port_type, &port);
+ info = match->data;
+ ret = of_platform_serial_setup(ofdev, info, &port);
if (ret)
goto out;
- switch (port_type) {
+ switch (info->type) {
#ifdef CONFIG_SERIAL_8250
case PORT_8250 ... PORT_MAX_8250:
ret = serial8250_register_port(&port);
@@ -136,12 +136,10 @@ static int __devinit of_platform_serial_probe(struct platform_device *ofdev)
if (ret < 0)
goto out;
- info->type = port_type;
info->line = ret;
dev_set_drvdata(&ofdev->dev, info);
return 0;
out:
- kfree(info);
irq_dispose_mapping(port.irq);
return ret;
}
@@ -167,24 +165,52 @@ static int of_platform_serial_remove(struct platform_device *ofdev)
/* need to add code for these */
break;
}
- kfree(info);
return 0;
}
/*
+ * contiguous OF_ number space for serial port types so the
+ * __sinfo array does not have holes, and to allow cases of:
+ * .type = 'common type', .setup = 'device specific quirk'
+ */
+enum {
+ OF_PORT_8250,
+ OF_PORT_16450,
+ OF_PORT_16550A,
+ OF_PORT_16550,
+ OF_PORT_16750,
+ OF_PORT_16850,
+ OF_PORT_TEGRA,
+ OF_PORT_NWPSERIAL,
+ OF_PORT_UNKNOWN,
+};
+
+static struct of_serial_info __refdata __sinfo[] = {
+ [OF_PORT_8250] = { .type = PORT_8250, },
+ [OF_PORT_16450] = { .type = PORT_16450, },
+ [OF_PORT_16550A] = { .type = PORT_16550A, },
+ [OF_PORT_16550] = { .type = PORT_16550, },
+ [OF_PORT_16750] = { .type = PORT_16750, },
+ [OF_PORT_16850] = { .type = PORT_16850, },
+ [OF_PORT_TEGRA] = { .type = PORT_TEGRA, },
+ [OF_PORT_NWPSERIAL] = { .type = PORT_NWPSERIAL, },
+ [OF_PORT_UNKNOWN] = { .type = PORT_UNKNOWN, },
+};
+
+/*
* A few common types, add more as needed.
*/
static struct of_device_id __devinitdata of_platform_serial_table[] = {
- { .compatible = "ns8250", .data = (void *)PORT_8250, },
- { .compatible = "ns16450", .data = (void *)PORT_16450, },
- { .compatible = "ns16550a", .data = (void *)PORT_16550A, },
- { .compatible = "ns16550", .data = (void *)PORT_16550, },
- { .compatible = "ns16750", .data = (void *)PORT_16750, },
- { .compatible = "ns16850", .data = (void *)PORT_16850, },
- { .compatible = "nvidia,tegra20-uart", .data = (void *)PORT_TEGRA, },
+ { .compatible = "ns8250", .data = &__sinfo[OF_PORT_8250], },
+ { .compatible = "ns16450", .data = &__sinfo[OF_PORT_16450], },
+ { .compatible = "ns16550a", .data = &__sinfo[OF_PORT_16550A], },
+ { .compatible = "ns16550", .data = &__sinfo[OF_PORT_16550], },
+ { .compatible = "ns16750", .data = &__sinfo[OF_PORT_16750], },
+ { .compatible = "ns16850", .data = &__sinfo[OF_PORT_16850], },
+ { .compatible = "nvidia,tegra20-uart", .data = &__sinfo[OF_PORT_TEGRA], },
#ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL
{ .compatible = "ibm,qpace-nwp-serial",
- .data = (void *)PORT_NWPSERIAL, },
+ .data = &__sinfo[OF_PORT_NWPSERIAL], },
#endif
{ .type = "serial", .data = (void *)PORT_UNKNOWN, },
{ /* end of list */ },
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists