From patchwork Thu Mar 24 12:52:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 64350 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp623326lbc; Thu, 24 Mar 2016 05:55:48 -0700 (PDT) X-Received: by 10.98.89.7 with SMTP id n7mr12165971pfb.81.1458824142921; Thu, 24 Mar 2016 05:55:42 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ch12si12117197pac.80.2016.03.24.05.55.42; Thu, 24 Mar 2016 05:55:42 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757422AbcCXMz0 (ORCPT + 5 others); Thu, 24 Mar 2016 08:55:26 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:36468 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757474AbcCXMyh (ORCPT ); Thu, 24 Mar 2016 08:54:37 -0400 Received: by mail-lb0-f178.google.com with SMTP id qe11so29292701lbc.3 for ; Thu, 24 Mar 2016 05:54:36 -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=b0P7T4KN/eCJt+GW2l/Z9AvP7Sta7/HFdNQawhDIXcI=; b=MvQQn+T3b4Kj3fa6oq0L4eJ/CvaFSH8H2ZCmlHcGhvnEaHeWy7d+C+J3LMGhZU5iLx FfHeAM88oJBttNP3aNgizb2mvR5y+q3WF/j206fRpeDXgYqfFzgePsdSElEcvsml1qRU bdJn/So4sK5xAyvq8LWL63rioqd1Q/LxHyZUc= 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=b0P7T4KN/eCJt+GW2l/Z9AvP7Sta7/HFdNQawhDIXcI=; b=mQXTz6mCeL+W/wrPTUGSC/W3Tc5DJgtFiaf3oHW31r2rT2fnP2aPYaNx9EQlqGd4Tm EmuTLhpjBRATZakD8gUa6jXvgUjJmabDpqFiVt7tjan66LEvr+rlI1SkUAaeJmW1ESDM lYeFEdUyfWSU0cpdhbc1A0E6kGuq5gi2ZD+n/GdLYBfZBJABkgLhjgWo7JtzNefbT9C7 nqPSNfEa5LXOrLQ6IqhpN11MCwpVA+mnDbYZlhlZMyXruSQGh6RjI57P9IZ7m/HXwyRU tUnDiUzx+AxNDoAuY5cALHtk9z2dtCgtsrq3B0O45DWMQli1+L9/PanxKjeQyEbkolg8 N4cQ== X-Gm-Message-State: AD7BkJJAlO+s4d+aDnXN5UlONQWUFbUMh/DiLbOv6pbYqRIsxtQ7+NM6KEsgNhikNrY/Axyw X-Received: by 10.112.170.137 with SMTP id am9mr2720615lbc.84.1458824076035; Thu, 24 Mar 2016 05:54:36 -0700 (PDT) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id rh2sm1167378lbb.36.2016.03.24.05.54.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Mar 2016 05:54:35 -0700 (PDT) From: Aleksey Makarov To: Greg Kroah-Hartman , "Rafael J . Wysocki" , Len Brown 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 , Leif Lindholm , Graeme Gregory , Al Stone , Christopher Covington , Yury Norov , Peter Hurley , "Zheng, Lv" , Jiri Slaby Subject: [PATCH v6 5/5] serial: pl011: add console matching function Date: Thu, 24 Mar 2016 15:52:03 +0300 Message-Id: <1458823925-19560-6-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1458823925-19560-1-git-send-email-aleksey.makarov@linaro.org> References: <1458823925-19560-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 This patch adds function pl011_console_match() that implements method match of struct console. It allows to match consoles against data specified in a string, for example taken from command line or compiled by ACPI SPCR table handler. Signed-off-by: Aleksey Makarov --- drivers/tty/serial/amba-pl011.c | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) -- 2.7.4 -- 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 7c198e0..4139b64 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2287,12 +2287,68 @@ static int __init pl011_console_setup(struct console *co, char *options) return uart_set_options(&uap->port, co, baud, parity, bits, flow); } +/** + * pl011_console_match - non-standard console matching + * @co: registering console + * @name: name from console command line + * @idx: index from console command line + * @options: ptr to option string from console command line + * + * Only attempts to match console command lines of the form: + * console=pl011,mmio|mmio32,[,] + * console=pl011,0x[,] + * This form is used to register an initial earlycon boot console and + * replace it with the amba_console at pl011 driver init. + * + * Performs console setup for a match (as required by interface) + * If no are specified, then assume the h/w is already setup. + * + * Returns 0 if console matches; otherwise non-zero to use default matching + */ +static int __init pl011_console_match(struct console *co, char *name, int idx, + char *options) +{ + char match[] = "pl011"; /* pl011-specific earlycon name */ + unsigned char iotype; + unsigned long addr; + int i; + + if (strncmp(name, match, 5) != 0) + return -ENODEV; + + if (uart_parse_earlycon(options, &iotype, &addr, &options)) + return -ENODEV; + + /* try to match the port specified on the command line */ + for (i = 0; i < ARRAY_SIZE(amba_ports); i++) { + struct uart_port *port; + + if (!amba_ports[i]) + continue; + + port = &amba_ports[i]->port; + + if (port->iotype != iotype) + continue; + if ((iotype == UPIO_MEM || iotype == UPIO_MEM32) && + (port->mapbase != addr)) + continue; + + co->index = i; + port->cons = co; + return pl011_console_setup(co, options); + } + + 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, + .match = pl011_console_match, .flags = CON_PRINTBUFFER, .index = -1, .data = &amba_reg,