From patchwork Mon Aug 15 13:35: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: 73915 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1450354qga; Mon, 15 Aug 2016 06:36:57 -0700 (PDT) X-Received: by 10.66.216.69 with SMTP id oo5mr1200755pac.155.1471268217511; Mon, 15 Aug 2016 06:36:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e2si26798665pfk.26.2016.08.15.06.36.57; Mon, 15 Aug 2016 06:36:57 -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; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752994AbcHONgz (ORCPT + 6 others); Mon, 15 Aug 2016 09:36:55 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35185 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752975AbcHONgy (ORCPT ); Mon, 15 Aug 2016 09:36:54 -0400 Received: by mail-wm0-f47.google.com with SMTP id f65so89965749wmi.0 for ; Mon, 15 Aug 2016 06:36:53 -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=Pvv9ruDdGS+MioqcaWbeGqSn25CjtKYZjCUSRoFJMn8=; b=jL/w0ZqH+AiFN4Af3e4gdpItY9WAtsML3KDCxz8Mx63rGjTyVPzqFi8rocJMYskTkX ngfe5RC0DXw5pzp2M6PKcUVigmeF9G8JrtEkfDuC2/PXs2z6gvzDh2iF2JsypX99ay6K pOx0QNPADVLteOZbIEElQ3R1uXj8/Or3jYVXg= 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=Pvv9ruDdGS+MioqcaWbeGqSn25CjtKYZjCUSRoFJMn8=; b=YkgsLmoDJViIdn/3KN53AqTl+9JRKHyajXo24/t3nSRTFjBV3yJDlnZokVWEpUFDLx pVudGWW73cs5IZAHQbhJMehL6Z9hDrA91PEO+t/dLHGRlnscqOUBueS0y4+7UbmhL4aB IbPN9VSlaEGiVYUJ8w77PcHR3X6LIwA4S8lPhAoSBs0e4kM3R29k3ghPpW7JBCXC50Po mYQWJxSIhElMJ5aI5/Pn7drjetJ5IIxGkp8Tu3x1gdPyaiHxdr++Ul7RqBdgNwlNshqh 62BOutC39bIQeOgicOvbZ45pZx0RXt5gZW2Nw3yhiQNSeu05RGTVOxi/w6KdWYURBjhn IBUA== X-Gm-Message-State: AEkoouvbl9ZFZTAfJ3pk3v0/q0xd7mFbvysI6NCQRfIG/90kNijka/xriJk34Se8sGGUJm/N X-Received: by 10.25.206.6 with SMTP id e6mr4658060lfg.182.1471268212658; Mon, 15 Aug 2016 06:36:52 -0700 (PDT) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id h30sm17550lji.39.2016.08.15.06.36.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Aug 2016 06:36:51 -0700 (PDT) From: Aleksey Makarov To: "Rafael J . Wysocki" , 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 , Russell King , Len Brown , Leif Lindholm , Graeme Gregory , Al Stone , Christopher Covington , Yury Norov , Peter Hurley , Andy Shevchenko , "Zheng, Lv" , Mark Salter , Kefeng Wang , Russell King , Jiri Slaby Subject: [PATCH v9 4/4] serial: pl011: add console matching function Date: Mon, 15 Aug 2016 16:35:03 +0300 Message-Id: <20160815133505.15294-1-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160815123934.GJ1041@n2100.armlinux.org.uk> References: <20160815123934.GJ1041@n2100.armlinux.org.uk> 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 Reviewed-by: Peter Hurley --- drivers/tty/serial/amba-pl011.c | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) -- 2.9.2 -- 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 8a9e213..2f9af8a 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2288,12 +2288,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; + unsigned long 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,