From patchwork Thu Aug 11 15:31:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 73770 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp169448qga; Thu, 11 Aug 2016 08:34:15 -0700 (PDT) X-Received: by 10.66.254.39 with SMTP id af7mr18148417pad.37.1470929653086; Thu, 11 Aug 2016 08:34:13 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z88si3678255pff.218.2016.08.11.08.34.12; Thu, 11 Aug 2016 08:34:13 -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 S932616AbcHKPeE (ORCPT + 2 others); Thu, 11 Aug 2016 11:34:04 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:36856 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932615AbcHKPeB (ORCPT ); Thu, 11 Aug 2016 11:34:01 -0400 Received: by mail-wm0-f48.google.com with SMTP id q128so7550323wma.1 for ; Thu, 11 Aug 2016 08:33:55 -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=N/XN3l0IFMQXchVpeIlI8JgNTTw+QZm8MQ0prcTFGPA=; b=hnEFiu9EBiXZ6gDLDd6tKSacdzmdRr2WhC6OHmn2DToK9TWxReB3Wn3VaPWmjcamcf VlTsKtXcUB7u2xQBYKn/SOmheZx9YQXlpOS0sol/qQ6HiFT6xlNWjRNK8dOYuaiAiWhK lH9Xf8WFvnSDs0z7+pcMtVF4WLhBzklhniocs= 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=N/XN3l0IFMQXchVpeIlI8JgNTTw+QZm8MQ0prcTFGPA=; b=b2Y4wwPwQTuJO26xJWE0kqlC51CHTgAjTvxgBJ98qp+pzyAxXRHJ1X5XDu8CWdJDZ3 TU+MpN98AN8iCnlzGJi244uQ9igayMIezaovocyXhKlFDbxRmDp1JY1JYbz+7GY6E1Ef sjoVDyRKjrm8jsnavOuBkXeWXNV6GPgVQsEQ8zQREX5NwYMIpjN7IjJglrxhODXXYAto ppcDc1M5Do1Vj18083ak+KfCdE8uoLYPwDaULUJ/rID5GVF12Af9viNfdl9Sf28Aza5t iMwXiO8V9UuidTWBA5cA7dmNY95SEThzmYmyl8qY2muwxG+axlU0l3blZuWxGN+//DKJ ck2Q== X-Gm-Message-State: AEkoouscKsUeiJlQ0OpNr+pXmjiwZCPXSsms/+fYc1S6dZ3iSiiZuk4SvTGMU9U3MmgFmrW6 X-Received: by 10.25.167.6 with SMTP id q6mr1650042lfe.198.1470929629980; Thu, 11 Aug 2016 08:33:49 -0700 (PDT) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id 78sm192097lfv.39.2016.08.11.08.33.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Aug 2016 08:33:49 -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: Thu, 11 Aug 2016 18:31:41 +0300 Message-Id: <20160811153152.755-5-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160811153152.755-1-aleksey.makarov@linaro.org> References: <20160811153152.755-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 --- drivers/tty/serial/amba-pl011.c | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) -- 2.9.2 -- 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..d6a51cb 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; + + 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,