Merge branch 'earlycon-dt' into for-next

7 files changed, 14 insertions, 173 deletions

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 3e5a2056a466..ea9ce92a4b52 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -33,18 +33,21 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 }
 
 #ifdef CONFIG_SMP
-extern struct of_cpu_method __cpu_method_of_table_begin[];
-extern struct of_cpu_method __cpu_method_of_table_end[];
+extern struct of_cpu_method __cpu_method_of_table[];
+
+static const struct of_cpu_method __cpu_method_of_table_sentinel
+        __used __section(__cpu_method_of_table_end);
+
 
 static int __init set_smp_ops_by_method(struct device_node *node)
 {
         const char *method;
-        struct of_cpu_method *m = __cpu_method_of_table_begin;
+        struct of_cpu_method *m = __cpu_method_of_table;
 
         if (of_property_read_string(node, "enable-method", &method))
                 return 0;
 
-        for (; m < __cpu_method_of_table_end; m++)
+        for (; m->method; m++)
                 if (!strcmp(m->method, method)) {
                         smp_set_ops(m->ops);
                         return 1;
diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c
index a4d5e425cd82..71c86a2f856d 100644
--- a/arch/arm/mach-imx/clk-imx35.c
+++ b/arch/arm/mach-imx/clk-imx35.c
@@ -289,14 +289,12 @@ int __init mx35_clocks_init(void)
         return 0;
 }
 
-static int __init mx35_clocks_init_dt(struct device_node *ccm_node)
+static void __init mx35_clocks_init_dt(struct device_node *ccm_node)
 {
         clk_data.clks = clk;
         clk_data.clk_num = ARRAY_SIZE(clk);
         of_clk_add_provider(ccm_node, of_clk_src_onecell_get, &clk_data);
 
         mx35_clocks_init();
-
-        return 0;
 }
 CLK_OF_DECLARE(imx35, "fsl,imx35-ccm", mx35_clocks_init_dt);
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index e759af5d7098..f5f63b715d91 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -112,6 +112,9 @@ config IOMMU_HELPER
 config KERNEL_MODE_NEON
         def_bool y
 
+config FIX_EARLYCON_MEM
+        def_bool y
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug
index d10ec334c93b..1c1b75629842 100644
--- a/arch/arm64/Kconfig.debug
+++ b/arch/arm64/Kconfig.debug
@@ -20,15 +20,6 @@ config STRICT_DEVMEM
 
           If in doubt, say Y.
 
-config EARLY_PRINTK
-        bool "Early printk support"
-        default y
-        help
-          Say Y here if you want to have an early console using the
-          earlyprintk=<name>[,<addr>][,<options>] kernel parameter. It
-          is assumed that the early console device has been initialised
-          by the boot loader prior to starting the Linux kernel.
-
 config PID_IN_CONTEXTIDR
         bool "Write the current PID to the CONTEXTIDR register"
         help
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 7d811d9522bc..7a6fce5167e9 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -18,7 +18,6 @@ arm64-obj-$(CONFIG_SMP)			+= smp.o smp_spin_table.o topology.o
 arm64-obj-$(CONFIG_PERF_EVENTS)         += perf_regs.o
 arm64-obj-$(CONFIG_HW_PERF_EVENTS)      += perf_event.o
 arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)  += hw_breakpoint.o
-arm64-obj-$(CONFIG_EARLY_PRINTK)        += early_printk.o
 arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND)   += sleep.o suspend.o
 arm64-obj-$(CONFIG_JUMP_LABEL)          += jump_label.o
 arm64-obj-$(CONFIG_KGDB)                += kgdb.o
diff --git a/arch/arm64/kernel/early_printk.c b/arch/arm64/kernel/early_printk.c
deleted file mode 100644
index 2dc36d00addf..000000000000
--- a/arch/arm64/kernel/early_printk.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Earlyprintk support.
- *
- * Copyright (C) 2012 ARM Ltd.
- * Author: Catalin Marinas <catalin.marinas@arm.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <linux/kernel.h>
-#include <linux/console.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/io.h>
-
-#include <linux/amba/serial.h>
-#include <linux/serial_reg.h>
-
-#include <asm/fixmap.h>
-
-static void __iomem *early_base;
-static void (*printch)(char ch);
-
-/*
- * PL011 single character TX.
- */
-static void pl011_printch(char ch)
-{
-        while (readl_relaxed(early_base + UART01x_FR) & UART01x_FR_TXFF)
-                ;
-        writeb_relaxed(ch, early_base + UART01x_DR);
-        while (readl_relaxed(early_base + UART01x_FR) & UART01x_FR_BUSY)
-                ;
-}
-
-/*
- * Semihosting-based debug console
- */
-static void smh_printch(char ch)
-{
-        asm volatile("mov  x1, %0\n"
-                     "mov  x0, #3\n"
-                     "hlt  0xf000\n"
-                     : : "r" (&ch) : "x0", "x1", "memory");
-}
-
-/*
- * 8250/16550 (8-bit aligned registers) single character TX.
- */
-static void uart8250_8bit_printch(char ch)
-{
-        while (!(readb_relaxed(early_base + UART_LSR) & UART_LSR_THRE))
-                ;
-        writeb_relaxed(ch, early_base + UART_TX);
-}
-
-/*
- * 8250/16550 (32-bit aligned registers) single character TX.
- */
-static void uart8250_32bit_printch(char ch)
-{
-        while (!(readl_relaxed(early_base + (UART_LSR << 2)) & UART_LSR_THRE))
-                ;
-        writel_relaxed(ch, early_base + (UART_TX << 2));
-}
-
-struct earlycon_match {
-        const char *name;
-        void (*printch)(char ch);
-};
-
-static const struct earlycon_match earlycon_match[] __initconst = {
-        { .name = "pl011", .printch = pl011_printch, },
-        { .name = "smh", .printch = smh_printch, },
-        { .name = "uart8250-8bit", .printch = uart8250_8bit_printch, },
-        { .name = "uart8250-32bit", .printch = uart8250_32bit_printch, },
-        {}
-};
-
-static void early_write(struct console *con, const char *s, unsigned n)
-{
-        while (n-- > 0) {
-                if (*s == '\n')
-                        printch('\r');
-                printch(*s);
-                s++;
-        }
-}
-
-static struct console early_console_dev = {
-        .name =         "earlycon",
-        .write =        early_write,
-        .flags =        CON_PRINTBUFFER | CON_BOOT,
-        .index =        -1,
-};
-
-/*
- * Parse earlyprintk=... parameter in the format:
- *
- *   <name>[,<addr>][,<options>]
- *
- * and register the early console. It is assumed that the UART has been
- * initialised by the bootloader already.
- */
-static int __init setup_early_printk(char *buf)
-{
-        const struct earlycon_match *match = earlycon_match;
-        phys_addr_t paddr = 0;
-
-        if (!buf) {
-                pr_warning("No earlyprintk arguments passed.\n");
-                return 0;
-        }
-
-        while (match->name) {
-                size_t len = strlen(match->name);
-                if (!strncmp(buf, match->name, len)) {
-                        buf += len;
-                        break;
-                }
-                match++;
-        }
-        if (!match->name) {
-                pr_warning("Unknown earlyprintk arguments: %s\n", buf);
-                return 0;
-        }
-
-        /* I/O address */
-        if (!strncmp(buf, ",0x", 3)) {
-                char *e;
-                paddr = simple_strtoul(buf + 1, &e, 16);
-                buf = e;
-        }
-        /* no options parsing yet */
-
-        if (paddr)
-                early_base = (void __iomem *)set_fixmap_offset_io(FIX_EARLYCON_MEM_BASE, paddr);
-
-        printch = match->printch;
-        early_console = &early_console_dev;
-        register_console(&early_console_dev);
-
-        return 0;
-}
-
-early_param("earlyprintk", setup_early_printk);
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 25d2c6f7325e..0fb6cfd50e75 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -261,6 +261,9 @@ config ARCH_HWEIGHT_CFLAGS
 config ARCH_SUPPORTS_UPROBES
         def_bool y
 
+config FIX_EARLYCON_MEM
+        def_bool y
+
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"