From owner-svn-src-all@freebsd.org Tue Mar 1 12:50:25 2016 Return-Path: Delivered-To: svn-src-all@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 9E210ABD454; Tue, 1 Mar 2016 12:50:25 +0000 (UTC) (envelope-from wma@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 50192153F; Tue, 1 Mar 2016 12:50:25 +0000 (UTC) (envelope-from wma@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u21CoO3U073378; Tue, 1 Mar 2016 12:50:24 GMT (envelope-from wma@FreeBSD.org) Received: (from wma@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u21CoOo4073377; Tue, 1 Mar 2016 12:50:24 GMT (envelope-from wma@FreeBSD.org) Message-Id: <201603011250.u21CoOo4073377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wma set sender to wma@FreeBSD.org using -f From: Wojciech Macek Date: Tue, 1 Mar 2016 12:50:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296266 - head/sys/arm64/arm64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2016 12:50:25 -0000 Author: wma Date: Tue Mar 1 12:50:24 2016 New Revision: 296266 URL: https://svnweb.freebsd.org/changeset/base/296266 Log: Get memory ranges from FDT if no EFI API is available on ARM64 Obtained from: Semihalf Submitted by: Michal Stanek Sponsored by: Annapurna Labs Approved by: cognet (mentor) Reviewed by: andrew, wma Differential revision: https://reviews.freebsd.org/D5408 Modified: head/sys/arm64/arm64/machdep.c Modified: head/sys/arm64/arm64/machdep.c ============================================================================== --- head/sys/arm64/arm64/machdep.c Tue Mar 1 11:39:07 2016 (r296265) +++ head/sys/arm64/arm64/machdep.c Tue Mar 1 12:50:24 2016 (r296266) @@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$"); #endif #ifdef FDT +#include #include #endif @@ -668,6 +669,20 @@ add_physmap_entry(uint64_t base, uint64_ return (1); } +#ifdef FDT +static void +add_fdt_mem_regions(struct mem_region *mr, int mrcnt, vm_paddr_t *physmap, + u_int *physmap_idxp) +{ + + for (int i = 0; i < mrcnt; i++) { + if (!add_physmap_entry(mr[i].mr_start, mr[i].mr_size, physmap, + physmap_idxp)) + break; + } +} +#endif + #define efi_next_descriptor(ptr, size) \ ((struct efi_md *)(((uint8_t *) ptr) + size)) @@ -807,6 +822,10 @@ initarm(struct arm64_bootparams *abp) { struct efi_map_header *efihdr; struct pcpu *pcpup; +#ifdef FDT + struct mem_region mem_regions[FDT_MEM_REGIONS]; + int mem_regions_sz; +#endif vm_offset_t lastaddr; caddr_t kmdp; vm_paddr_t mem_len; @@ -834,7 +853,18 @@ initarm(struct arm64_bootparams *abp) physmap_idx = 0; efihdr = (struct efi_map_header *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP); - add_efi_map_entries(efihdr, physmap, &physmap_idx); + if (efihdr != NULL) + add_efi_map_entries(efihdr, physmap, &physmap_idx); +#ifdef FDT + else { + /* Grab physical memory regions information from device tree. */ + if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, + NULL) != 0) + panic("Cannot get physical memory regions"); + add_fdt_mem_regions(mem_regions, mem_regions_sz, physmap, + &physmap_idx); + } +#endif /* Print the memory map */ mem_len = 0;