From patchwork Fri May 20 13:03:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 9129455 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 4FA7B60467 for ; Fri, 20 May 2016 13:07:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41E9327BF1 for ; Fri, 20 May 2016 13:07:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36C0127BFE; Fri, 20 May 2016 13:07:03 +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 A868027BF1 for ; Fri, 20 May 2016 13:07:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b3k7W-0003ZK-Mu; Fri, 20 May 2016 13:05:38 +0000 Received: from mail-lf0-x229.google.com ([2a00:1450:4010:c07::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b3k7G-0002Cv-S2 for linux-arm-kernel@lists.infradead.org; Fri, 20 May 2016 13:05:24 +0000 Received: by mail-lf0-x229.google.com with SMTP id m64so49265555lfd.1 for ; Fri, 20 May 2016 06:05:02 -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=ANcTw0lVBGTYqIiRZGf63weZjfs8nQ/XqHOA5CMNfeY=; b=LrMRbJgTj/JG6xDO7Y2CNJa107TEAv0c0BHZg0iYSkrE7y1xAZJJw8455NI5xbXipS 3hKVoXMQgVrZheuAlIuahm5MpAj25bNqTWvDHbwk8v7ibBOsAIISi7FAaINwfEJ1/vdS ZgMc6SFwudOVhtBukX1A36SB/DvXm4BtFi7/Y= 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=ANcTw0lVBGTYqIiRZGf63weZjfs8nQ/XqHOA5CMNfeY=; b=lDYozlUZy/wjMi8ESZdGgbbmIfDTttN1NpbWQH9SfZx0+3f7mvs9c5exiFUeGsrVi4 87q/QJtymYow7keMwSDJ14nvLxM0j7oQKUsEwZV7XKdum4a4G4wJhT7i4L/7iXBw/LGi x+cq0/VosWRIlEt6QByKhW4qKwzt80rK9YFAiDXB1/ZEcCtCEGNuqUYtZdvdhqN7hg6D uKRZd9mwE14gparJBVkKZOr+YYyUl1HH6RtedPldTDFwccbs6yuc/euiDlcUYUuoe67g M3sirRy/FKwHdomGCWJx6pf5LVrAAGo26IC5/LyKClSB2i9D0POAQ6FzArFEV7Ttays8 O3tQ== X-Gm-Message-State: AOPr4FUeAsGTank3V6RjP5GUcUC3TzakyljygHUNpon3fo5YP8wRuY9u//koaRnrVI2X5pos X-Received: by 10.25.215.30 with SMTP id o30mr958343lfg.132.1463749500604; Fri, 20 May 2016 06:05:00 -0700 (PDT) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id i3sm3334100lbd.44.2016.05.20.06.04.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 May 2016 06:04:59 -0700 (PDT) From: Aleksey Makarov To: "Rafael J . Wysocki" , Greg Kroah-Hartman Subject: [PATCH v8 1/4] of/serial: move earlycon early_param handling to serial Date: Fri, 20 May 2016 16:03:20 +0300 Message-Id: <1463749405-11640-2-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1463749405-11640-1-git-send-email-aleksey.makarov@linaro.org> References: <1463749405-11640-1-git-send-email-aleksey.makarov@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160520_060523_251643_74B34A94 X-CRM114-Status: GOOD ( 15.47 ) 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 , Grant Likely , 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 , 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 --- drivers/of/fdt.c | 11 +---------- drivers/tty/serial/earlycon.c | 2 +- include/linux/of_fdt.h | 2 ++ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index e7a8caa..56da2a9 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -906,7 +906,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; @@ -950,15 +950,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..2f69d4c 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -66,6 +66,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 +95,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; }