From patchwork Thu Mar 24 14:44:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 64370 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp696833lbc; Thu, 24 Mar 2016 07:47:15 -0700 (PDT) X-Received: by 10.98.9.129 with SMTP id 1mr13372774pfj.163.1458830813576; Thu, 24 Mar 2016 07:46:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g4si12680626pat.65.2016.03.24.07.46.53; Thu, 24 Mar 2016 07:46:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756813AbcCXOqu (ORCPT + 29 others); Thu, 24 Mar 2016 10:46:50 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:36276 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752097AbcCXOqR (ORCPT ); Thu, 24 Mar 2016 10:46:17 -0400 Received: by mail-pf0-f169.google.com with SMTP id u190so59574942pfb.3 for ; Thu, 24 Mar 2016 07:46:16 -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=vqrgdKusgrZQm7EtlOTxOYn5ornHIkq3sOHM2Yotw/o=; b=ZJ2RNJd61oIW3vfrY9rN92dR/wr/aK2wbBz4d51fbmA5spZ9OnXhttS9+HfuxMIy0M Jm8CEhQMtgH3KevSC7WuiglPBQPnVvMlYjiFEDSqv6fJJg2O4fZ3nf7MBatVUpxfEHeW Y/Fc/lg5zyCX/kQXU95CMDZdbsew+Y6mbF4N0= 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=vqrgdKusgrZQm7EtlOTxOYn5ornHIkq3sOHM2Yotw/o=; b=A0RyBfeHIpWJ1y6p1grcy9OmiSPgo2NRccAONY2CBXhe0Y0YndYW445+4qWfX1enib 1tK0TiTDhDY39IPhpHaVHEuNJbmpuIL11/7lYpb4gn+3BO0txs4zik4MAgnCTBo39AxR i024GS6w/yIiW1142QbsxzI4hu/gSXeCinmRjzxiRpd4yVbAEaKcXYCN1YsoMNq8jWiU fTG7Onw/OjyisrVQr/iHuybSGV51q7wDlndc0PQguFFqCurVaTuLLI6ezwljZBX6V9ki z+tj9sq8+1meKBOm7fOBjlgC5D/pfS1OUB37tHS1mRrhYq7h0125LKWlvvUrKgIcXgR+ UMrw== X-Gm-Message-State: AD7BkJLgM/zt5NaENjMC+SPndnxtHQV2R3Y/cJwmwCXP2wJaqf8pf0FrRaeY4IHUX7GBUrpp X-Received: by 10.98.70.138 with SMTP id o10mr13379752pfi.123.1458830776334; Thu, 24 Mar 2016 07:46:16 -0700 (PDT) Received: from localhost.localdomain ([104.238.45.135]) by smtp.gmail.com with ESMTPSA id lq10sm10780673pab.36.2016.03.24.07.46.07 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 24 Mar 2016 07:46:15 -0700 (PDT) From: Shannon Zhao To: linux-arm-kernel@lists.infradead.org, stefano.stabellini@citrix.com, david.vrabel@citrix.com Cc: devicetree@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, julien.grall@arm.com, peter.huangpeng@huawei.com, xen-devel@lists.xen.org, zhaoshenglong@huawei.com, shannon.zhao@linaro.org, "Rafael J. Wysocki" , Len Brown , linux-acpi@vger.kernel.org (open list:ACPI) Subject: [PATCH v7 01/17] Xen: ACPI: Hide UART used by Xen Date: Thu, 24 Mar 2016 22:44:20 +0800 Message-Id: <1458830676-27075-2-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458830676-27075-1-git-send-email-shannon.zhao@linaro.org> References: <1458830676-27075-1-git-send-email-shannon.zhao@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ACPI 6.0 introduces a new table STAO to list the devices which are used by Xen and can't be used by Dom0. On Xen virtual platforms, the physical UART is used by Xen. So here it hides UART from Dom0. CC: "Rafael J. Wysocki" (supporter:ACPI) CC: Len Brown (supporter:ACPI) CC: linux-acpi@vger.kernel.org (open list:ACPI) Signed-off-by: Shannon Zhao --- drivers/acpi/scan.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) -- 2.1.4 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 5f28cf7..e96a058 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -45,6 +45,7 @@ static LIST_HEAD(acpi_scan_handlers_list); DEFINE_MUTEX(acpi_device_lock); LIST_HEAD(acpi_wakeup_device_list); static DEFINE_MUTEX(acpi_hp_context_lock); +static u64 spcr_uart_addr; struct acpi_dep_data { struct list_head node; @@ -1453,6 +1454,41 @@ static int acpi_add_single_object(struct acpi_device **child, return 0; } +static acpi_status acpi_get_resource_memory(struct acpi_resource *ares, + void *context) +{ + struct resource *res = context; + + if (acpi_dev_resource_memory(ares, res)) + return AE_CTRL_TERMINATE; + + return AE_OK; +} + +static bool acpi_device_should_be_hidden(acpi_handle handle) +{ + acpi_status status; + struct resource res; + + /* Check if it should ignore the UART device */ + if (spcr_uart_addr != 0) { + if (!acpi_has_method(handle, METHOD_NAME__CRS)) + return false; + + status = acpi_walk_resources(handle, METHOD_NAME__CRS, + acpi_get_resource_memory, &res); + if (ACPI_FAILURE(status)) + return false; + + if (res.start == spcr_uart_addr) { + printk(KERN_INFO PREFIX "The UART device in SPCR table will be hidden\n"); + return true; + } + } + + return false; +} + static int acpi_bus_type_and_status(acpi_handle handle, int *type, unsigned long long *sta) { @@ -1466,6 +1502,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type, switch (acpi_type) { case ACPI_TYPE_ANY: /* for ACPI_ROOT_OBJECT */ case ACPI_TYPE_DEVICE: + if (acpi_device_should_be_hidden(handle)) + return -ENODEV; + *type = ACPI_BUS_TYPE_DEVICE; status = acpi_bus_get_status_handle(handle, sta); if (ACPI_FAILURE(status)) @@ -1916,9 +1955,24 @@ static int acpi_bus_scan_fixed(void) return result < 0 ? result : 0; } +static void acpi_get_spcr_uart_addr(void) +{ + acpi_status status; + struct acpi_table_spcr *spcr_ptr; + + status = acpi_get_table(ACPI_SIG_SPCR, 0, + (struct acpi_table_header **)&spcr_ptr); + if (ACPI_SUCCESS(status)) + spcr_uart_addr = spcr_ptr->serial_port.address; + else + printk(KERN_WARNING PREFIX "STAO table present, but SPCR is missing\n"); +} + int __init acpi_scan_init(void) { int result; + acpi_status status; + struct acpi_table_stao *stao_ptr; acpi_pci_root_init(); acpi_pci_link_init(); @@ -1934,6 +1988,20 @@ int __init acpi_scan_init(void) acpi_scan_add_handler(&generic_device_handler); + /* + * If there is STAO table, check whether it needs to ignore the UART + * device in SPCR table. + */ + status = acpi_get_table(ACPI_SIG_STAO, 0, + (struct acpi_table_header **)&stao_ptr); + if (ACPI_SUCCESS(status)) { + if (stao_ptr->header.length > sizeof(struct acpi_table_stao)) + printk(KERN_INFO PREFIX "STAO Name List not yet supported."); + + if (stao_ptr->ignore_uart) + acpi_get_spcr_uart_addr(); + } + mutex_lock(&acpi_scan_lock); /* * Enumerate devices in the ACPI namespace.