From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 12:14:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DF0A8455; Sun, 3 Nov 2013 12:14:53 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CAFAF2BCA; Sun, 3 Nov 2013 12:14:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3CErHl056869; Sun, 3 Nov 2013 12:14:53 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3CErbK056868; Sun, 3 Nov 2013 12:14:53 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201311031214.rA3CErbK056868@svn.freebsd.org> From: Andrew Turner Date: Sun, 3 Nov 2013 12:14:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257570 - projects/specific_leg/sys/arm/arm X-SVN-Group: projects 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.14 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: Sun, 03 Nov 2013 12:14:53 -0000 Author: andrew Date: Sun Nov 3 12:14:53 2013 New Revision: 257570 URL: http://svnweb.freebsd.org/changeset/base/257570 Log: Use the FDT data to build dump_avail. Modified: projects/specific_leg/sys/arm/arm/machdep.c Modified: projects/specific_leg/sys/arm/arm/machdep.c ============================================================================== --- projects/specific_leg/sys/arm/arm/machdep.c Sun Nov 3 12:03:41 2013 (r257569) +++ projects/specific_leg/sys/arm/arm/machdep.c Sun Nov 3 12:14:53 2013 (r257570) @@ -776,6 +776,7 @@ makectx(struct trapframe *tf, struct pcb pcb->un_32.pcb32_sp = tf->tf_usr_sp; } +#ifndef FDT /* * Make a standard dump_avail array. Can't make the phys_avail * since we need to do that after we call pmap_bootstrap, but this @@ -816,6 +817,7 @@ arm_dump_avail_init(vm_offset_t ramsize, dump_avail[2] = 0; dump_avail[3] = 0; } +#endif /* * Fake up a boot descriptor table @@ -1244,7 +1246,18 @@ initarm(struct arm_boot_params *abp) /* Grab physical memory regions information from device tree. */ if (fdt_get_reserved_regions(reserved_regions, &reserved_regions_sz) != 0) reserved_regions_sz = 0; - + + /* + * Build the dump_avail table + */ + start = memory_regions[i].mr_start; + end = start + memory_regions[i].mr_size; + + dump_avail[0] = round_page(start); + dump_avail[1] = trunc_page(end); + dump_avail[2] = 0; + dump_avail[3] = 0; + /* * Now exclude all the reserved regions */ @@ -1493,7 +1506,6 @@ initarm(struct arm_boot_params *abp) arm_intrnames_init(); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); - arm_dump_avail_init(memsize, sizeof(dump_avail) / sizeof(dump_avail[0])); pmap_bootstrap(freemempos, &kernel_l1pt); msgbufp = (void *)msgbufpv.pv_va; msgbufinit(msgbufp, msgbufsize);