From patchwork Fri May 20 13:03:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 9129441 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 376DC6048B for ; Fri, 20 May 2016 13:06:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29F6E27BF1 for ; Fri, 20 May 2016 13:06:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E3A227BFE; Fri, 20 May 2016 13:06:06 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9917A27BF1 for ; Fri, 20 May 2016 13:06:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932681AbcETNGC (ORCPT ); Fri, 20 May 2016 09:06:02 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:34357 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932701AbcETNFL (ORCPT ); Fri, 20 May 2016 09:05:11 -0400 Received: by mail-lf0-f41.google.com with SMTP id m64so49267236lfd.1 for ; Fri, 20 May 2016 06:05:10 -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=QypkcEoQEUgSczOS6ai1hXxYud6Ezaqd0oo/ATx/PQs=; b=LlHx4gOUx0lkNbKTw8im2EpiiY3ivKYYlAHjC+7Ljliy52o0uExg2vZ/cfPuYRv1V2 aG/Q2urE8w8Uin7+G9iV/lMmijxRPsUMywJ9MfWEZg+jABKDm4D3WQe3/UgGiPMK183d xfGJV9Lp0bHa7H5+M9pyR4EYgO2l6GNBX0cyU= 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=QypkcEoQEUgSczOS6ai1hXxYud6Ezaqd0oo/ATx/PQs=; b=HPZtrx6dsro8th57EnNrQ3sLDyUdbLGs85DFsnD5gJWbo13RpaoxD7WgvdYOkSnZAO n6cCNvaNEUcrDBzb6KVAfk6zUP0ErEil32mR7GcpZm9BvTpvu9tdG32vXe+YcCtKYLkQ UnkDbTr2ZLdiNCvUq+TcuCYM2bNJbTEwlVzlYv74+vTDjKgcv5vDuSKBUrZYnRpaCGP0 U/pOPz5oZZrzDOp595ZrJe3se3uhhy6UX9laeNaaAK3zJuHzMeGu1eFlIp5nuAda9B8o JUcUqImzKS+qjnkKPl7BnTdmgbVw6xI/nagCxVkZA5bCfd+voUfxVtJtvcicxcepWCkI s5DA== X-Gm-Message-State: AOPr4FUqpu1zE5gYAIz2NS795CgTihf6H3AL4UVXwrYOkpU0orHIbAMp/IjVU9WZO/MmPCvL X-Received: by 10.25.211.11 with SMTP id k11mr1103571lfg.153.1463749509565; Fri, 20 May 2016 06:05:09 -0700 (PDT) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id i3sm3334100lbd.44.2016.05.20.06.05.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 May 2016 06:05:08 -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 v8 4/4] serial: pl011: add console matching function Date: Fri, 20 May 2016 16:03:23 +0300 Message-Id: <1463749405-11640-5-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1463749405-11640-1-git-send-email-aleksey.makarov@linaro.org> References: <1463749405-11640-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 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 --- drivers/tty/serial/amba-pl011.c | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index a2aa655..388edc8 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2288,12 +2288,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 (iotype != UPIO_MEM && iotype != UPIO_MEM32) + continue; + + 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,