From patchwork Tue Sep 27 20:54:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 9352933 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 898836077A for ; Tue, 27 Sep 2016 21:01:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78BED28EDF for ; Tue, 27 Sep 2016 21:01:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6BBDF291DA; Tue, 27 Sep 2016 21:01:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5E80828EDF for ; Tue, 27 Sep 2016 21:01:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bozTx-00070q-Ib; Tue, 27 Sep 2016 21:00:05 +0000 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bozTr-0006uS-6s for linux-arm-kernel@lists.infradead.org; Tue, 27 Sep 2016 21:00:01 +0000 Received: by mail-lf0-x22e.google.com with SMTP id b71so35386887lfg.0 for ; Tue, 27 Sep 2016 13:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NPRGT3idilr/EhGLU0KL0iy5ogZrleqWTfPj/Gl1xWc=; b=Vi6mxMl2BBOXWogVO/O2z+8CBrGGwu/SY4JzazLCwwfMVw45q+eEvm+CmgbO4xSjLO hp+Bn6oxF++uuIAFeDmiDpqz4Dg/l9N68Bo4ROa2pEFOLYGjvf/Etd+7Sqh5hCNm6tZS jkeDBy431dI+lmNHLswhLOBdRSeU3n50Ys3vQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NPRGT3idilr/EhGLU0KL0iy5ogZrleqWTfPj/Gl1xWc=; b=djIHo1favzohnotyg7rpT7V4MNGuwKZajkn9BDYdn9alKe7fYWyD/bipCuVTxIysuq 4XidQJHEbgN5TZyQNACD0DKgnvw8R8H0V8FreODowe70ShhNI+gFq7SVBRtJ86oXkGRP fv/go3Ru2s1mkMWtbvyOWA71vATcqrKP/ZJpZZM+WJOPI9+4bqXE9su+bikd3UhhxIjJ unKnr7sL0kOUQaHAM5uiB+j1lMKxGvGqsdtr419bARhDDm+9+W2/pgiRzAj73P99as5p n71cDVZRnpqMGohKkK0ft5rsA550W9EidRxHrcnaZTVlPgc42Z1veDnQyO0JGbL2Vycb p6hA== X-Gm-Message-State: AA6/9Rkv/TquzsmObkFdMwGTn0g5BNxJuDHhKzYt9M3VodlLo3lhjfQH+ot2pjV1nD+K0JVW X-Received: by 10.25.15.229 with SMTP id 98mr865810lfp.24.1475009976582; Tue, 27 Sep 2016 13:59:36 -0700 (PDT) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id b4sm693212lfg.41.2016.09.27.13.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Sep 2016 13:59:35 -0700 (PDT) From: Aleksey Makarov To: Greg Kroah-Hartman Subject: [PATCH v11 1/4] of/serial: move earlycon early_param handling to serial Date: Tue, 27 Sep 2016 23:54:12 +0300 Message-Id: <20160927205418.31529-1-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20160927151953.GB4371@kroah.com> References: <20160927151953.GB4371@kroah.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160927_135959_485314_A8D5BD2F X-CRM114-Status: GOOD ( 16.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kefeng Wang , Yury Norov , "Zheng, Lv" , Frank Rowand , Russell King , linux-acpi@vger.kernel.org, Andy Shevchenko , linux-serial@vger.kernel.org, Mark Salter , Len Brown , devicetree@vger.kernel.org, Jiri Slaby , Leif Lindholm , Aleksey Makarov , Rob Herring , Christopher Covington , Al Stone , linux-arm-kernel@lists.infradead.org, Peter Hurley , Graeme Gregory , "Rafael J . Wysocki" , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Leif Lindholm We have multiple "earlycon" early_param handlers - merge the DT one into the main earlycon one. It's a cleanup that also will be useful to defer setting up DT console until ACPI/DT decision is made. Rename the exported function to avoid clashing with the function from arch/microblaze/kernel/prom.c Signed-off-by: Leif Lindholm Signed-off-by: Aleksey Makarov Acked-by: Rob Herring Acked-by: Greg Kroah-Hartman Reviewed-by: Peter Hurley Tested-by: Kefeng Wang Tested-by: Christopher Covington --- drivers/of/fdt.c | 11 +---------- drivers/tty/serial/earlycon.c | 2 +- include/linux/of_fdt.h | 3 +++ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 085c638..c89d5d2 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -924,7 +924,7 @@ static inline void early_init_dt_check_for_initrd(unsigned long node) #ifdef CONFIG_SERIAL_EARLYCON -static int __init early_init_dt_scan_chosen_serial(void) +int __init early_init_dt_scan_chosen_stdout(void) { int offset; const char *p, *q, *options = NULL; @@ -968,15 +968,6 @@ static int __init early_init_dt_scan_chosen_serial(void) } return -ENODEV; } - -static int __init setup_of_earlycon(char *buf) -{ - if (buf) - return 0; - - return early_init_dt_scan_chosen_serial(); -} -early_param("earlycon", setup_of_earlycon); #endif /** diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 067783f..7aae655 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -209,7 +209,7 @@ static int __init param_setup_earlycon(char *buf) * don't generate a warning from parse_early_params() in that case */ if (!buf || !buf[0]) - return 0; + return early_init_dt_scan_chosen_stdout(); err = setup_earlycon(buf); if (err == -ENOENT || err == -EALREADY) diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 26c3302..4341f32 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -14,6 +14,7 @@ #include #include +#include /* Definitions used by the flattened device tree */ #define OF_DT_HEADER 0xd00dfeed /* marker */ @@ -66,6 +67,7 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname, int depth, void *data); extern int early_init_dt_scan_memory(unsigned long node, const char *uname, int depth, void *data); +extern int early_init_dt_scan_chosen_stdout(void); extern void early_init_fdt_scan_reserved_mem(void); extern void early_init_fdt_reserve_self(void); extern void early_init_dt_add_memory_arch(u64 base, u64 size); @@ -94,6 +96,7 @@ extern void early_get_first_memblock_info(void *, phys_addr_t *); extern u64 of_flat_dt_translate_address(unsigned long node); extern void of_fdt_limit_memory(int limit); #else /* CONFIG_OF_FLATTREE */ +static inline int early_init_dt_scan_chosen_stdout(void) { return -ENODEV; } static inline void early_init_fdt_scan_reserved_mem(void) {} static inline void early_init_fdt_reserve_self(void) {} static inline const char *of_flat_dt_get_machine_name(void) { return NULL; }