Date: Mon, 29 Feb 2016 09:22:40 +0000 (UTC) From: Wojciech Macek <wma@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296189 - in head/sys: arm/arm arm/mv dev/cesa dev/fdt mips/beri riscv/riscv Message-ID: <201602290922.u1T9Me0A086413@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wma Date: Mon Feb 29 09:22:39 2016 New Revision: 296189 URL: https://svnweb.freebsd.org/changeset/base/296189 Log: Fix fdt_get_mem_regions() to work with 64-bit addresses Use u_long instead of uint32_t variables to avoid overflow in case of PA space bigger than 32-bit. Obtained from: Semihalf Submitted by: Michal Stanek <mst@semihalf.com> Sponsored by: Annapurna Labs Approved by: cognet (mentor) Reviewed by: andrew, br, wma Differential revision: https://reviews.freebsd.org/D5393 Modified: head/sys/arm/arm/machdep.c head/sys/arm/mv/mv_common.c head/sys/dev/cesa/cesa.c head/sys/dev/fdt/fdt_common.c head/sys/dev/fdt/fdt_common.h head/sys/mips/beri/beri_machdep.c head/sys/riscv/riscv/machdep.c Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Mon Feb 29 09:14:55 2016 (r296188) +++ head/sys/arm/arm/machdep.c Mon Feb 29 09:22:39 2016 (r296189) @@ -1445,7 +1445,8 @@ initarm(struct arm_boot_params *abp) struct pv_addr kernel_l1pt; struct pv_addr dpcpu; vm_offset_t dtbp, freemempos, l2_start, lastaddr; - uint32_t memsize, l2size; + u_long memsize; + uint32_t l2size; char *env; void *kmdp; u_int l1pagetable; @@ -1714,7 +1715,7 @@ initarm(struct arm_boot_params *abp) struct mem_region mem_regions[FDT_MEM_REGIONS]; vm_paddr_t lastaddr; vm_offset_t dtbp, kernelstack, dpcpu; - uint32_t memsize; + u_long memsize; char *env; void *kmdp; int err_devmap, mem_regions_sz; Modified: head/sys/arm/mv/mv_common.c ============================================================================== --- head/sys/arm/mv/mv_common.c Mon Feb 29 09:14:55 2016 (r296188) +++ head/sys/arm/mv/mv_common.c Mon Feb 29 09:22:39 2016 (r296189) @@ -917,7 +917,8 @@ decode_win_sdram_fixup(void) { struct mem_region mr[FDT_MEM_REGIONS]; uint8_t window_valid[MV_WIN_DDR_MAX]; - int mr_cnt, memsize, err, i, j; + int mr_cnt, err, i, j; + u_long memsize; uint32_t valid_win_num = 0; /* Grab physical memory regions information from device tree. */ Modified: head/sys/dev/cesa/cesa.c ============================================================================== --- head/sys/dev/cesa/cesa.c Mon Feb 29 09:14:55 2016 (r296188) +++ head/sys/dev/cesa/cesa.c Mon Feb 29 09:22:39 2016 (r296189) @@ -1641,7 +1641,8 @@ decode_win_cesa_setup(struct cesa_softc { struct mem_region availmem_regions[FDT_MEM_REGIONS]; int availmem_regions_sz; - uint32_t memsize, br, cr, i; + uint32_t br, cr, i; + u_long memsize; /* Grab physical memory regions information from DTS */ if (fdt_get_mem_regions(availmem_regions, &availmem_regions_sz, Modified: head/sys/dev/fdt/fdt_common.c ============================================================================== --- head/sys/dev/fdt/fdt_common.c Mon Feb 29 09:14:55 2016 (r296188) +++ head/sys/dev/fdt/fdt_common.c Mon Feb 29 09:22:39 2016 (r296189) @@ -647,12 +647,12 @@ out: } int -fdt_get_mem_regions(struct mem_region *mr, int *mrcnt, uint32_t *memsize) +fdt_get_mem_regions(struct mem_region *mr, int *mrcnt, u_long *memsize) { pcell_t reg[FDT_REG_CELLS * FDT_MEM_REGIONS]; pcell_t *regp; phandle_t memory; - uint32_t memory_size; + u_long 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 Mon Feb 29 09:14:55 2016 (r296188) +++ head/sys/dev/fdt/fdt_common.h Mon Feb 29 09:22:39 2016 (r296189) @@ -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 *, uint32_t *); +int fdt_get_mem_regions(struct mem_region *, int *, u_long *); 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 Mon Feb 29 09:14:55 2016 (r296188) +++ head/sys/mips/beri/beri_machdep.c Mon Feb 29 09:22:39 2016 (r296189) @@ -90,7 +90,8 @@ mips_init(void) int i; #ifdef FDT struct mem_region mr[FDT_MEM_REGIONS]; - int mr_cnt, val; + int mr_cnt; + u_long val; int j; #endif Modified: head/sys/riscv/riscv/machdep.c ============================================================================== --- head/sys/riscv/riscv/machdep.c Mon Feb 29 09:14:55 2016 (r296188) +++ head/sys/riscv/riscv/machdep.c Mon Feb 29 09:22:39 2016 (r296189) @@ -739,7 +739,7 @@ initriscv(struct riscv_bootparams *rvbp) vm_offset_t lastaddr; int mem_regions_sz; vm_size_t kernlen; - uint32_t memsize; + u_long memsize; caddr_t kmdp; int i;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602290922.u1T9Me0A086413>