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: 9280981 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14D0B60780 for ; Mon, 15 Aug 2016 13:38:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0584925E13 for ; Mon, 15 Aug 2016 13:38:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE1F828C99; Mon, 15 Aug 2016 13:38:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E78E225E13 for ; Mon, 15 Aug 2016 13:38:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZI4t-0006ME-R8; Mon, 15 Aug 2016 13:37:19 +0000 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZI4o-0006CJ-LF for linux-arm-kernel@lists.infradead.org; Mon, 15 Aug 2016 13:37:16 +0000 Received: by mail-wm0-x236.google.com with SMTP id i5so103816527wmg.0 for ; Mon, 15 Aug 2016 06:36:54 -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=P0jjSY5EEBEhEZ4FxjbtXDh5ThenHJ9TH7/x9EvHvyghlgZYwomVkWyy9sTUwEGDk4 aq3yro4qkoOUOR8GwqMGcwlIph4S6IFLfmoluEurSuv0Q266Qn5ttlXTxWTk4GduqYMA 3rWEpHhPDe+IgM+2M9OmJl/ejcWkbf1KDRlYPN9baMBauXHWJk1frpdTf1aIwlEoaADc wYjqPMrcOAxKbF/34bw5aYNKKAZlObSrJGLsvh2KdtiP3TbupxJRW+MjeQwjHqfNZ7vA sCpCNS56N0E8fvZ1dExhHGyrAt+ZWkBjDpSto512IiL9YTvxaLXKKZmImYVtFUWvX2d4 Tglw== X-Gm-Message-State: AEkooutOzja9NiDkARtXijAmjRiUF9sOL9oeyue1Yrw2OAKafxTdxJuJ0yEDn27whTmyNTEW 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160815_063714_898265_D6D750AF X-CRM114-Status: GOOD ( 15.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Zheng, Lv" , Kefeng Wang , Russell King , Peter Hurley , Graeme Gregory , Andy Shevchenko , linux-kernel@vger.kernel.org, Leif Lindholm , Russell King , linux-acpi@vger.kernel.org, Aleksey Makarov , Yury Norov , Christopher Covington , linux-serial@vger.kernel.org, Mark Salter , Jiri Slaby , Al Stone , linux-arm-kernel@lists.infradead.org, Len Brown MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Russell King --- drivers/tty/serial/amba-pl011.c | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) 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,