Date: Tue, 1 Mar 2016 11:39:08 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296265 - in head/sys: arm/arm dev/fdt mips/beri Message-ID: <201603011139.u21Bd8Xo053217@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Tue Mar 1 11:39:07 2016 New Revision: 296265 URL: https://svnweb.freebsd.org/changeset/base/296265 Log: Make the memory size returned from fdt_get_mem_regions a 64-bit type. This is the physical memory size so may be larger than a u_long can hold, e.g. on ARM with LPAE we could see an address space of up to 40 bits. On ARM u_long is only 32 bits so the memory size will be truncated, possibly to zero. Reported by: bz Sponsored by: ABT Systems Ltd Modified: head/sys/arm/arm/machdep.c head/sys/dev/fdt/fdt_common.c head/sys/dev/fdt/fdt_common.h head/sys/mips/beri/beri_machdep.c Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Tue Mar 1 11:36:10 2016 (r296264) +++ head/sys/arm/arm/machdep.c Tue Mar 1 11:39:07 2016 (r296265) @@ -1443,7 +1443,7 @@ initarm(struct arm_boot_params *abp) struct pv_addr kernel_l1pt; struct pv_addr dpcpu; vm_offset_t dtbp, freemempos, l2_start, lastaddr; - u_long memsize; + uint64_t memsize; uint32_t l2size; char *env; void *kmdp; Modified: head/sys/dev/fdt/fdt_common.c ============================================================================== --- head/sys/dev/fdt/fdt_common.c Tue Mar 1 11:36:10 2016 (r296264) +++ head/sys/dev/fdt/fdt_common.c Tue Mar 1 11:39:07 2016 (r296265) @@ -647,12 +647,12 @@ out: } int -fdt_get_mem_regions(struct mem_region *mr, int *mrcnt, u_long *memsize) +fdt_get_mem_regions(struct mem_region *mr, int *mrcnt, uint64_t *memsize) { pcell_t reg[FDT_REG_CELLS * FDT_MEM_REGIONS]; pcell_t *regp; phandle_t memory; - u_long memory_size; + uint64_t memory_size; int addr_cells, size_cells; int i, max_size, reg_len, rv, tuple_size, tuples; Modified: head/sys/dev/fdt/fdt_common.h ============================================================================== --- head/sys/dev/fdt/fdt_common.h Tue Mar 1 11:36:10 2016 (r296264) +++ head/sys/dev/fdt/fdt_common.h Tue Mar 1 11:39:07 2016 (r296265) @@ -85,7 +85,7 @@ u_long fdt_data_get(void *, int); int fdt_data_to_res(pcell_t *, int, int, u_long *, u_long *); phandle_t fdt_find_compatible(phandle_t, const char *, int); phandle_t fdt_depth_search_compatible(phandle_t, const char *, int); -int fdt_get_mem_regions(struct mem_region *, int *, u_long *); +int fdt_get_mem_regions(struct mem_region *, int *, uint64_t *); int fdt_get_reserved_regions(struct mem_region *, int *); int fdt_get_phyaddr(phandle_t, device_t, int *, void **); int fdt_get_range(phandle_t, int, u_long *, u_long *); Modified: head/sys/mips/beri/beri_machdep.c ============================================================================== --- head/sys/mips/beri/beri_machdep.c Tue Mar 1 11:36:10 2016 (r296264) +++ head/sys/mips/beri/beri_machdep.c Tue Mar 1 11:39:07 2016 (r296265) @@ -90,8 +90,8 @@ mips_init(void) int i; #ifdef FDT struct mem_region mr[FDT_MEM_REGIONS]; + uint64_t val; int mr_cnt; - u_long val; int j; #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603011139.u21Bd8Xo053217>