diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-12 18:47:29 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-12 18:47:29 +0100 |
commit | ca9ab01523939f072e58b76f7537cd40f596d311 (patch) | |
tree | b89ca756d6ec957b4d9d30601a4816eddff9d1b5 | |
parent | 4343041e6fd3b56fe3a86b9e37a2d174ef62bb1a (diff) | |
parent | 1a59ad58a8f6d3fb0f572ea0b2fdb8145b2db92c (diff) | |
download | kernel-ca9ab01523939f072e58b76f7537cd40f596d311.tar.gz kernel-ca9ab01523939f072e58b76f7537cd40f596d311.tar.xz kernel-ca9ab01523939f072e58b76f7537cd40f596d311.zip |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-1.vanilla.knurd.1.fc26kernel-4.9.0-1.vanilla.knurd.1.fc25kernel-4.9.0-1.vanilla.knurd.1.fc24kernel-4.9.0-1.vanilla.knurd.1.fc23
-rw-r--r-- | arm64-ACPI-parse-SPCR-table.patch | 101 | ||||
-rw-r--r-- | kernel.spec | 22 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 120 insertions, 9 deletions
diff --git a/arm64-ACPI-parse-SPCR-table.patch b/arm64-ACPI-parse-SPCR-table.patch new file mode 100644 index 000000000..ad85b0214 --- /dev/null +++ b/arm64-ACPI-parse-SPCR-table.patch @@ -0,0 +1,101 @@ +From 10879ae5f12e9cab3c4e8e9504c1aaa8a033bde7 Mon Sep 17 00:00:00 2001 +From: Aleksey Makarov <aleksey.makarov@linaro.org> +Date: Tue, 4 Oct 2016 10:15:32 +0300 +Subject: serial: pl011: add console matching function + +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@linaro.org> +Reviewed-by: Peter Hurley <peter@hurleysoftware.com> +Acked-by: Russell King <rmk+kernel@armlinux.org.uk> +Tested-by: Christopher Covington <cov@codeaurora.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@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 e2c33b9..c00ab22 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, +-- +cgit v0.12 + diff --git a/kernel.spec b/kernel.spec index c2a9a202b..7ef3f8a37 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 0 +%global released_kernel 1 # Sign modules on x86. Make sure the config files match this setting if more # architectures are added. @@ -50,7 +50,7 @@ Summary: The Linux kernel # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%define base_sublevel 8 +%define base_sublevel 9 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 8 +%global rcrev 0 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -509,6 +509,9 @@ Source5005: kbuild-AFTER_LINK.patch # Standalone patches +# http://www.spinics.net/lists/linux-serial/msg24272.html +Patch420: arm64-ACPI-parse-SPCR-table.patch + # a tempory patch for QCOM hardware enablement. Will be gone by end of 2016/F-26 GA Patch421: qcom-QDF2432-tmp-errata.patch @@ -2194,6 +2197,15 @@ fi # # %changelog +* Mon Dec 12 2016 Laura Abbott <labbott@fedoraproject.org> - 4.9.0-1 +- Linux v4.9 + +* Mon Dec 12 2016 Laura Abbott <labbott@fedoraproject.org> +- Disable debugging options. + +* Sat Dec 10 2016 Christopher Covington <cov@codeaurora.org> +- Re-add ACPI SPCR (serial console) support + * Fri Dec 09 2016 Laura Abbott <labbott@fedoraproject.org> - 4.9.0-0.rc8.git4.1 - Linux v4.9-rc8-85-ga37102d @@ -1,4 +1,2 @@ -c1af0afbd3df35c1ccdc7a5118cd2d07 linux-4.8.tar.xz -0dad03f586e835d538d3e0d2cbdb9a28 perf-man-4.8.tar.gz -0325bf5c99db7ad4317707afe23aa954 patch-4.9-rc8.xz -5c363399b73b1dc0e51abb78ae7302b2 patch-4.9-rc8-git4.xz +SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a +SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99 |