From owner-svn-src-projects@freebsd.org Mon Sep 18 18:44:46 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FDC0E25715 for ; Mon, 18 Sep 2017 18:44:46 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13359762D5; Mon, 18 Sep 2017 18:44:46 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8IIijZN095934; Mon, 18 Sep 2017 18:44:45 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8IIij0e095933; Mon, 18 Sep 2017 18:44:45 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201709181844.v8IIij0e095933@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Mon, 18 Sep 2017 18:44:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323713 - projects/powernv/powerpc/ofw X-SVN-Group: projects X-SVN-Commit-Author: nwhitehorn X-SVN-Commit-Paths: projects/powernv/powerpc/ofw X-SVN-Commit-Revision: 323713 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2017 18:44:46 -0000 Author: nwhitehorn Date: Mon Sep 18 18:44:45 2017 New Revision: 323713 URL: https://svnweb.freebsd.org/changeset/base/323713 Log: Work around yet another kexec-lite bug: no reserved entry is added for the memory of the FDT itself. This is at worst redundant, and at best works around buggy bootloaders. Modified: projects/powernv/powerpc/ofw/ofw_machdep.c Modified: projects/powernv/powerpc/ofw/ofw_machdep.c ============================================================================== --- projects/powernv/powerpc/ofw/ofw_machdep.c Mon Sep 18 18:42:28 2017 (r323712) +++ projects/powernv/powerpc/ofw/ofw_machdep.c Mon Sep 18 18:44:45 2017 (r323713) @@ -65,6 +65,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + static void *fdt; int ofw_real_mode; @@ -240,8 +242,17 @@ excise_fdt_reserved(struct mem_region *avail, int asz) fdtmapsize = OF_getprop(chosen, "fdtmemreserv", fdtmap, sizeof(fdtmap)); for (j = 0; j < fdtmapsize/sizeof(fdtmap[0]); j++) { - fdtmap[j].address = be64toh(fdtmap[j].address); - fdtmap[j].size = be64toh(fdtmap[j].size); + fdtmap[j].address = be64toh(fdtmap[j].address) & ~PAGE_MASK; + fdtmap[j].size = round_page(be64toh(fdtmap[j].size)); + } + + KASSERT(j*sizeof(fdtmap[0]) < sizeof(fdtmap), + ("Exceeded number of FDT reservations")); + /* Add a virtual entry for the FDT itself */ + if (fdt != NULL) { + fdtmap[j].address = (uint64_t)fdt & ~PAGE_MASK; + fdtmap[j].size = round_page(fdt_totalsize(fdt)); + fdtmapsize += sizeof(fdtmap[0]); } for (i = 0; i < asz; i++) {