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: 9129463 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 4A04760467 for ; Fri, 20 May 2016 13:08:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C55827BF1 for ; Fri, 20 May 2016 13:08:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30B2B27BFE; Fri, 20 May 2016 13:08:26 +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 DE67F27BF1 for ; Fri, 20 May 2016 13:08:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b3k8k-0004PM-0f; Fri, 20 May 2016 13:06:54 +0000 Received: from mail-lf0-x22d.google.com ([2a00:1450:4010:c07::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b3k7P-0003OP-Ho for linux-arm-kernel@lists.infradead.org; Fri, 20 May 2016 13:05:34 +0000 Received: by mail-lf0-x22d.google.com with SMTP id e130so14453998lfe.3 for ; Fri, 20 May 2016 06:05:11 -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=gvJ7tcreOO8yMGJsD/rw+dpcfyelO1nh67nQqWx7BQQ04jqxBtoYMB9ctec8U96SMZ jDBbdIfrRYDLW1NgNo0/oy9res5ohngCgjPV5bpRchYTxTGn6A5G/PUndY9N+Xf/4UFL Z7f6kWpvM6QUUGrrPlGxfRV1+EGH3nyJ2y/CHYEelIggBBlc68e67OHEz576PFCdoNdY JixFJHbL7qZQczGlc6f9XZOSilY/KBZIUT+rm3RtMwsK41zO3BhHfX4u+4JWU4zYnl3Y q/taJAvbsN6xmX5hdO/lGJaKWy4UzUgY3/bKiRWWE6E8NWbM5b+CjhIaJleqjaYYGSuG Ejlw== X-Gm-Message-State: AOPr4FU3n51i9S1DREVJE5WZEW+FKp7aXOfI8VNbBJw2Q1uiR1i4N41ex/liqu5kR2N0xtij 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160520_060531_965433_02E5037E X-CRM114-Status: GOOD ( 16.06 ) 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 --- 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,