From patchwork Mon Sep 5 12:36: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: 75385 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp54341qgf; Mon, 5 Sep 2016 05:41:01 -0700 (PDT) X-Received: by 10.66.126.131 with SMTP id my3mr55710262pab.115.1473079261089; Mon, 05 Sep 2016 05:41:01 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 9si7563145pfu.156.2016.09.05.05.41.00; Mon, 05 Sep 2016 05:41:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755931AbcIEMk5 (ORCPT + 27 others); Mon, 5 Sep 2016 08:40:57 -0400 Received: from mail-lf0-f47.google.com ([209.85.215.47]:33923 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755557AbcIEMje (ORCPT ); Mon, 5 Sep 2016 08:39:34 -0400 Received: by mail-lf0-f47.google.com with SMTP id u14so3062266lfd.1 for ; Mon, 05 Sep 2016 05:39:33 -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=2Pv178VJFk6riJ2Qiyzt7qwt+qnSmPRvMmc1NyfDZMk=; b=SHbyo5ty8N5xPUsaAqUJWg8sj73lyHymKywue2QtDHntXszhymU/llL1R85ukAWFWY C5gChHrwm0wSSDONlB2XvnegQ/Ngi20NUZFe0Ctj4bUrhbX7fq+nkzSBMKujQgptG1gu gWb5MM8PTPegdYwv9jck847sWJlSMfCyU9uaE= 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=2Pv178VJFk6riJ2Qiyzt7qwt+qnSmPRvMmc1NyfDZMk=; b=m2u9TvyHva9f6E3XGj/oiTOokFQHoREfV0NLvU0dbDNDheRUkHdzSoDQw50m2pgzj2 GSPQM7HUVrctiCA+tFFpxlaE2MP+8rCT41Ic3MXPKdXRoFmIUZryxLmpF0h98UBc9GdW CTi+LS/RhkFmVRwAPnh+F/EmYkT8V7ZQNq1636u21mcBTB70tDNonEX/s9wDWCaNrykA irOVooLr3DY4RIpazYO/33ytdj4QI+/AHC3l3kxlTqyzyYmkKnZMkQBl35p7Qb2DJTPd 0rxTPJrDSsjQRWSkyZjvjiz9He6ixNUxweFGLuuKinZLEgGaEOlehVYkNx4iaM+LhmJw fZXg== X-Gm-Message-State: AE9vXwM9My2i0R1e4i0olHHWE1zDDlK1uKUdbxE+d5+/H9VmPpX4LEhyqbGNmr9bNKkDPUOz X-Received: by 10.25.87.12 with SMTP id l12mr8098634lfb.153.1473079172774; Mon, 05 Sep 2016 05:39:32 -0700 (PDT) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id v82sm3134160lfi.30.2016.09.05.05.39.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Sep 2016 05:39:32 -0700 (PDT) From: Aleksey Makarov To: "Rafael J . Wysocki" Cc: linux-serial@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aleksey Makarov , Russell King , Greg Kroah-Hartman , Len Brown , Leif Lindholm , Graeme Gregory , Al Stone , Christopher Covington , Yury Norov , Peter Hurley , Andy Shevchenko , "Zheng, Lv" , Mark Salter , Kefeng Wang , Rob Herring , Frank Rowand , Jiri Slaby , devicetree@vger.kernel.org Subject: [PATCH v10 1/4] of/serial: move earlycon early_param handling to serial Date: Mon, 5 Sep 2016 15:36:12 +0300 Message-Id: <20160905123617.18775-2-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160905123617.18775-1-aleksey.makarov@linaro.org> References: <20160905123617.18775-1-aleksey.makarov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.3 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; }