From patchwork Thu Mar 31 13:40:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 64786 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp166455lbc; Thu, 31 Mar 2016 06:43:46 -0700 (PDT) X-Received: by 10.98.13.88 with SMTP id v85mr21992263pfi.150.1459431826718; Thu, 31 Mar 2016 06:43:46 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fb9si14239404pad.147.2016.03.31.06.43.46; Thu, 31 Mar 2016 06:43:46 -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 S1757110AbcCaNnf (ORCPT + 2 others); Thu, 31 Mar 2016 09:43:35 -0400 Received: from mail-lf0-f51.google.com ([209.85.215.51]:33875 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756961AbcCaNnN (ORCPT ); Thu, 31 Mar 2016 09:43:13 -0400 Received: by mail-lf0-f51.google.com with SMTP id c62so59913608lfc.1 for ; Thu, 31 Mar 2016 06:43:12 -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=fn2HCkPjj7Hbaateo0upXtivMKU4I5bpnoFrBRpAomR++7Y2sx0AQzFze3OHN9QRRp PEfWoA8hrKyMXkYDo6i3LGQ/sjz6wtjWxWQrMDjj2Bk7Oi/xtwG5PQnyH2VwNH/Gmdo7 RUOoJv7j3wVocSnphQfI23ByjYsT1D4uxq07I= 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=hebyLxY0/tQSavXhxK2eKJIfbTxERkBSYz4B3Aci3UGZWpcqtKGwfTVEl30A13DCv9 xNVWcEAWjC4G4uZh3PBR8ZlW1Wvc6a7ajF4FN+1kXjUXkBOnmHH8olcvPeIsXNEp5wrP 2+Ppvow/wRpMMgPBreZcGmr12SNR7kMmv5c5SoSoz58TLen5FMXdq2gYClCWKdunWH9i 29VYbuzEDjmt/6e4s06Qg552b1byh+Ears02N6f/IPSDvfaWAi7KohHmz3wa8uagIrCE bcyL6nKnnNVG5vfecvsuP+WMPQG7uiR4M3cxCVk4tQ/mzBx7IgUCyxN5Iuk9T1vehvgM P03A== X-Gm-Message-State: AD7BkJJ/fglQ9CyLUvYhu3AkEy8c7HjjvSHrR39XQ887ZkqyDFoLPQpbsRpG+qYEGrGLDaDS X-Received: by 10.25.137.215 with SMTP id l206mr5579193lfd.140.1459431791349; Thu, 31 Mar 2016 06:43:11 -0700 (PDT) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id mi9sm1285984lbc.27.2016.03.31.06.43.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Mar 2016 06:43:10 -0700 (PDT) From: Aleksey Makarov To: Russell King , 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 , "Rafael J . Wysocki" , Len Brown , Leif Lindholm , Graeme Gregory , Al Stone , Christopher Covington , Yury Norov , Peter Hurley , Andy Shevchenko , "Zheng, Lv" , Jiri Slaby Subject: [PATCH v7 5/5] serial: pl011: add console matching function Date: Thu, 31 Mar 2016 16:40:27 +0300 Message-Id: <1459431629-27934-6-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1459431629-27934-1-git-send-email-aleksey.makarov@linaro.org> References: <1459431629-27934-1-git-send-email-aleksey.makarov@linaro.org> 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. 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-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 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,