From patchwork Thu Aug 11 15:31:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 73768 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp169288qga; Thu, 11 Aug 2016 08:33:53 -0700 (PDT) X-Received: by 10.98.157.154 with SMTP id a26mr18287372pfk.68.1470929633418; Thu, 11 Aug 2016 08:33:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z2si3676613pfb.226.2016.08.11.08.33.53; Thu, 11 Aug 2016 08:33:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-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-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-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 S932517AbcHKPdr (ORCPT + 6 others); Thu, 11 Aug 2016 11:33:47 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:37217 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932267AbcHKPdn (ORCPT ); Thu, 11 Aug 2016 11:33:43 -0400 Received: by mail-wm0-f45.google.com with SMTP id i5so3827011wmg.0 for ; Thu, 11 Aug 2016 08:33:41 -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=sWhCIiO2Q6VFc87rw0CDGdc6tKS13fS/80d3KMoD3Hc=; b=LohKuwnsR4xy2l+hcFBmpwv1+EEYtOz4Bm7UiWAlIEf/dbiweMjU1oQbNMarJcE8V8 1zTYv8+XAA0eltLoOSy2irhIButE7QuwQ3WspI0lMcCNnVqX+0EBC9VPO95Yo2eq5TEL kJzl7IeDuIRf0Kz1JJ6714D+L1pfHUj864EZ4= 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=sWhCIiO2Q6VFc87rw0CDGdc6tKS13fS/80d3KMoD3Hc=; b=i6+0K7PT6jCLRIqzOgd0nXmpAZKCoRTe7Ns09biVIOX+p1nEFVmZU6ZehZ0dOJHM9L 1yVPIUeNxrdlJu9XJ0yjlG7Eww3/Tn+Ny1PFPCR5VsBzXQUsxu/zsKGn0a27ASFCG5Lj lMz2bvPwPnAVmJomMZEJJbcJKV8uzkMFDa+mbJNsCIXQ+Cx/luJzbPYkq4Munp5fhJk5 LUwgs4w+lqFDb0fbCGCN2kLmcXCTTHWIqouoQM5CQif43qENkOwxaZek4YAe3n4DO7q/ aif54JTRJBnUemIyNDHcIReafrHh7YucqTnp0vAO7Mti5UWUf5aUAwwvqRo22DDBdM7z orUg== X-Gm-Message-State: AEkoouuSCZUf28lhE/rC/AQgLvbYoDzAKvafm17tSQ1UVFBqMDA60OjldWgH2pNcAFN2TRoN X-Received: by 10.25.217.151 with SMTP id s23mr1823992lfi.16.1470929620290; Thu, 11 Aug 2016 08:33:40 -0700 (PDT) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id 78sm192097lfv.39.2016.08.11.08.33.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Aug 2016 08:33:39 -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 , Jiri Slaby , devicetree@vger.kernel.org Subject: [PATCH v9 1/4] of/serial: move earlycon early_param handling to serial Date: Thu, 11 Aug 2016 18:31:38 +0300 Message-Id: <20160811153152.755-2-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160811153152.755-1-aleksey.makarov@linaro.org> References: <20160811153152.755-1-aleksey.makarov@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@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.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" 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 55f1b83..741cac53 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..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; }