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: 64863 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp810614lbc; Fri, 1 Apr 2016 08:50:00 -0700 (PDT) X-Received: by 10.157.4.39 with SMTP id 36mr6180748otc.195.1459525799730; Fri, 01 Apr 2016 08:49:59 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 64si7825262otf.192.2016.04.01.08.49.59; Fri, 01 Apr 2016 08:49:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-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-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-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 S1759225AbcDAPtx (ORCPT + 5 others); Fri, 1 Apr 2016 11:49:53 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33283 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753618AbcDAPtv (ORCPT ); Fri, 1 Apr 2016 11:49:51 -0400 Received: by mail-pa0-f52.google.com with SMTP id zm5so93963448pac.0 for ; Fri, 01 Apr 2016 08:49:51 -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=OqlDmKtTtuFcoca14T/cMNV0tJB4OzyGGN6Fl4WDpRyiGdGrg2CoIt67YMKdvH19ql pfj9oaxhmWWf8K135YhlZQLtWDB5gZMBkCL/WBzC4//TpSumgc2X25gJBwAvDaOQQOLe wqBsDEt0H4l4jUAX82bXgWy752MVFWgNyj+7ET7BCAFwVl1pv8R8lq3RLnKUI2qhaWJ8 kfuAVyUEGP0Cvx/+opqF459l3JG6C7RQHeSycl5Y+/BzB6Y9Yc9vdGQhLCQCK3V9M4AR 8dhmjoikJORbYGd+BAOYz3dyEAu9djxARjF2SONApHuOcuIxPvJMgY+I1jDbI4K37Kj3 D7YA== X-Gm-Message-State: AD7BkJIayg30j4/8DWTxucaeF7Acc6TOz2R2DWLsn0BvmXNLZGY97BqkQfkU7NtvSTuEGdK6 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 Cc: david.vrabel@citrix.com, 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 v10 01/17] Xen: ACPI: Hide UART used by Xen 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> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@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 | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" 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/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.