From patchwork Mon Sep 5 12:36:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 75383 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp53961qgf; Mon, 5 Sep 2016 05:40:01 -0700 (PDT) X-Received: by 10.98.89.210 with SMTP id k79mr63159883pfj.43.1473079201242; Mon, 05 Sep 2016 05:40:01 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g77si11651113pfd.12.2016.09.05.05.40.01; Mon, 05 Sep 2016 05:40:01 -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 S1755704AbcIEMjv (ORCPT + 2 others); Mon, 5 Sep 2016 08:39:51 -0400 Received: from mail-lf0-f53.google.com ([209.85.215.53]:33448 "EHLO mail-lf0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755697AbcIEMjt (ORCPT ); Mon, 5 Sep 2016 08:39:49 -0400 Received: by mail-lf0-f53.google.com with SMTP id h127so22538710lfh.0 for ; Mon, 05 Sep 2016 05:39:48 -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=mnkDTCUl/nX9ktX9JZOSSH+xXx/AqbMBCPD3180qVZ0=; b=EmCaCA4EkD+WtxLfvIVnLQZPA66ZURWNKSatdISZli7LsXacM+c23vCoMWzI4+9gVf 8sLpHyr27UjodZWWLLG+FijVnzu4NLeCBxJYjX8WR9rjSq/VqLA+ERQudt/7Wd5Vjot9 r0f/Lt1NuqvW0kdJ6NaMWBomLi3vKOI3hlTEc= 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=mnkDTCUl/nX9ktX9JZOSSH+xXx/AqbMBCPD3180qVZ0=; b=CMJaQX8+K358tm0+um1WxWv7vGBXJUf75SK6yyJSBNBV9FtyBy+9PqfdNEorC1TOuz Y8aFnvuOh3YXUwAPKpj3ViYctvoH1+ziaOkarhI7vRqHStZT6RR0VrtsFJPqg1VeQdC3 GKn9D3z2dbiojclIopxfw/r2pvjAUDu7eJodH6kahkHDGu2zZF/C3D5u6fUMJaMi7IRq noPxwr9rErn3KKPS5x2thbrFe1mFBqF5dihlSNue95R1o9OJfaUKJ2rS13BdmjMEy4fG 0542UfpiSX45+kAdPnfEo4xDg8uX/sNL6I6ZWYQPgI2+hZ0ZzceIg3vkEc972vGNPrm0 guZA== X-Gm-Message-State: AE9vXwPfvUmivmVgAXXSVBakJiD9b9UjNnin2n8JKnjWeEZuB8gTTcSQak94W2QL5vfJ2H8C X-Received: by 10.25.28.140 with SMTP id c134mr6253698lfc.79.1473079182283; Mon, 05 Sep 2016 05:39:42 -0700 (PDT) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id v82sm3134160lfi.30.2016.09.05.05.39.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Sep 2016 05:39:41 -0700 (PDT) From: Aleksey Makarov To: "Rafael J . Wysocki" 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 , Greg Kroah-Hartman , 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 v10 4/4] serial: pl011: add console matching function Date: Mon, 5 Sep 2016 15:36:15 +0300 Message-Id: <20160905123617.18775-5-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160905123617.18775-1-aleksey.makarov@linaro.org> References: <20160905123617.18775-1-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 Reviewed-by: Peter Hurley Acked-by: Russell King Tested-by: Christopher Covington --- drivers/tty/serial/amba-pl011.c | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) -- 2.9.3 -- 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 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,