Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: MBqbzWLwu3+0tOVvw/gbAjFxBQ7WkHMitFCxHQrObE8Vlos/qhyihg3+4k/g5J0uq+13gkMpV2
 hbT/EIS12qAQfglQZKkpJxjeyTXUyVEBDeXupu2uArcTxFO57KttwM1z8IDASYMTFZqAFEuaDj
 6PhEOD9//NQtHM5EPs9LkUzITMONckybIAX0frzUpZ6pUp6ZGWXM/EbP8iNu9L2uiqYrpUqCib
 Qiz09PUYE6+8mqGK2LEns22wWt7AQQkzHjnfthfXEZ+Qmd++Ustliw0v9BdGDf7mzYLqtKXu+u
 AJI=
IronPort-SDR: B5mmnYotYoHoJWTllCVoF3OCWyZuHY+PMTjhxeL3Kt6GCqwppWMdnzwMNf2mGcIyI6BjNtfPUC
 FYQBApjTU+hA+NLVM5ZwDspGj5ydywl1U=
IronPort-SDR: E0hQIX7CydO5HGsevPgVvucJmOwMETCcCXqbbTiK7oZt6znBE0XEHaqeqCDlPrG9tXKWpG8heY
 QC3A6nrTbKlQ==
WDCIronportException: Internal
From:   Atish Patra <atish.patra@wdc.com>
To:     linux-kernel@vger.kernel.org
Cc:     Atish Patra <atish.patra@wdc.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Anup Patel <anup.patel@wdc.com>,
        Greentime Hu <greentime.hu@sifive.com>,
        linux-riscv@lists.infradead.org,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Sudeep Holla <sudeep.holla@arm.com>,
        Vincent Chen <vincent.chen@sifive.com>,
        Zong Li <zong.li@sifive.com>
Subject: [PATCH 2/4] RISC-V: Set maximum number of mapped pages correctly
Date:   Wed, 15 Jul 2020 16:30:07 -0700
Message-Id: <20200715233009.27183-3-atish.patra@wdc.com>
In-Reply-To: <20200715233009.27183-1-atish.patra@wdc.com>
References: <20200715233009.27183-1-atish.patra@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Currently, maximum number of mapper pages are set to the pfn calculated
from the memblock size of the memblock containing kernel. This will work
until that memblock spans the entire memory. However, it will be set to
a wrong value if there are multiple memblocks defined in kernel
(e.g. with efi runtime services).

Set the the maximum value to the pfn calculated from dram size.

Signed-off-by: Atish Patra <atish.patra@wdc.com>
---
 arch/riscv/mm/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index f4adb3684f3d..8d22973bde40 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -150,9 +150,9 @@ void __init setup_bootmem(void)
 	/* Reserve from the start of the kernel to the end of the kernel */
 	memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start);
 
-	set_max_mapnr(PFN_DOWN(mem_size));
 	max_pfn = PFN_DOWN(memblock_end_of_DRAM());
 	max_low_pfn = max_pfn;
+	set_max_mapnr(max_low_pfn);
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	setup_initrd();
-- 
2.24.0