Date: Thu, 9 Dec 2010 07:01:03 +0000 (UTC) From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r216318 - in head/sys/mips: adm5120 alchemy atheros cavium idt malta rmi sentry5 sibyte Message-ID: <201012090701.oB97137o027263@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gonzo Date: Thu Dec 9 07:01:03 2010 New Revision: 216318 URL: http://svn.freebsd.org/changeset/base/216318 Log: - Populate dump_avail with proper values from phys_avail Modified: head/sys/mips/adm5120/adm5120_machdep.c head/sys/mips/alchemy/alchemy_machdep.c head/sys/mips/atheros/ar71xx_machdep.c head/sys/mips/cavium/octeon_machdep.c head/sys/mips/idt/idt_machdep.c head/sys/mips/malta/malta_machdep.c head/sys/mips/rmi/xlr_machdep.c head/sys/mips/sentry5/s5_machdep.c head/sys/mips/sibyte/sb_machdep.c Modified: head/sys/mips/adm5120/adm5120_machdep.c ============================================================================== --- head/sys/mips/adm5120/adm5120_machdep.c Thu Dec 9 06:54:06 2010 (r216317) +++ head/sys/mips/adm5120/adm5120_machdep.c Thu Dec 9 07:01:03 2010 (r216318) @@ -97,6 +97,9 @@ mips_init(void) phys_avail[0] = MIPS_KSEG0_TO_PHYS(kernel_kseg0_end); phys_avail[1] = ctob(realmem); + dump_avail[0] = phys_avail[0]; + dump_avail[1] = phys_avail[1] - phys_avail[0]; + physmem = realmem; init_param1(); Modified: head/sys/mips/alchemy/alchemy_machdep.c ============================================================================== --- head/sys/mips/alchemy/alchemy_machdep.c Thu Dec 9 06:54:06 2010 (r216317) +++ head/sys/mips/alchemy/alchemy_machdep.c Thu Dec 9 07:01:03 2010 (r216318) @@ -97,6 +97,9 @@ mips_init(void) phys_avail[0] = MIPS_KSEG0_TO_PHYS(kernel_kseg0_end); phys_avail[1] = ctob(realmem); + dump_avail[0] = phys_avail[0]; + dump_avail[1] = phys_avail[1] - phys_avail[0]; + physmem = realmem; init_param1(); Modified: head/sys/mips/atheros/ar71xx_machdep.c ============================================================================== --- head/sys/mips/atheros/ar71xx_machdep.c Thu Dec 9 06:54:06 2010 (r216317) +++ head/sys/mips/atheros/ar71xx_machdep.c Thu Dec 9 07:01:03 2010 (r216318) @@ -184,6 +184,9 @@ platform_start(__register_t a0 __unused, phys_avail[0] = MIPS_KSEG0_TO_PHYS(kernel_kseg0_end); phys_avail[1] = ctob(realmem); + dump_avail[0] = phys_avail[0]; + dump_avail[1] = phys_avail[1] - phys_avail[0]; + physmem = realmem; /* Modified: head/sys/mips/cavium/octeon_machdep.c ============================================================================== --- head/sys/mips/cavium/octeon_machdep.c Thu Dec 9 06:54:06 2010 (r216317) +++ head/sys/mips/cavium/octeon_machdep.c Thu Dec 9 07:01:03 2010 (r216318) @@ -265,7 +265,7 @@ octeon_memory_init(void) { vm_paddr_t phys_end; int64_t addr; - unsigned i; + unsigned i, j; phys_end = round_page(MIPS_KSEG0_TO_PHYS((vm_offset_t)&end)); @@ -274,6 +274,9 @@ octeon_memory_init(void) phys_avail[0] = phys_end; phys_avail[1] = 96 << 20; + dump_avail[0] = phys_avail[0]; + dump_avail[1] = phys_avail[1] - phys_avail[0]; + realmem = physmem = btoc(phys_avail[1] - phys_avail[0]); return; } @@ -314,6 +317,11 @@ octeon_memory_init(void) i += 2; } + for (j = 0; j < i; j += 2) { + dump_avail[j] = phys_avail[j]; + dump_avail[j+1] = phys_avail[j+1] - phys_avail[j]; + } + realmem = physmem; } Modified: head/sys/mips/idt/idt_machdep.c ============================================================================== --- head/sys/mips/idt/idt_machdep.c Thu Dec 9 06:54:06 2010 (r216317) +++ head/sys/mips/idt/idt_machdep.c Thu Dec 9 07:01:03 2010 (r216318) @@ -167,6 +167,9 @@ platform_start(__register_t a0, __regist phys_avail[0] = MIPS_KSEG0_TO_PHYS(kernel_kseg0_end); phys_avail[1] = ctob(realmem); + dump_avail[0] = phys_avail[0]; + dump_avail[1] = phys_avail[1] - phys_avail[0]; + physmem = realmem; /* Modified: head/sys/mips/malta/malta_machdep.c ============================================================================== --- head/sys/mips/malta/malta_machdep.c Thu Dec 9 06:54:06 2010 (r216317) +++ head/sys/mips/malta/malta_machdep.c Thu Dec 9 07:01:03 2010 (r216318) @@ -181,6 +181,9 @@ mips_init(void) phys_avail[0] = MIPS_KSEG0_TO_PHYS(kernel_kseg0_end); phys_avail[1] = ctob(realmem); + dump_avail[0] = phys_avail[0]; + dump_avail[1] = phys_avail[1] - phys_avail[0]; + physmem = realmem; init_param1(); Modified: head/sys/mips/rmi/xlr_machdep.c ============================================================================== --- head/sys/mips/rmi/xlr_machdep.c Thu Dec 9 06:54:06 2010 (r216317) +++ head/sys/mips/rmi/xlr_machdep.c Thu Dec 9 07:01:03 2010 (r216318) @@ -363,6 +363,9 @@ xlr_mem_init(void) (void *)phys_avail[0], (void *)phys_avail[1]); + dump_avail[0] = boot_map->physmem_map[0].addr; + dump_avail[1] = boot_map->physmem_map[0].size; + } else { /* * Can't use this code yet, because most of the fixed allocations happen from @@ -390,6 +393,10 @@ xlr_mem_init(void) (void *)phys_avail[j], (void *)phys_avail[j+1]); } + + dump_avail[j] = boot_map->physmem_map[j].addr; + dump_avail[j+1] = boot_map->physmem_map[j].size; + physsz += boot_map->physmem_map[i].size; } } Modified: head/sys/mips/sentry5/s5_machdep.c ============================================================================== --- head/sys/mips/sentry5/s5_machdep.c Thu Dec 9 06:54:06 2010 (r216317) +++ head/sys/mips/sentry5/s5_machdep.c Thu Dec 9 07:01:03 2010 (r216318) @@ -91,7 +91,7 @@ platform_cpu_init() static void mips_init(void) { - int i; + int i, j; printf("entry: mips_init()\n"); @@ -128,6 +128,11 @@ mips_init(void) realmem = btoc(physmem); #endif + for (j = 0; j < i; j += 2) { + dump_avail[j] = phys_avail[j]; + dump_avail[j+1] = phys_avail[j+1] - phys_avail[j]; + } + physmem = realmem; init_param1(); Modified: head/sys/mips/sibyte/sb_machdep.c ============================================================================== --- head/sys/mips/sibyte/sb_machdep.c Thu Dec 9 06:54:06 2010 (r216317) +++ head/sys/mips/sibyte/sb_machdep.c Thu Dec 9 07:01:03 2010 (r216318) @@ -138,7 +138,7 @@ sb_intr_init(int cpuid) static void mips_init(void) { - int i, cfe_mem_idx, tmp; + int i, j, cfe_mem_idx, tmp; uint64_t maxmem; #ifdef CFE_ENV @@ -225,6 +225,11 @@ mips_init(void) realmem = btoc(physmem); #endif + for (j = 0; j < i; j += 2) { + dump_avail[j] = phys_avail[j]; + dump_avail[j+1] = phys_avail[j+1] - phys_avail[j]; + } + physmem = realmem; init_param1();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012090701.oB97137o027263>