From patchwork Mon Feb 29 12:42:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 63208 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1224039lbc; Mon, 29 Feb 2016 04:43:49 -0800 (PST) X-Received: by 10.66.219.71 with SMTP id pm7mr21700015pac.137.1456749824194; Mon, 29 Feb 2016 04:43:44 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o86si13711563pfi.217.2016.02.29.04.43.43; Mon, 29 Feb 2016 04:43: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 S1755345AbcB2Mnf (ORCPT + 30 others); Mon, 29 Feb 2016 07:43:35 -0500 Received: from mail-lb0-f181.google.com ([209.85.217.181]:32943 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754194AbcB2MnQ (ORCPT ); Mon, 29 Feb 2016 07:43:16 -0500 Received: by mail-lb0-f181.google.com with SMTP id ed16so982888lbb.0 for ; Mon, 29 Feb 2016 04:43:15 -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=MwY3BvoTnJFS7UeNXeuI6fKtQWgG/MNxp9Hg0EpH3xA=; b=gbmxIG2tRjADIGGja93YZWPo3ZIvWyirpto8b5KPprHgKb2lnyVlHYcemJfr38X724 iyiPsMGSCzkB/FVszN5b0/nS1Lnw2vUJ2GGuNamOajLPn3DRjHljBmwaZq9n2Iyi5jLq 7qivE1qRYbXAMkIOrrwCEkU0LwOy/avnwHlxc= 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=MwY3BvoTnJFS7UeNXeuI6fKtQWgG/MNxp9Hg0EpH3xA=; b=KLcBPgnSlpN2Ps8kY+/AxS08Xy9nPazy68NhflnsT9wHD1DXzAylhws1UtssrW10Rl DXvdm3iyhR96NlSWaugwZj+b7PEN5KPZKZR+vqPG+PYI4uPvYL1RipbK6mYEy5kmS1uF X9dnGegtqTCrd5DrYUF9268Yzz6w1Aq9EPTiosyqTae4+Bf8QyOdowfGuw6Gql7Ovd4u 2tTbzqJvksl5g0PVQ0fST4qJNQzGMoWHIZVdUgB3oZdYog0yrx17nmrbXgwLtXrnXy+s nE10ICVdvdk+eY752qado5PtPa21CCzchmThdXlV+VFoP6nFWyIlS8E3eTvDhfob12zg tQ2A== X-Gm-Message-State: AD7BkJJcjBUu4x93KfinBzYUQBo8sJLNACBayY2SxzBYgwjaINMM1yYevEPbHJLigDrOftG2 X-Received: by 10.112.198.162 with SMTP id jd2mr4447902lbc.53.1456749794696; Mon, 29 Feb 2016 04:43:14 -0800 (PST) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id ke9sm3929150lbc.28.2016.02.29.04.43.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 04:43:13 -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 , Matthias Brugger , Jonathan Corbet , Jiri Slaby , linux-doc@vger.kernel.org Subject: [PATCH v3 5/7] ACPI: serial: implement earlycon on ACPI DBG2 port Date: Mon, 29 Feb 2016 15:42:02 +0300 Message-Id: <1456749726-30261-6-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456749726-30261-1-git-send-email-aleksey.makarov@linaro.org> References: <1456749726-30261-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 Add ACPI_DBG2_EARLYCON_DECLARE() macros that declares an earlycon on the serial port specified in the DBG2 ACPI table. Pass the string "earlycon=acpi_dbg2" to the kernel to activate it. Callbacks for EARLYCON_DECLARE() and OF_EARLYCON_DECLARE() can also be used for this macros. Signed-off-by: Aleksey Makarov --- Documentation/kernel-parameters.txt | 3 ++ drivers/tty/serial/earlycon.c | 60 +++++++++++++++++++++++++++++++++++++ include/linux/acpi_dbg2.h | 20 +++++++++++++ 3 files changed, 83 insertions(+) -- 2.7.1 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index e0a21e4..19b947b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1072,6 +1072,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. A valid base address must be provided, and the serial port must already be setup and configured. + acpi_dbg2 + Use serial port specified by the DBG2 ACPI table. + earlyprintk= [X86,SH,BLACKFIN,ARM,M68k] earlyprintk=vga earlyprintk=efi diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index d217366..9ba3a04 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -22,6 +22,7 @@ #include #include #include +#include #ifdef CONFIG_FIX_EARLYCON_MEM #include @@ -200,6 +201,8 @@ int __init setup_earlycon(char *buf) return -ENOENT; } +static bool setup_dbg2_earlycon; + /* early_param wrapper for setup_earlycon() */ static int __init param_setup_earlycon(char *buf) { @@ -212,6 +215,11 @@ static int __init param_setup_earlycon(char *buf) if (!buf || !buf[0]) return early_init_dt_scan_chosen_serial(); + if (!strcmp(buf, "acpi_dbg2")) { + setup_dbg2_earlycon = true; + return 0; + } + err = setup_earlycon(buf); if (err == -ENOENT || err == -EALREADY) return 0; @@ -286,3 +294,55 @@ int __init of_setup_earlycon(const struct earlycon_id *match, } #endif /* CONFIG_OF_EARLY_FLATTREE */ + +#ifdef CONFIG_ACPI_DBG2_TABLE + +int __init acpi_setup_earlycon(struct acpi_dbg2_device *device, void *d) +{ + int err; + struct uart_port *port = &early_console_dev.port; + int (*setup)(struct earlycon_device *, const char *) = d; + struct acpi_generic_address *reg; + + if (!setup_dbg2_earlycon) + return -ENODEV; + + if (device->register_count < 1) + return -ENODEV; + + if (device->base_address_offset >= device->length) + return -EINVAL; + + reg = (void *)device + device->base_address_offset; + + if (reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY && + reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO) + return -EINVAL; + + spin_lock_init(&port->lock); + port->uartclk = BASE_BAUD * 16; + + if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) { + if (device->port_type == ACPI_DBG2_ARM_SBSA_32BIT) + port->iotype = UPIO_MEM32; + else + port->iotype = UPIO_MEM; + port->mapbase = reg->address; + port->membase = earlycon_map(reg->address, SZ_4K); + } else { + port->iotype = UPIO_PORT; + port->iobase = reg->address; + } + + early_console_dev.con->data = &early_console_dev; + err = setup(&early_console_dev, NULL); + if (err < 0) + return err; + if (!early_console_dev.con->write) + return -ENODEV; + + register_console(early_console_dev.con); + return 0; +} + +#endif /* CONFIG_ACPI_DBG2_TABLE */ diff --git a/include/linux/acpi_dbg2.h b/include/linux/acpi_dbg2.h index 125ae7e..b653752 100644 --- a/include/linux/acpi_dbg2.h +++ b/include/linux/acpi_dbg2.h @@ -37,12 +37,32 @@ int acpi_dbg2_setup(struct acpi_table_header *header, const void *data); ACPI_DECLARE_PROBE_ENTRY(dbg2, name, ACPI_SIG_DBG2, \ acpi_dbg2_setup, &__acpi_dbg2_data_##name) +int acpi_setup_earlycon(struct acpi_dbg2_device *device, void *d); + +/** + * ACPI_DBG2_EARLYCON_DECLARE() - Define handler for ACPI GDB2 serial port + * @name: Identifier to compose name of table data + * @subtype: Subtype of the port + * @console_setup: Function to be called to setup the port + * + * Type of the console_setup() callback is + * int (*setup)(struct earlycon_device *, const char *) + * It's the type of callback of of_setup_earlycon(). + */ +#define ACPI_DBG2_EARLYCON_DECLARE(name, subtype, console_setup) \ + ACPI_DBG2_DECLARE(name, ACPI_DBG2_SERIAL_PORT, subtype, \ + acpi_setup_earlycon, console_setup) + #else #define ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) \ static const void *__acpi_dbg_data_##name[] \ __used __initdata = { (void *)setup_fn, (void *)data_ptr } +#define ACPI_DBG2_EARLYCON_DECLARE(name, subtype, console_setup) \ + static const void *__acpi_dbg_data_serial_##name[] \ + __used __initdata = { (void *)console_setup } + #endif #endif