xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2020-12-11 15:24:35 +01:00
commit b1d1fa04b9
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/src/9/pc/memory.c
View file

@ -383,16 +383,8 @@ e820scan(void)
}
}
/*
* Make sure RAM is set to writeback,
* but do a sanity check first checking
* that the kernel text is writeback.
* This is needed as some emulators (bhyve)
* set everything to uncached.
*/
s = mtrrattr(PADDR(KTZERO), nil);
if(s != nil && strcmp(s, "wb") == 0)
mtrrexclude(MemRAM, "wb");
/* RAM needs to be writeback */
mtrrexclude(MemRAM, "wb");
for(base = memmapnext(-1, MemRAM); base != -1; base = memmapnext(base, MemRAM)){
size = memmapsize(base, BY2PG) & ~(BY2PG-1);

14
sys/src/9/pc/mtrr.c
View file

@ -305,12 +305,14 @@ getstate(State *s)
vlong v;
int i;
s->mask = physmask();
if(rdmsr(MTRRCap, &s->cap) < 0)
return -1;
if((s->cap & (Capfix|Capvcnt)) == 0)
return -1;
if(rdmsr(MTRRDefaultType, &s->def) < 0)
return -1;
if(rdmsr(MTRRCap, &s->cap) < 0)
return -1;
if(s->cap & Capfix){
for(i = 0; i < nelem(fixreg); i++){
@ -332,6 +334,8 @@ getstate(State *s)
return -1;
}
s->mask = physmask();
if(strcmp(m->cpuidid, "AuthenticAMD") != 0
|| m->cpuidfamily < 15
|| rdmsr(AMDK8SysCfg, &v) < 0
@ -674,6 +678,10 @@ mtrr(uvlong base, uvlong size, char *tstr)
if((new.type = str2type(tstr)) < 0)
return "bad cache type";
if(new.type == Writecomb
&& (cpu0state.cap & Capwc) == 0)
return "write combining not supported";
qlock(&mtrrlk);
newstate = cpu0state;
nr = getranges(&newstate, ranges, Nranges, &new);