[linux] 09/11: [arm64] serial: pl011: add console matching function (Closes: #861898)
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Jun 4 02:04:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux.
commit 4078eac467c14132cdc139dec2d1b3c6cbe3b3b0
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Jun 4 02:40:54 2017 +0100
[arm64] serial: pl011: add console matching function (Closes: #861898)
---
debian/changelog | 1 +
...erial-pl011-add-console-matching-function.patch | 99 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 101 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index c0d74dc..501b942 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -417,6 +417,7 @@ linux (4.9.30-1) UNRELEASED; urgency=medium
* btrfs: warn about RAID5/6 being experimental at mount time (Closes: #863290)
* [x86] pinctrl: cherryview: Add a quirk to make Acer Chromebook keyboard
work again (Closes: #862723)
+ * [arm64] serial: pl011: add console matching function (Closes: #861898)
[ Salvatore Bonaccorso ]
* tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline()
diff --git a/debian/patches/features/arm64/serial-pl011-add-console-matching-function.patch b/debian/patches/features/arm64/serial-pl011-add-console-matching-function.patch
new file mode 100644
index 0000000..712800a
--- /dev/null
+++ b/debian/patches/features/arm64/serial-pl011-add-console-matching-function.patch
@@ -0,0 +1,99 @@
+From: Aleksey Makarov <aleksey.makarov at linaro.org>
+Date: Tue, 4 Oct 2016 10:15:32 +0300
+Subject: serial: pl011: add console matching function
+Origin: https://git.kernel.org/linus/10879ae5f12e9cab3c4e8e9504c1aaa8a033bde7
+Bug-Debian: https://bugs.debian.org/861898
+
+This patch adds function pl011_console_match() that implements
+method match of struct console. It allows to match consoles against
+data specified in a string, for example taken from command line or
+compiled by ACPI SPCR table handler.
+
+This patch was merged to tty-next but then reverted because of
+conflict with
+
+commit 46e36683f433 ("serial: earlycon: Extend earlycon command line option to support 64-bit addresses")
+
+Now it is fixed.
+
+Signed-off-by: Aleksey Makarov <aleksey.makarov at linaro.org>
+Reviewed-by: Peter Hurley <peter at hurleysoftware.com>
+Acked-by: Russell King <rmk+kernel at armlinux.org.uk>
+Tested-by: Christopher Covington <cov at codeaurora.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+---
+ drivers/tty/serial/amba-pl011.c | 55 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 55 insertions(+)
+
+diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
+index e2c33b9528d8..c00ab22afe9e 100644
+--- a/drivers/tty/serial/amba-pl011.c
++++ b/drivers/tty/serial/amba-pl011.c
+@@ -2315,12 +2315,67 @@ static int __init pl011_console_setup(struct console *co, char *options)
+ return uart_set_options(&uap->port, co, baud, parity, bits, flow);
+ }
+
++/**
++ * pl011_console_match - non-standard console matching
++ * @co: registering console
++ * @name: name from console command line
++ * @idx: index from console command line
++ * @options: ptr to option string from console command line
++ *
++ * Only attempts to match console command lines of the form:
++ * console=pl011,mmio|mmio32,<addr>[,<options>]
++ * console=pl011,0x<addr>[,<options>]
++ * This form is used to register an initial earlycon boot console and
++ * replace it with the amba_console at pl011 driver init.
++ *
++ * Performs console setup for a match (as required by interface)
++ * If no <options> are specified, then assume the h/w is already setup.
++ *
++ * Returns 0 if console matches; otherwise non-zero to use default matching
++ */
++static int __init pl011_console_match(struct console *co, char *name, int idx,
++ char *options)
++{
++ unsigned char iotype;
++ resource_size_t addr;
++ int i;
++
++ if (strcmp(name, "pl011") != 0)
++ return -ENODEV;
++
++ if (uart_parse_earlycon(options, &iotype, &addr, &options))
++ return -ENODEV;
++
++ if (iotype != UPIO_MEM && iotype != UPIO_MEM32)
++ return -ENODEV;
++
++ /* try to match the port specified on the command line */
++ for (i = 0; i < ARRAY_SIZE(amba_ports); i++) {
++ struct uart_port *port;
++
++ if (!amba_ports[i])
++ continue;
++
++ port = &amba_ports[i]->port;
++
++ if (port->mapbase != addr)
++ continue;
++
++ co->index = i;
++ port->cons = co;
++ return pl011_console_setup(co, options);
++ }
++
++ return -ENODEV;
++}
++
+ static struct uart_driver amba_reg;
+ static struct console amba_console = {
+ .name = "ttyAMA",
+ .write = pl011_console_write,
+ .device = uart_console_device,
+ .setup = pl011_console_setup,
++ .match = pl011_console_match,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
+ .data = &amba_reg,
diff --git a/debian/patches/series b/debian/patches/series
index 34648b8..227998e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -69,6 +69,7 @@ features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch
features/arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch
# Miscellaneous bug fixes
+features/arm64/serial-pl011-add-console-matching-function.patch
bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
bugfix/all/disable-some-marvell-phys.patch
bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list