From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03330C43387 for ; Sat, 12 Jan 2019 08:16:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BEDA021783 for ; Sat, 12 Jan 2019 08:16:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547280998; bh=MRJzkrosj38Z55pRXmQuVWQuvmzgOFyBj+f0xMV3Vec=; h=From:To:Cc:Subject:Date:List-ID:From; b=ruBwX0WA+Jow/PfiW/TV1gA8hj9LzNCd7XoeU0Aacc+0R+zHtIHvcietxxxCHA3FP 1zg4Xei0yw/nnAtf/QPiWONkcQdOKXasc9JIpqvPY27xMdraC0wEqcbTmPH7+E7CSQ hknYX9OUHS0lwSM4SthE1xTEDBD7Z0RtKfzx6Y60= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725857AbfALIQg (ORCPT ); Sat, 12 Jan 2019 03:16:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:52530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725816AbfALIQg (ORCPT ); Sat, 12 Jan 2019 03:16:36 -0500 Received: from localhost.localdomain (unknown [115.192.188.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4D21D2086C; Sat, 12 Jan 2019 08:16:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547280996; bh=MRJzkrosj38Z55pRXmQuVWQuvmzgOFyBj+f0xMV3Vec=; h=From:To:Cc:Subject:Date:From; b=tCGRExQmfamGllgyCc1SAGCamRmHe22wWhdsCZt/FgWjaaUgSLdN9VHDb1ed61ORP myMLwUaKOoqBCr1oCPlbG2UOwk6uJOmoZP9/dujsQtMEVrxgBgR8qE5RgjagaqJDzI 5cmza9VaWY3/6AW5OgmtebN+wWC+7782jDLDSDAA= From: guoren@kernel.org To: palmer@sifive.com, aou@eecs.berkeley.edu Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Guo Ren , Mao Han Subject: [PATCH] riscv: fixup max_low_pfn with PFN_DOWN. Date: Sat, 12 Jan 2019 16:16:27 +0800 Message-Id: <1547280987-7630-1-git-send-email-guoren@kernel.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guo Ren max_low_pfn should be pfn_size not byte_size. Signed-off-by: Guo Ren Signed-off-by: Mao Han Cc: Palmer Dabbelt Cc: Albert Ou --- arch/riscv/kernel/setup.c | 2 +- arch/riscv/mm/init.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index fc8006a..5463e67 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -174,7 +174,7 @@ static void __init setup_bootmem(void) BUG_ON(mem_size == 0); set_max_mapnr(PFN_DOWN(mem_size)); - max_low_pfn = memblock_end_of_DRAM(); + max_low_pfn = PFN_DOWN(memblock_end_of_DRAM()); #ifdef CONFIG_BLK_DEV_INITRD setup_initrd(); diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 1d9bfaf..658ebf6 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -28,7 +28,8 @@ static void __init zone_sizes_init(void) unsigned long max_zone_pfns[MAX_NR_ZONES] = { 0, }; #ifdef CONFIG_ZONE_DMA32 - max_zone_pfns[ZONE_DMA32] = PFN_DOWN(min(4UL * SZ_1G, max_low_pfn)); + max_zone_pfns[ZONE_DMA32] = PFN_DOWN(min(4UL * SZ_1G, + (unsigned long) PFN_PHYS(max_low_pfn))); #endif max_zone_pfns[ZONE_NORMAL] = max_low_pfn; -- 2.7.4