From patchwork Mon Feb 22 13:46:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 8376541 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 11F9B9F314 for ; Mon, 22 Feb 2016 13:49:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F3AC4204A0 for ; Mon, 22 Feb 2016 13:49:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A5DF020502 for ; Mon, 22 Feb 2016 13:49:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755073AbcBVNtX (ORCPT ); Mon, 22 Feb 2016 08:49:23 -0500 Received: from mail-lf0-f46.google.com ([209.85.215.46]:34616 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755097AbcBVNrs (ORCPT ); Mon, 22 Feb 2016 08:47:48 -0500 Received: by mail-lf0-f46.google.com with SMTP id j78so93760880lfb.1 for ; Mon, 22 Feb 2016 05:47:47 -0800 (PST) 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=UHE5x7Sb+PXvVgdOxYZi5DDo+V4XvqKRqhdYoieec3A=; b=A1P92ln5I/GQSixfpo3TVcvwS8qkk1/X+09lBgutGjgIj0QZ+L/CR73lUxcZToCi0w 4A9DY6PwIvkDWgFWok1Fl3O42mzRcQK91Kxma4dhUqBlHaGiybY+J4d12MMO2vMbcEMj hhHn/R8ZojiDu5xdlfht1m3hgZH9cTRT2YJoE= 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=UHE5x7Sb+PXvVgdOxYZi5DDo+V4XvqKRqhdYoieec3A=; b=RD3VMTBojGK8bcPhvkpIVUG3OnzYYNYCAKFGVoi5k7/EbHHbOAFhBY8yd1iNPcjHFc uMBDhfxAXgWvZNttduiy+gbO5QSu3m+cnuddMBUVcX6y6QXl1iGpXp5qJfLG2Mwqzm2o 5yw1ttHLo93MWzI8HXxOcedrLeRWrqLzlTjipIcTAqvmIlC2x0HRbDd8eCeseQ2wKiF4 ASzqSkoycWk5mxDG6L/12Vuz1rrwYtuJOqzx8aL6Eirg9p7IZEbZVCm1fmtAdJ2klmYX 9MmIT4huZ/YEFwDmCPcyGuujvY+bAE4FY7a9OC1KsjRIXrVbVvQyQMTX3LH3EqHOloLk 4lYw== X-Gm-Message-State: AG10YOQc1Bv+bcKUuon74WctyyaYvzGHrF4bHD7iULKgPKdRjg9ghaK5L8jD0yNMQ9TvtRx3 X-Received: by 10.25.23.24 with SMTP id n24mr10506961lfi.66.1456148866533; Mon, 22 Feb 2016 05:47:46 -0800 (PST) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id s5sm2564633lbr.12.2016.02.22.05.47.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Feb 2016 05:47:45 -0800 (PST) From: Aleksey Makarov To: linux-acpi@vger.kernel.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aleksey Makarov , Russell King , Greg Kroah-Hartman , "Rafael J . Wysocki" , Leif Lindholm , Graeme Gregory , Al Stone , Christopher Covington , Len Brown , Arnd Bergmann , linux-arch@vger.kernel.org Subject: [PATCH 5/8] ACPI: parse DBG2 table Date: Mon, 22 Feb 2016 16:46:53 +0300 Message-Id: <1456148818-26257-6-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456148818-26257-1-git-send-email-aleksey.makarov@linaro.org> References: <1456148818-26257-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-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 'ARM Server Base Boot Requiremets' [1] mentions DBG2 (Microsoft Debug Port Table 2) [2] as a mandatory ACPI table that specifies debug ports. - Implement macros ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) that defines a handler for the port of given type and subtype. - For each declared port that is also described in the ACPI DBG2 table call the provided callback. [1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0044a/index.html [2] http://go.microsoft.com/fwlink/p/?LinkId=234837 Signed-off-by: Aleksey Makarov --- drivers/acpi/Kconfig | 3 ++ drivers/acpi/Makefile | 1 + drivers/acpi/dbg2.c | 85 +++++++++++++++++++++++++++++++++++++++ include/asm-generic/vmlinux.lds.h | 1 + include/linux/acpi_dbg2.h | 48 ++++++++++++++++++++++ 5 files changed, 138 insertions(+) create mode 100644 drivers/acpi/dbg2.c create mode 100644 include/linux/acpi_dbg2.h diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 65fb483..660666e 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -57,6 +57,9 @@ config ACPI_SYSTEM_POWER_STATES_SUPPORT config ACPI_CCA_REQUIRED bool +config ACPI_DBG2_TABLE + bool + config ACPI_DEBUGGER bool "AML debugger interface" select ACPI_DEBUG diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 346101c..ff5e4f0 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -82,6 +82,7 @@ obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o obj-$(CONFIG_ACPI_BGRT) += bgrt.o obj-$(CONFIG_ACPI_CPPC_LIB) += cppc_acpi.o obj-$(CONFIG_ACPI_DEBUGGER_USER) += acpi_dbg.o +obj-$(CONFIG_ACPI_DBG2_TABLE) += dbg2.o # processor has its own "processor." module_param namespace processor-y := processor_driver.o diff --git a/drivers/acpi/dbg2.c b/drivers/acpi/dbg2.c new file mode 100644 index 0000000..8a79117 --- /dev/null +++ b/drivers/acpi/dbg2.c @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2012, Intel Corporation + * Copyright (c) 2015, 2016 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#define pr_fmt(fmt) "ACPI: DBG2: " fmt + +#include +#include +#include + +static const char * __init type2string(u16 type) +{ + switch (type) { + case ACPI_DBG2_SERIAL_PORT: + return "SERIAL"; + case ACPI_DBG2_1394_PORT: + return "1394"; + case ACPI_DBG2_USB_PORT: + return "USB"; + case ACPI_DBG2_NET_PORT: + return "NET"; + default: + return "?"; + } +} + +static const char * __init subtype2string(u16 subtype) +{ + switch (subtype) { + case ACPI_DBG2_16550_COMPATIBLE: + return "16550_COMPATIBLE"; + case ACPI_DBG2_16550_SUBSET: + return "16550_SUBSET"; + case ACPI_DBG2_ARM_PL011: + return "ARM_PL011"; + case ACPI_DBG2_ARM_SBSA_32BIT: + return "ARM_SBSA_32BIT"; + case ACPI_DBG2_ARM_SBSA_GENERIC: + return "ARM_SBSA_GENERIC"; + case ACPI_DBG2_ARM_DCC: + return "ARM_DCC"; + case ACPI_DBG2_BCM2835: + return "BCM2835"; + default: + return "?"; + } +} + +int __init acpi_dbg2_setup(struct acpi_table_header *table, const void *data) +{ + struct acpi_table_dbg2 *dbg2 = (struct acpi_table_dbg2 *)table; + struct acpi_dbg2_data *dbg2_data = (struct acpi_dbg2_data *)data; + struct acpi_dbg2_device *dbg2_device, *dbg2_end; + int i; + + dbg2_device = ACPI_ADD_PTR(struct acpi_dbg2_device, dbg2, + dbg2->info_offset); + dbg2_end = ACPI_ADD_PTR(struct acpi_dbg2_device, dbg2, table->length); + + for (i = 0; i < dbg2->info_count; i++) { + if (dbg2_device + 1 > dbg2_end) { + pr_err("device pointer overflows, bad table\n"); + return 0; + } + + if (dbg2_device->port_type == dbg2_data->port_type && + dbg2_device->port_subtype == dbg2_data->port_subtype) { + pr_info("debug port type: %s subtype: %s\n", + type2string(dbg2_device->port_type), + subtype2string(dbg2_device->port_subtype)); + dbg2_data->setup(dbg2_device, dbg2_data->data); + } + + dbg2_device = ACPI_ADD_PTR(struct acpi_dbg2_device, dbg2_device, + dbg2_device->length); + } + + return 0; +} diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index c4bd0e2..ad9752c 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -526,6 +526,7 @@ IRQCHIP_OF_MATCH_TABLE() \ ACPI_PROBE_TABLE(irqchip) \ ACPI_PROBE_TABLE(clksrc) \ + ACPI_PROBE_TABLE(dbg2) \ EARLYCON_TABLE() \ EARLYCON_OF_TABLES() diff --git a/include/linux/acpi_dbg2.h b/include/linux/acpi_dbg2.h new file mode 100644 index 0000000..465afcb --- /dev/null +++ b/include/linux/acpi_dbg2.h @@ -0,0 +1,48 @@ +#ifndef _ACPI_DBG2_H_ +#define _ACPI_DBG2_H_ + +#ifdef CONFIG_ACPI_DBG2_TABLE + +#include + +struct acpi_dbg2_device; +struct acpi_table_header; + +struct acpi_dbg2_data { + u16 port_type; + u16 port_subtype; + int (*setup)(struct acpi_dbg2_device *, void *); + void *data; +}; + +int acpi_dbg2_setup(struct acpi_table_header *header, const void *data); + +/* + * ACPI_DBG2_DECLARE() - Define handler for ACPI DBG2 port + * @name: Identifier to compose name of table data + * @type: Type of the port + * @subtype: Subtype of the port + * @setup_fn: Function to be called to setup the port + * (of type int (*)(struct acpi_dbg2_device *, void *);) + * @data_ptr: Sideband data provided back to the driver + */ +#define ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) \ + static const struct acpi_dbg2_data \ + __acpi_dbg2_data_##name __used = { \ + .port_type = type, \ + .port_subtype = subtype, \ + .setup = setup_fn, \ + .data = data_ptr, \ + }; \ + ACPI_DECLARE_PROBE_ENTRY(dbg2, name, ACPI_SIG_DBG2, \ + acpi_dbg2_setup, &__acpi_dbg2_data_##name) + +#else + +#define ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) \ + static const void *__acpi_dbg_data_##name[] \ + __used __initdata = { (void *)setup_fn, (void *)data_ptr } + +#endif + +#endif