From patchwork Fri Apr 1 15:48:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8726071 Return-Path: X-Original-To: patchwork-xen-devel@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 4201E9F3D1 for ; Fri, 1 Apr 2016 15:52:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 40F9E20411 for ; Fri, 1 Apr 2016 15:52:37 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 055AA203FB for ; Fri, 1 Apr 2016 15:52:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1am1Kd-0003yu-Qx; Fri, 01 Apr 2016 15:49:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1am1Kc-0003yk-4R for xen-devel@lists.xen.org; Fri, 01 Apr 2016 15:49:54 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id B2/B5-02984-1A89EF65; Fri, 01 Apr 2016 15:49:53 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsVyMfSOlu6CGf/ CDK7eM7JY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDMebfnAXNArW9Gz+wJbA+MxiS5GLg4hgYmM EpPvbWQCcVgE5jFLLLwwhRnEkRDoZ5XonLwByOEEcmIkZh5ZywhhV0tc3rwQLC4koCax7PBCZ ohRTxgllp3rZQVJsAnoSLyYtJOti5GDQ0TAQ2LPx1qQGmaBOcwSTf92gg0SFrCW+NezAMxmEV CVuPXlLpjNK+Au0bDpJhvEMjmJ88d/gi3jBJoz+d8rFojF7hIPZ81in8AosICRYRWjenFqUVl qka6FXlJRZnpGSW5iZo6uoaGJXm5qcXFiempOYlKxXnJ+7iZGYGgxAMEOxo2TnA8xSnIwKYny Gk77FybEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgrdoOlBOsCg1PbUiLTMHGOQwaQkOHiUR3lqQN G9xQWJucWY6ROoUozHHlt/X1jJxbJt6by2TEEtefl6qlDhvKEipAEhpRmke3CBY9F1ilJUS5m UEOk2IpyC1KDezBFX+FaM4B6OSMMQ9PJl5JXD7XgGdwgR0Soc02CkliQgpqQZGyzmnptz4l2z 3jTdj0pTyx6y5+kzvpn1SSfftP2IsMnnjAUupffuPHM6bIXH507lH3f4shSXuy86pOgt7zTjX 8aHF5lTDzY1OClctCpMUfKpsJT7bTNBOyRaV3JGx4+XHaeabpT+/6Vz7Yf2XhZ+yr34U5nsV5 n3Q52HjXrO4qu13lfV+nVJeq8RSnJFoqMVcVJwIAOwOUha5AgAA X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-5.tower-27.messagelabs.com!1459525791!35120010!1 X-Originating-IP: [209.85.220.42] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64620 invoked from network); 1 Apr 2016 15:49:52 -0000 Received: from mail-pa0-f42.google.com (HELO mail-pa0-f42.google.com) (209.85.220.42) by server-5.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 1 Apr 2016 15:49:52 -0000 Received: by mail-pa0-f42.google.com with SMTP id td3so93456242pab.2 for ; Fri, 01 Apr 2016 08:49:52 -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=y/lEk7UzO27pLJg6dY5OnItMxVn+UBhXuSCwA8FTbsM=; b=H/D+IEOqUBfA6gvBsbV+gd7d3GwbD5htvp8g6tJOr+QMCP3eyLW5DxtJtKQLnTpWj7 SEBwDi/jOm8hJP2WNcvTYX0exhxBf4Vtf4V1hRG+0Obmq52P+mDDJ9KoMoPAHur71XNS dmssImk2OAduvNlBb2QKtprQx1MULPO876uAE= 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=y/lEk7UzO27pLJg6dY5OnItMxVn+UBhXuSCwA8FTbsM=; b=kVE8YJ+NtxnNFNk2LmCisCjXKPST89Enr/d8T8qkqnc02nzT+s6EAZkY1vejkiqSgT 5E0qyM6g6qr8ETu7gb6zHU45qCbSnxW1Eqe4taAhwEO+QqFC4VKkR3zzLDQ5Oc3tfy2T WCl+IMH1ZkzQUksib9UhOa2Gh4Il9xR0yuaHWkP7tvx+clNDZqOe1l5PpQWge0u1CT/R zqo2njYnVlcb4WVcSWw/q35NQdqgGbXTJuoROBpUDSPCIeDVue0cQyQUIIJKfDtu2SK9 B1MdiYTHReuYhF22Pm0YjQ3cG46XlGk/vSJUKpd/S1VYYrJyqAT34JIc+SeT0/GQImUy 1aIw== X-Gm-Message-State: AD7BkJL+7qcTvdeZ8NimctkjKN7zN1t3ybQEkzg+vpZH41lfABffZ6eUeTk3mrHyPyr1e6CD X-Received: by 10.66.131.79 with SMTP id ok15mr32381372pab.151.1459525790881; Fri, 01 Apr 2016 08:49:50 -0700 (PDT) Received: from localhost.localdomain ([167.160.116.218]) by smtp.gmail.com with ESMTPSA id yj1sm22536791pac.16.2016.04.01.08.49.41 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2016 08:49:49 -0700 (PDT) From: Shannon Zhao To: linux-arm-kernel@lists.infradead.org, stefano.stabellini@citrix.com Date: Fri, 1 Apr 2016 23:48:59 +0800 Message-Id: <1459525755-36968-2-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459525755-36968-1-git-send-email-shannon.zhao@linaro.org> References: <1459525755-36968-1-git-send-email-shannon.zhao@linaro.org> Cc: devicetree@vger.kernel.org, linux-efi@vger.kernel.org, "Rafael J. Wysocki" , catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, peter.huangpeng@huawei.com, "open list:ACPI" , julien.grall@arm.com, david.vrabel@citrix.com, zhaoshenglong@huawei.com, xen-devel@lists.xen.org, Len Brown , shannon.zhao@linaro.org Subject: [Xen-devel] [PATCH v10 01/17] Xen: ACPI: Hide UART used by Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, 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 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 | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 5f28cf7..4d2d9eb 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,44 @@ 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 && acpi_has_method(handle, METHOD_NAME__CRS))) + return false; + + /* + * The UART device described in SPCR table is assumed to have only one + * memory resource present. So we only look for the first one here. + */ + 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 @%pa in SPCR table will be hidden\n", + &res.start); + return true; + } + + return false; +} + static int acpi_bus_type_and_status(acpi_handle handle, int *type, unsigned long long *sta) { @@ -1466,6 +1505,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 +1958,24 @@ static int acpi_bus_scan_fixed(void) return result < 0 ? result : 0; } +static void __init 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 +1991,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.