From patchwork Mon Jan 25 11:45:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 60342 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1299778lbb; Mon, 25 Jan 2016 03:45:53 -0800 (PST) X-Received: by 10.98.14.68 with SMTP id w65mr25401824pfi.146.1453722352155; Mon, 25 Jan 2016 03:45:52 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id da6si33209253pad.156.2016.01.25.03.45.51; Mon, 25 Jan 2016 03:45:52 -0800 (PST) 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; 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; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757073AbcAYLpt (ORCPT + 6 others); Mon, 25 Jan 2016 06:45:49 -0500 Received: from mail-lb0-f177.google.com ([209.85.217.177]:33281 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757066AbcAYLpq (ORCPT ); Mon, 25 Jan 2016 06:45:46 -0500 Received: by mail-lb0-f177.google.com with SMTP id x4so73137673lbm.0 for ; Mon, 25 Jan 2016 03:45:45 -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=n0ggAoEua4YpLNXxT44HxRWV5RJNU4KWbQuiDXlTHTA=; b=MUP525nZ92bjmw2HmAn13bk7/wl0vsNlRfkh4IWs+7vnimXhUQB8uuarobee8BZCBy C+LKHWQ+WjctXQCwr3qeds6ngPe0x3peh+IsWzQWWG2rEahagQnkjnFbNOCm1wifPFXm r6WIO88zl08rspBBW7GIJuqyUvaifpPimX+jA= 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=n0ggAoEua4YpLNXxT44HxRWV5RJNU4KWbQuiDXlTHTA=; b=UFtv807qM9JNbDSomlG2D0CmmboR8tIyq4CzoSKn2E4SV7gTW0GwmrpFLtiJmOdhlD vFsHHJqwshyaH/O012NmISUhTAivVCr8Rt33Ftv8IhUAttc+F8gUugtub73KJaeegdXe Gz/GD9zXZo1VdJprUBkWlrk/lfxAFZrla81CVMbbw9epHbyhpgpjc0xJrqDgfeSJd1+l FQsjXirPfAabIcMfFRGLGtYXOyJP1xErfD9FjRV34/HwwWKmMr8WjcbRuifymwJjK2XG 5qzyKwReF/Pym05NaWuB00wr3oJPGIWRLLjCr5lPqVkbpQ1Vxa9rbmvxoEm0wJPjprZa FYeQ== X-Gm-Message-State: AG10YOTBy8Rlt1jUEpkM7/Dn3YUethvQ7YVN7UsNXPb4SeylbmuLBVAxdBhFDY/a5FFtOngq X-Received: by 10.112.172.233 with SMTP id bf9mr6107708lbc.121.1453722344578; Mon, 25 Jan 2016 03:45:44 -0800 (PST) Received: from lemon.localdomain (host-2-60-44-52.pppoe.omsknet.ru. [2.60.44.52]) by smtp.gmail.com with ESMTPSA id jx8sm2662527lbc.29.2016.01.25.03.45.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Jan 2016 03:45:43 -0800 (PST) From: Aleksey Makarov To: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, Aleksey Makarov , Graeme Gregory , Russell King , Greg Kroah-Hartman , "Rafael J . Wysocki" , Leif Lindholm , Jiri Slaby , Robert Moore , Lv Zheng , "Rafael J. Wysocki" , Len Brown , devel@acpica.org Subject: [PATCH 3/3] serial: pl011: add acpi_match for amba-pl011.c Date: Mon, 25 Jan 2016 17:45:23 +0600 Message-Id: <1453722324-22407-4-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453722324-22407-1-git-send-email-aleksey.makarov@linaro.org> References: <1453722324-22407-1-git-send-email-aleksey.makarov@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Add an implementation of acpi_match() to the pl011 driver. It allows to check if the console matches one specified with ACPI SPCR table. Signed-off-by: Aleksey Makarov --- drivers/tty/serial/amba-pl011.c | 14 ++++++++++++++ include/acpi/actbl2.h | 4 ++++ 2 files changed, 18 insertions(+) -- 2.7.0 -- 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/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 899a771..3f4aa1b 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2189,12 +2189,26 @@ static int __init pl011_console_setup(struct console *co, char *options) return uart_set_options(&uap->port, co, baud, parity, bits, flow); } +static int __init pl011_console_acpi_match(struct console *co, + struct acpi_table_spcr *spcr) +{ + struct uart_amba_port *uap = amba_ports[co->index]; + + if (spcr->interface_type == ACPI_DBG2_ARM_PL011 && + spcr->serial_port.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY && + spcr->serial_port.address == (u64)uap->port.mapbase) + return 0; + + return -ENODEV; +} + static struct uart_driver amba_reg; static struct console amba_console = { .name = "ttyAMA", .write = pl011_console_write, .device = uart_console_device, .setup = pl011_console_setup, + .acpi_match = pl011_console_acpi_match, .flags = CON_PRINTBUFFER, .index = -1, .data = &amba_reg, diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 6e28f54..ce4cb37 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -371,6 +371,10 @@ struct acpi_dbg2_device { #define ACPI_DBG2_16550_COMPATIBLE 0x0000 #define ACPI_DBG2_16550_SUBSET 0x0001 +#define ACPI_DBG2_ARM_PL011 0x0003 +#define ACPI_DBG2_ARM_SBSA_GENERIC 0x000e +#define ACPI_DBG2_ARM_DCC 0x000f +#define ACPI_DBG2_DCM2835 0x0010 #define ACPI_DBG2_1394_STANDARD 0x0000