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: 68236 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp3766818qge; Fri, 20 May 2016 06:05:09 -0700 (PDT) X-Received: by 10.98.91.198 with SMTP id p189mr4706635pfb.146.1463749509402; Fri, 20 May 2016 06:05:09 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id em6si27914708pac.71.2016.05.20.06.05.09; Fri, 20 May 2016 06:05:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756022AbcETNFG (ORCPT + 2 others); Fri, 20 May 2016 09:05:06 -0400 Received: from mail-lf0-f47.google.com ([209.85.215.47]:35510 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755993AbcETNFD (ORCPT ); Fri, 20 May 2016 09:05:03 -0400 Received: by mail-lf0-f47.google.com with SMTP id e126so23926144lfg.2 for ; Fri, 20 May 2016 06:05:01 -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=BZH3TaDJZNIiTS6HkAIX7WRAoPE8JJ7O+ERIzwXCbtvazZFUtd3A5nSaL7EhrDTfrj alIvS8b9eWCZuiql4DNHsTLlQofOFms42bsWifFk4W8jfBUGzaHrp6djBqXoBACt+b/G yYOCeD7Ku19oOAjmokoTDl8GDSQGJ66kKVoctGd2ZqTYAW1/ASrCuvB+l/4S7wtL8+CS WjmXs13wqekj0SpU1ouY3Mh/UWnTXAAdXXGOoUveTKehkpCXSD7eHPUpPBe22F8TpW0E 6cWqSV4h73de/eMQk328ZB5/6hTpKiqhbKzlLsswFB1zJAenVXzJWwxwhGS8rzAk+6jL R/pA== X-Gm-Message-State: AOPr4FXyGyck9LNBoIdmiap7qaEtwxV7q7WwVutGwuXxZbMvP6241IBIItrD4k/Q91qAT0kb 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 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 , 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 , Grant Likely , Jiri Slaby , devicetree@vger.kernel.org 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> Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@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 --- drivers/of/fdt.c | 11 +---------- drivers/tty/serial/earlycon.c | 2 +- include/linux/of_fdt.h | 2 ++ 3 files changed, 4 insertions(+), 11 deletions(-) -- 2.8.2 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }