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

x86: correctly limit max memory resource address..

Browse Source 
CPU and buses can manage up to the limit reported by cpu_maxphyaddr,
so set mem_rman to the value returned by cpu_getmaxphyaddr().  For the
PAE mode, it was missed both when rman_res_t was increased to
uintmax_t, and from the PAE merge commit.

When importing smaps or dump_avail chunks into memory rman, do not
blindly ignore resources which ends above the limit, chomp them
instead if start is below the limit.  The same change was already done
to i386 add_physmap_entry().

Based on the submission by:	bde
MFC after:	2 months
This commit is contained in:
kib 2019-02-01 20:46:47 +00:00
parent 63376d5ae2
commit 9125922c5e
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/x86/x86/nexus.c
View File

@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h>
#include <sys/interrupt.h>
#include <machine/md_var.h>
#include <machine/vmparam.h>
#include <vm/vm.h>
#include <vm/pmap.h>
@ -269,11 +270,7 @@ nexus_init_resources(void)
panic("nexus_init_resources port_rman");
mem_rman.rm_start = 0;
#ifndef PAE
mem_rman.rm_end = BUS_SPACE_MAXADDR;
#else
mem_rman.rm_end = ((1ULL << cpu_maxphyaddr) - 1);
#endif
mem_rman.rm_end = cpu_getmaxphyaddr();
mem_rman.rm_type = RMAN_ARRAY;
mem_rman.rm_descr = "I/O memory addresses";
if (rman_init(&mem_rman)
@ -787,6 +784,7 @@ ram_attach(device_t dev)
{
struct bios_smap *smapbase, *smap, *smapend;
struct resource *res;
rman_res_t length;
vm_paddr_t *p;
caddr_t kmdp;
uint32_t smapsize;
@ -807,16 +805,12 @@ ram_attach(device_t dev)
if (smap->type != SMAP_TYPE_MEMORY ||
smap->length == 0)
continue;
#ifdef __i386__
/*
* Resources use long's to track resources, so
* we can't include memory regions above 4GB.
*/
if (smap->base > ~0ul)
if (smap->base > mem_rman.rm_end)
continue;
#endif
length = smap->base + smap->length > mem_rman.rm_end ?
mem_rman.rm_end - smap->base : smap->length;
error = bus_set_resource(dev, SYS_RES_MEMORY, rid,
smap->base, smap->length);
smap->base, length);
if (error)
panic(
"ram_attach: resource %d failed set with %d",
@ -841,16 +835,12 @@ ram_attach(device_t dev)
* segment is 0.
*/
for (rid = 0, p = dump_avail; p[1] != 0; rid++, p += 2) {
#ifdef PAE
/*
* Resources use long's to track resources, so we can't
* include memory regions above 4GB.
*/
if (p[0] > ~0ul)
if (p[0] > mem_rman.rm_end)
break;
#endif
length = (p[1] > mem_rman.rm_end ? mem_rman.rm_end : p[1]) -
p[0];
error = bus_set_resource(dev, SYS_RES_MEMORY, rid, p[0],
p[1] - p[0]);
length);
if (error)
panic("ram_attach: resource %d failed set with %d", rid,
error);