From patchwork Fri Jun 21 20:24:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 11010717 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B4528924 for ; Fri, 21 Jun 2019 20:26:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A63A928B8B for ; Fri, 21 Jun 2019 20:26:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97DC028BA5; Fri, 21 Jun 2019 20:26:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2C31128B8B for ; Fri, 21 Jun 2019 20:26:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1heQ4y-0005CV-MU; Fri, 21 Jun 2019 20:24:12 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1heQ4x-0005CD-7G for xen-devel@lists.xenproject.org; Fri, 21 Jun 2019 20:24:11 +0000 X-Inumbo-ID: 86b2d91a-9462-11e9-95b8-af25c1a2abbd Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 86b2d91a-9462-11e9-95b8-af25c1a2abbd; Fri, 21 Jun 2019 20:24:10 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.xilinx.com (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 460992084E; Fri, 21 Jun 2019 20:24:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561148649; bh=nmMBhSQIbEAo+yHLesSyhzfGXA5KVkjU5E+/GIc69wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=if0S6FVwhji3Ngao0/GQrZ5Vbdc8ijV2X1dsSk5PqWAjlj62ra+8oQxowjs8Qb2WX qcEOU/Ln5Xvy2JEdOFN9gqzw9F4YRemYHXqEVR6t78HlqPwTEKXDXL/RE4y4qeuQBM QLUms/i+NcgqD2a19pigmMKSN1RVf8oobIDegetY= From: Stefano Stabellini To: xen-devel@lists.xenproject.org Date: Fri, 21 Jun 2019 13:24:06 -0700 Message-Id: <20190621202407.7781-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Subject: [Xen-devel] [PATCH v5 1/2] xen: Replace u64 with uint64_t in pdx_init_mask() and callers X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: andrew.cooper3@citrix.com, julien.grall@arm.com, sstabellini@kernel.org, JBeulich@suse.com, Stefano Stabellini MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Xen is phasing out the use of u64 in favor of uint64_t. Therefore, the instance of u64 in the pdx_init_mask() (and the callers) are now replaced with uint64_t. Take the opportunity to also modify srat_region_mask as this is used to store the result of pdx_init_mask(). Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich CC: JBeulich@suse.com CC: andrew.cooper3@citrix.com CC: julien.grall@arm.com --- Changes in v5: - new commit message --- xen/arch/arm/setup.c | 2 +- xen/arch/x86/srat.c | 2 +- xen/common/pdx.c | 2 +- xen/include/xen/pdx.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 4156c0ebb3..d5d188a105 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -484,7 +484,7 @@ static void __init init_pdx(void) { paddr_t bank_start, bank_size, bank_end; - u64 mask = pdx_init_mask(bootinfo.mem.bank[0].start); + uint64_t mask = pdx_init_mask(bootinfo.mem.bank[0].start); int bank; for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 2d70b45909..47a4267220 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -401,7 +401,7 @@ static int __init nodes_cover_memory(void) void __init acpi_numa_arch_fixup(void) {} -static u64 __initdata srat_region_mask; +static uint64_t __initdata srat_region_mask; static int __init srat_parse_region(struct acpi_subtable_header *header, const unsigned long end) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index bb7e437049..8356f03ce8 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -50,7 +50,7 @@ static u64 __init fill_mask(u64 mask) return mask; } -u64 __init pdx_init_mask(u64 base_addr) +uint64_t __init pdx_init_mask(uint64_t base_addr) { return fill_mask(base_addr - 1); } diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index a151aac1a2..770fadc06c 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -13,7 +13,7 @@ extern unsigned long pfn_top_mask, ma_top_mask; (sizeof(*frame_table) & -sizeof(*frame_table))) extern unsigned long pdx_group_valid[]; -extern u64 pdx_init_mask(u64 base_addr); +extern uint64_t pdx_init_mask(u64 base_addr); extern u64 pdx_region_mask(u64 base, u64 len); extern void set_pdx_range(unsigned long smfn, unsigned long emfn);