From patchwork Tue Nov 17 09:40:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 56749 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1827817lbb; Tue, 17 Nov 2015 01:49:43 -0800 (PST) X-Received: by 10.140.132.139 with SMTP id 133mr43669228qhe.49.1447753783834; Tue, 17 Nov 2015 01:49:43 -0800 (PST) Return-Path: Received: from lists.xen.org (lists.xenproject.org. [50.57.142.19]) by mx.google.com with ESMTPS id 34si29243080qkv.5.2015.11.17.01.49.43 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Nov 2015 01:49:43 -0800 (PST) Received-SPF: neutral (google.com: 50.57.142.19 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=50.57.142.19; Authentication-Results: mx.google.com; spf=neutral (google.com: 50.57.142.19 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZycsN-0007qT-2j; Tue, 17 Nov 2015 09:48:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZycsL-0007oe-Ao for xen-devel@lists.xen.org; Tue, 17 Nov 2015 09:48:33 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 01/61-26043-0F7FA465; Tue, 17 Nov 2015 09:48:32 +0000 X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1447753709!3770616!1 X-Originating-IP: [74.125.82.49] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.19.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43946 invoked from network); 17 Nov 2015 09:48:29 -0000 Received: from mail-wm0-f49.google.com (HELO mail-wm0-f49.google.com) (74.125.82.49) by server-14.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 17 Nov 2015 09:48:29 -0000 Received: by wmvv187 with SMTP id v187so217976531wmv.1 for ; Tue, 17 Nov 2015 01:48:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z8zRbvcWFeWZJoDb1KWRPT4YuiNzozQTEjgGNR+g9gA=; b=l08YUq+ItIrZFSY3n/VMVvZffmkgHpHDEEsSKTqU0MBpO9MQXgp/KOVz0yz23PIpEJ +nhTTVPA2SmEbsHve4IKeVOINE9/TQeZX+JMa2FX1abQ4NpcnOeNxt5Wxf5uW020eaOh m7SS95pGzqRy4Oi9ZJ1hzERvAFAc8ynJk8yaPq64XmNid5Ufq4UBtCCOUm7mWPS0hWlj khsET+FFcaUea4fxyDU3tf0XXKJCM5RIw/z6kVDY3wlfaGfFKvDzzQoTgCTRVyrFwSLv vDMyPCZaNpHNUlOCodYtYoVlfb7iYtEhXH/30GcU6Uy63vG+5CxBYHUj7vSynuT8yJDR t9bw== 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=z8zRbvcWFeWZJoDb1KWRPT4YuiNzozQTEjgGNR+g9gA=; b=NUgSe5mV5yTcxmmL7+2jtJJ+z+BmINFHnAzVIbSRS8K0QHJ9+rZdQM7QW2ZO+dorKv Hjw78tkR21u496Y7qA6sEfUGiYWATAwMYDXn2QLixBi/RbfOQ0IxWpBFgxYDR4fjgH08 J6gOvfS7vNiLxftFCdmB+HUbqC//mFyCXrMfoTz32Njr5O7FDadrGarwZ2i+UNzC5eqE f3GeDRlptOpQ15g9BwNzJBXlEEvgkUwL/RavTpYMR8DaIgbYWq4GSZnWkV9GxX6eQgJV 9TXS5MYnMz6dwQyRHITL+oxmHDnwYuSF/+yPRiB3UfS5dhWeyncNXyy0jzRlT7XEnSkn 2q7w== X-Gm-Message-State: ALoCoQmUeS8MTseoXEwoLrIBASwdMI8OvcFN42fMPzIUtH0Zww/O7WvZdVCnULULb71tQMiBvO1J X-Received: by 10.28.23.211 with SMTP id 202mr1419167wmx.81.1447753709593; Tue, 17 Nov 2015 01:48:29 -0800 (PST) Received: from localhost ([78.129.251.54]) by smtp.gmail.com with ESMTPSA id z66sm9811172wmz.7.2015.11.17.01.48.26 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Nov 2015 01:48:28 -0800 (PST) From: shannon.zhao@linaro.org To: ian.campbell@citrix.com, stefano.stabellini@citrix.com, keir@xen.org, jbeulich@suse.com, andrew.cooper3@citrix.com, julien.grall@citrix.com, xen-devel@lists.xen.org Date: Tue, 17 Nov 2015 17:40:50 +0800 Message-Id: <1447753261-7552-52-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1447753261-7552-1-git-send-email-shannon.zhao@linaro.org> References: <1447753261-7552-1-git-send-email-shannon.zhao@linaro.org> Cc: mark.rutland@arm.com, hangaohuai@huawei.com, ard.biesheuvel@linaro.org, shannon.zhao@linaro.org, christoffer.dall@linaro.org, peter.huangpeng@huawei.com, david.vrabel@citrix.com, zhaoshenglong@huawei.com, linux-arm-kernel@lists.infradead.org, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v3 51/62] arm/acpi: Prepare EFI system table for Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org From: Shannon Zhao Signed-off-by: Parth Dixit Signed-off-by: Shannon Zhao --- xen/arch/arm/domain_build.c | 2 ++ xen/common/efi/boot.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/setup.h | 3 +++ 3 files changed, 69 insertions(+) -- 2.1.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index da4e271..9d667ea 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1735,6 +1735,8 @@ static int prepare_acpi(struct domain *d, struct kernel_info *kinfo) return rc; acpi_map_rest_tables(d); + acpi_create_efi_system_table(d->arch.efi_acpi_gpa, d->arch.efi_acpi_table, + tbl_add); return 0; } diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 6a48624..75835ae 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1192,6 +1192,70 @@ int __init estimate_efi_size(int mem_nr_banks) return size; } + +static uint32_t __init xz_crc32(uint8_t *buf, size_t size, uint32_t crc) +{ + uint32_t xz_crc32_table[256]; + const uint32_t poly = 0xEDB88320; + uint32_t i; + uint32_t j; + uint32_t r; + + for (i = 0; i < 256; ++i) { + r = i; + for (j = 0; j < 8; ++j) + r = (r >> 1) ^ (poly & ~((r & 1) - 1)); + + xz_crc32_table[i] = r; + } + + crc = ~crc; + while (size != 0) { + crc = xz_crc32_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8); + --size; + } + + return ~crc; +} + +void __init acpi_create_efi_system_table(paddr_t paddr, void *efi_acpi_table, + struct membank tbl_add[]) +{ + u64 table_addr, table_size, offset = 0; + u8 *base_ptr; + EFI_CONFIGURATION_TABLE *efi_conf_tbl; + EFI_SYSTEM_TABLE *efi_sys_tbl; + EFI_SYSTEM_TABLE *est = (EFI_SYSTEM_TABLE *)maddr_to_virt(efi.est); + + table_addr = paddr + acpi_get_table_offset(tbl_add, TBL_EFIT); + table_size = sizeof(EFI_SYSTEM_TABLE) + sizeof(EFI_CONFIGURATION_TABLE) + + sizeof(XEN_EFI_FW_VENDOR); + base_ptr = efi_acpi_table + acpi_get_table_offset(tbl_add, TBL_EFIT); + efi_sys_tbl = (EFI_SYSTEM_TABLE *)base_ptr; + + memcpy((EFI_TABLE_HEADER *)&(efi_sys_tbl->Hdr), + (EFI_TABLE_HEADER *)&(est->Hdr), sizeof(EFI_TABLE_HEADER)); + efi_sys_tbl->Hdr.HeaderSize = table_size; + + efi_sys_tbl->FirmwareRevision = est->FirmwareRevision; + efi_sys_tbl->NumberOfTableEntries = 1; + offset += sizeof(EFI_SYSTEM_TABLE); + memcpy((u16 *)(base_ptr + offset), XEN_EFI_FW_VENDOR, + sizeof(XEN_EFI_FW_VENDOR)); + efi_sys_tbl->FirmwareVendor = (CHAR16 *)(table_addr + offset); + + offset += sizeof(XEN_EFI_FW_VENDOR); + efi_conf_tbl = (EFI_CONFIGURATION_TABLE *)(base_ptr + offset); + efi_conf_tbl->VendorGuid = (EFI_GUID)ACPI_20_TABLE_GUID; + efi_conf_tbl->VendorTable = (VOID *)tbl_add[TBL_RSDP].start; + efi_sys_tbl->ConfigurationTable = (EFI_CONFIGURATION_TABLE *)(table_addr + + offset); + efi_sys_tbl->Hdr.CRC32 = xz_crc32((uint8_t *)efi_sys_tbl, + efi_sys_tbl->Hdr.HeaderSize, 0); + + tbl_add[TBL_EFIT].start = table_addr; + tbl_add[TBL_EFIT].size = table_size; +} #endif #ifndef CONFIG_ARM /* TODO - runtime service support */ diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index b759813..2d65796 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -53,6 +53,9 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); int estimate_efi_size(int mem_nr_banks); +void acpi_create_efi_system_table(paddr_t paddr, void *efi_acpi_table, + struct membank tbl_add[]); + int construct_dom0(struct domain *d); void discard_initial_modules(void);