From patchwork Mon Feb 22 13:46:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 62570 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1245193lbl; Mon, 22 Feb 2016 05:47:47 -0800 (PST) X-Received: by 10.66.160.7 with SMTP id xg7mr37681536pab.10.1456148864814; Mon, 22 Feb 2016 05:47:44 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ff7si39907087pab.184.2016.02.22.05.47.44; Mon, 22 Feb 2016 05:47:44 -0800 (PST) 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; 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; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755233AbcBVNrl (ORCPT + 30 others); Mon, 22 Feb 2016 08:47:41 -0500 Received: from mail-lb0-f175.google.com ([209.85.217.175]:34282 "EHLO mail-lb0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755010AbcBVNrg (ORCPT ); Mon, 22 Feb 2016 08:47:36 -0500 Received: by mail-lb0-f175.google.com with SMTP id of3so82082756lbc.1 for ; Mon, 22 Feb 2016 05:47:35 -0800 (PST) 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=dRX+1sbufJcl7e4vEakozUA2JmZrlTR8aKEYqXZsnvc=; b=L7n1Sd6A+o898wmrYYu5mRoDCqW5k4wa0+w7chWbpJAoSGnOfcIHj4ALDhz5Hu0igH t2nbQDDP+2U6QkEyEID96z05hTpgnBefDGhv+SPVmZyMKOQXCAyBRgQdCvhTvnqZf9WC JANYhCM+FjcbsRbz2oS/V+7wS5Mx/Gc/3TZKM= 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=dRX+1sbufJcl7e4vEakozUA2JmZrlTR8aKEYqXZsnvc=; b=ES5wsbOHNWR9/Lyv7xBpCGdDrMUpFJHzTTjQHf3Xi98P2JlfmJE4R6wZjl5NHUOiM5 D5NSLXZ6MEjtw5e/XakqdZ03Y2awjiX+LTtEjS/iEGzLImOxnmC0Hh/ydIAhZeS7L6B7 uIeZFFVx6lKUddKD5pGAqJlHXpwwZO706FIrkb2cFAjAomLenwj3mpZ1L4zH7KgQPKHt zH2GOtxzJKkq7rnygWRyjEej3GE8JNuRD4xcn7aoDv82DXF7ykuNwweTFgM8N/sYDhrY J0SQXD0dnWNkd0dqnUU9mu2Ljt5AwfGuXIDDgbrvUD5ZFfinJL4kDe3krDblPL1g5WqW SFAQ== X-Gm-Message-State: AG10YOQ5VXuF+ETaQ9yn+RwBuF4FES64kAXWo5CIWdUJeOQURqYo3DBlbvqLkp3Vf6n6xL+7 X-Received: by 10.112.148.170 with SMTP id tt10mr8389534lbb.48.1456148855189; Mon, 22 Feb 2016 05:47:35 -0800 (PST) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id s5sm2564633lbr.12.2016.02.22.05.47.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Feb 2016 05:47:34 -0800 (PST) From: Aleksey Makarov To: linux-acpi@vger.kernel.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aleksey Makarov , Russell King , Greg Kroah-Hartman , "Rafael J . Wysocki" , Leif Lindholm , Graeme Gregory , Al Stone , Christopher Covington , Rob Herring , Frank Rowand , Grant Likely , Jiri Slaby , devicetree@vger.kernel.org Subject: [PATCH 2/8] of/serial: move earlycon early_param handling to serial Date: Mon, 22 Feb 2016 16:46:50 +0300 Message-Id: <1456148818-26257-3-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456148818-26257-1-git-send-email-aleksey.makarov@linaro.org> References: <1456148818-26257-1-git-send-email-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. This means the earlycon early_param handler does not just return success if no options are specified. Signed-off-by: Leif Lindholm --- drivers/of/fdt.c | 11 +---------- drivers/tty/serial/earlycon.c | 3 ++- include/linux/of_fdt.h | 2 ++ 3 files changed, 5 insertions(+), 11 deletions(-) -- 2.7.1 diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 655f79d..6b4ab4f 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -798,7 +798,7 @@ static inline void early_init_dt_check_for_initrd(unsigned long node) #ifdef CONFIG_SERIAL_EARLYCON extern struct of_device_id __earlycon_of_table[]; -static int __init early_init_dt_scan_chosen_serial(void) +int __init early_init_dt_scan_chosen_serial(void) { int offset; const char *p; @@ -843,15 +843,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 3f24236..05f9e4b 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -195,7 +196,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_serial(); err = setup_earlycon(buf); if (err == -ENOENT || err == -EALREADY) diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index df9ef38..4d783aa8 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -63,6 +63,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_serial(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); @@ -91,6 +92,7 @@ extern void early_get_first_memblock_info(void *, phys_addr_t *); extern u64 fdt_translate_address(const void *blob, int node_offset); extern void of_fdt_limit_memory(int limit); #else /* CONFIG_OF_FLATTREE */ +static inline int early_init_dt_scan_chosen_serial(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; }