From patchwork Sun Feb 28 06:58:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 589495 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 70EB21402BF for ; Sun, 28 Feb 2016 17:56:11 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=zJjcS7aw; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1243FA788C; Sun, 28 Feb 2016 07:55:41 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K_rvtpuvMZ_v; Sun, 28 Feb 2016 07:55:40 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E0CB3A7887; Sun, 28 Feb 2016 07:55:11 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 72EFAA760F for ; Sun, 28 Feb 2016 07:55:00 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B5bSAkqQJdQC for ; Sun, 28 Feb 2016 07:55:00 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by theia.denx.de (Postfix) with ESMTPS id 0D528A74C6 for ; Sun, 28 Feb 2016 07:54:55 +0100 (CET) Received: by mail-pf0-f181.google.com with SMTP id t66so7848200pfb.3 for ; Sat, 27 Feb 2016 22:54:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=zHZVaIwBKDQA8eypew1v20YdkK4qXVVC5cN61beRyxI=; b=zJjcS7awDpoi3gaGBDhgkmcQd9qKrKzuPiAk5lraevIWSMZ5UcRTj9gkEAWTLsSEbl 6MY1KekXIDQYxUZIGVK1bIic/FXxUW6HYnaGXVnVafIJlnh7/7/ajOrHebBPoUcK+aQD HT/NTv4mUhS446ICuWXG1B595PJtnOX+ceeoXWQwe0UKnC98MaH0uQhleUubsce642YM vvvyzDKBBESP/tQPi6WuFE6D7ymjGZoklD7OHCLZnI09HCq9tQPZJTW70gYbF+U6gmIp FxeJoGR8Ld0Ad9PykqTzNvmAqG5TzBImKu8gcrlTaFZy3cORFPjlCPUW2rx4ERXqmFPZ 7vYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=zHZVaIwBKDQA8eypew1v20YdkK4qXVVC5cN61beRyxI=; b=D86m6Grl18gdtoBLqztkObi0HolYnsqvgq/cC1DGL1pR6taEJD4X6/s8lXfsFOg3zb VwE/CoAWqHICdsIKlUV2LTjAuzplCwAVs7kgvtjuQQb5Fxb8HWxW29QGTQ3T1+2MuNg6 mtWhTaWpCfkOzTtoTT41b3QIrfKFFz+TGIOFvKV+OKT8lapgZi+wusk19ULLtswPw+NY FlgdwJHcu75dDxS7zX9VoWo2ZWDQQ0msi55tl4oml10pAbN7tiME6jvbN7XsyaKIWOqu +Xx/adLMTVT5Yj207PmhtZigKn/IAijuJ8LkcqJkS07Q15ZtN8W1TcGCwFBdvT5MmtQV pi4A== X-Gm-Message-State: AD7BkJJ2bxnUe8Pb17JqpNtuz8bVIpIFvqLgzxYfkIac8Urmg+2yNLi5lxKv0jWrvT72QQ== X-Received: by 10.98.72.70 with SMTP id v67mr14045325pfa.100.1456642494533; Sat, 27 Feb 2016 22:54:54 -0800 (PST) Received: from ala-d2121-lx1.wrs.com (unknown-157-139.windriver.com. [147.11.157.139]) by smtp.gmail.com with ESMTPSA id r5sm29698041pap.7.2016.02.27.22.54.53 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 Feb 2016 22:54:54 -0800 (PST) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Sat, 27 Feb 2016 22:58:00 -0800 Message-Id: <1456642686-18887-7-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1456642686-18887-1-git-send-email-bmeng.cn@gmail.com> References: <1456642686-18887-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH 06/12] x86: Change write_acpi_tables() signature a little bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Change the parameter and return value of write_acpi_tables() to u32 to conform with other table write routines. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/cpu/qemu/fw_cfg.c | 5 ++--- arch/x86/include/asm/acpi_table.h | 2 +- arch/x86/lib/acpi_table.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/cpu/qemu/fw_cfg.c b/arch/x86/cpu/qemu/fw_cfg.c index 5ea7a6e..a0a3d08 100644 --- a/arch/x86/cpu/qemu/fw_cfg.c +++ b/arch/x86/cpu/qemu/fw_cfg.c @@ -232,8 +232,7 @@ static struct fw_file *qemu_fwcfg_find_file(const char *name) * be ignored. * @return: 0 on success, or negative value on failure */ -static int bios_linker_allocate(struct bios_linker_entry *entry, - unsigned long *addr) +static int bios_linker_allocate(struct bios_linker_entry *entry, u32 *addr) { uint32_t size, align; struct fw_file *file; @@ -383,7 +382,7 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) } /* This function loads and patches ACPI tables provided by QEMU */ -unsigned long write_acpi_tables(unsigned long addr) +u32 write_acpi_tables(u32 addr) { int i, ret = 0; struct fw_file *file; diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h index 0853248..9856fa6 100644 --- a/arch/x86/include/asm/acpi_table.h +++ b/arch/x86/include/asm/acpi_table.h @@ -390,4 +390,4 @@ void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, void *dsdt); int acpi_create_madt_lapic_nmi(struct acpi_madt_lapic_nmi *lapic_nmi, u8 cpu, u16 flags, u8 lint); -unsigned long write_acpi_tables(unsigned long start); +u32 write_acpi_tables(u32 start); diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 2ec5ad2..790f6fb 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -335,9 +335,9 @@ static void acpi_create_ssdt_generator(acpi_header_t *ssdt, * QEMU's version of write_acpi_tables is defined in * arch/x86/cpu/qemu/fw_cfg.c */ -unsigned long write_acpi_tables(unsigned long start) +u32 write_acpi_tables(u32 start) { - unsigned long current; + u32 current; struct acpi_rsdp *rsdp; struct acpi_rsdt *rsdt; struct acpi_xsdt *xsdt;