From patchwork Tue Oct 4 07:15:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 77235 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp2069670qgf; Tue, 4 Oct 2016 00:21:26 -0700 (PDT) X-Received: by 10.66.62.232 with SMTP id b8mr3129184pas.38.1475565686211; Tue, 04 Oct 2016 00:21:26 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o10si2294434pao.90.2016.10.04.00.21.25; Tue, 04 Oct 2016 00:21:26 -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 S1751647AbcJDHVZ (ORCPT + 2 others); Tue, 4 Oct 2016 03:21:25 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:33864 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751414AbcJDHVY (ORCPT ); Tue, 4 Oct 2016 03:21:24 -0400 Received: by mail-lf0-f41.google.com with SMTP id b81so55122059lfe.1 for ; Tue, 04 Oct 2016 00:21:23 -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; bh=6TpHhq7wsEWrvQcl+PDQ9r1a/ue4vuKUtqkM9+ReYmw=; b=QLUj0JYdejDDp7wfuGAkecCFHJDcRfHcglZfa48VV3EEe2vALeh+BDeEkhngsXcA7q UVItoJZOtyaOXNBTy49SARwCB6L1f7Ye9daat4uQwH+L+D25t7vJEXWueVemOCqK4si0 GsDhpWjsjSn0iAQbZacZHxoJb5aeuz1/mayOg= 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; bh=6TpHhq7wsEWrvQcl+PDQ9r1a/ue4vuKUtqkM9+ReYmw=; b=cqSqoapBCVBGoa9W2H7fnzTEWs3QT0cJ1aKYWNznE5CghTnXlw1kx6BQjlPJY8AMhv V/YtqWB98Nu1aHuHLRpIF7Ug6ENY1Ow+nWN0VNIWudX0koBkqDwri64ZuNo+CPzUuaUP 17v1bl4OHfHWOwc9tCKO6fM4EvEoQdA0zJGnHUf58VQYQKil7VXLsTffVnDZKzsB443k AlCmhJCdPkKAd8lPTSrtxnTFXp2T6HsSaP+717zVWan2IlKELEpiDPiA8TgMI9H3u+Qy rRJcc2cGq8EVkNYrf8PffaBUfxHmxOOOPCChLskLlljB9QfCun3Z5rrJ/EjkxxBH67lv IjWw== X-Gm-Message-State: AA6/9RlZsKc5YmXemsvoOpYWPlGVfi3SzhT1tqgZot6x479kg61na+m3oKuoxHoPjpQ1BnxR X-Received: by 10.25.208.213 with SMTP id h204mr749968lfg.147.1475565682768; Tue, 04 Oct 2016 00:21:22 -0700 (PDT) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id 204sm444987ljj.2.2016.10.04.00.21.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Oct 2016 00:21:22 -0700 (PDT) From: Aleksey Makarov To: Greg Kroah-Hartman Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Aleksey Makarov , Russell King , Christopher Covington , Peter Hurley , Russell King , Jiri Slaby Subject: [PATCH] serial: pl011: add console matching function Date: Tue, 4 Oct 2016 10:15:32 +0300 Message-Id: <20161004071547.19224-1-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.10.0 Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@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. This patch was merged to tty-next but then reverted because of conflict with commit 46e36683f433 ("serial: earlycon: Extend earlycon command line option to support 64-bit addresses") Now it is fixed. Signed-off-by: Aleksey Makarov Reviewed-by: Peter Hurley Acked-by: Russell King Tested-by: Christopher Covington Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/amba-pl011.c | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) -- 2.10.0 -- 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/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index e2c33b9..c00ab22 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2315,12 +2315,67 @@ 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) +{ + unsigned char iotype; + resource_size_t addr; + int i; + + if (strcmp(name, "pl011") != 0) + return -ENODEV; + + if (uart_parse_earlycon(options, &iotype, &addr, &options)) + return -ENODEV; + + if (iotype != UPIO_MEM && iotype != UPIO_MEM32) + 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->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,