d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update different versions of physmap_init to be identical in preparation

Browse Source 
for merging them.
This commit is contained in:
Andrew Turner 2012-09-23 02:01:59 +00:00
parent d98d8a1e83
commit 70203625fb
4 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arm/broadcom/bcm2835/bcm2835_machdep.c
View File

@ -281,9 +281,19 @@ physmap_init(void)
availmem_regions[i].mr_start + availmem_regions[i].mr_size,
availmem_regions[i].mr_size);
phys_avail[j] = availmem_regions[i].mr_start;
phys_avail[j + 1] = availmem_regions[i].mr_start +
availmem_regions[i].mr_size;
/*
* We should not map the page at PA 0x0000000, the VM can't
* handle it, as pmap_extract() == 0 means failure.
*/
if (availmem_regions[i].mr_start > 0 ||
availmem_regions[i].mr_size > PAGE_SIZE) {
phys_avail[j] = availmem_regions[i].mr_start;
if (phys_avail[j] == 0)
phys_avail[j] += PAGE_SIZE;
phys_avail[j + 1] = availmem_regions[i].mr_start +
availmem_regions[i].mr_size;
} else
j -= 2;
}
phys_avail[j] = 0;
phys_avail[j + 1] = 0;

16
sys/arm/lpc/lpc_machdep.c
View File

@ -282,9 +282,19 @@ physmap_init(void)
availmem_regions[i].mr_start + availmem_regions[i].mr_size,
availmem_regions[i].mr_size);
phys_avail[j] = availmem_regions[i].mr_start;
phys_avail[j + 1] = availmem_regions[i].mr_start +
availmem_regions[i].mr_size;
/*
* We should not map the page at PA 0x0000000, the VM can't
* handle it, as pmap_extract() == 0 means failure.
*/
if (availmem_regions[i].mr_start > 0 ||
availmem_regions[i].mr_size > PAGE_SIZE) {
phys_avail[j] = availmem_regions[i].mr_start;
if (phys_avail[j] == 0)
phys_avail[j] += PAGE_SIZE;
phys_avail[j + 1] = availmem_regions[i].mr_start +
availmem_regions[i].mr_size;
} else
j -= 2;
}
phys_avail[j] = 0;
phys_avail[j + 1] = 0;

16
sys/arm/tegra/tegra2_machdep.c
View File

@ -273,9 +273,19 @@ physmap_init(void)
availmem_regions[i].mr_start + availmem_regions[i].mr_size,
availmem_regions[i].mr_size);
phys_avail[j] = availmem_regions[i].mr_start;
phys_avail[j + 1] = availmem_regions[i].mr_start +
availmem_regions[i].mr_size;
/*
* We should not map the page at PA 0x0000000, the VM can't
* handle it, as pmap_extract() == 0 means failure.
*/
if (availmem_regions[i].mr_start > 0 ||
availmem_regions[i].mr_size > PAGE_SIZE) {
phys_avail[j] = availmem_regions[i].mr_start;
if (phys_avail[j] == 0)
phys_avail[j] += PAGE_SIZE;
phys_avail[j + 1] = availmem_regions[i].mr_start +
availmem_regions[i].mr_size;
} else
j -= 2;
}
phys_avail[j] = 0;
phys_avail[j + 1] = 0;

18
sys/arm/ti/ti_machdep.c
View File

@ -205,7 +205,6 @@ physmap_init(void)
phys_kernelend = KERNPHYSADDR + (virtual_avail - KERNVIRTADDR);
kernload = KERNPHYSADDR;
ti_cpu_reset = NULL;
/*
* Remove kernel physical address range from avail
@ -282,9 +281,19 @@ physmap_init(void)
availmem_regions[i].mr_start + availmem_regions[i].mr_size,
availmem_regions[i].mr_size);
phys_avail[j] = availmem_regions[i].mr_start;
phys_avail[j + 1] = availmem_regions[i].mr_start +
availmem_regions[i].mr_size;
/*
* We should not map the page at PA 0x0000000, the VM can't
* handle it, as pmap_extract() == 0 means failure.
*/
if (availmem_regions[i].mr_start > 0 ||
availmem_regions[i].mr_size > PAGE_SIZE) {
phys_avail[j] = availmem_regions[i].mr_start;
if (phys_avail[j] == 0)
phys_avail[j] += PAGE_SIZE;
phys_avail[j + 1] = availmem_regions[i].mr_start +
availmem_regions[i].mr_size;
} else
j -= 2;
}
phys_avail[j] = 0;
phys_avail[j + 1] = 0;
@ -336,6 +345,7 @@ initarm(struct arm_boot_params *abp)
/* Platform-specific initialisation */
pmap_bootstrap_lastaddr = DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE;
ti_cpu_reset = NULL;
pcpu0_init();