ref: c9fd7a5c40184dd1c894e77fe01582d3790c44b7
parent: 2fbb841b2fe9333f64cb583ba1d7936cd9bdb2ec
author: cinap_lenrek <cinap_lenrek@felloff.net>
date: Sat Jun 7 21:33:15 EDT 2014
pc, pc64: fix missed qunlock, use Ref with incref()/decref() instead of _xinc()/_xdec()
--- a/sys/src/9/pc/mtrr.c
+++ b/sys/src/9/pc/mtrr.c
@@ -186,7 +186,7 @@
int s;
ulong cr0, cr4;
vlong def;
- static long bar1, bar2;
+ static Ref bar1, bar2;
s = splhi(); /* avoid race with mtrrclock */
@@ -194,8 +194,8 @@
* wait for all CPUs to sync here, so that the MTRR setup gets
* done at roughly the same time on all processors.
*/
- _xinc(&bar1);
- while(bar1 < conf.nmach)
+ incref(&bar1);
+ while(bar1.ref < conf.nmach)
microdelay(10);
cr4 = getcr4();
@@ -218,14 +218,14 @@
* wait for all CPUs to sync up again, so that we don't continue
* executing while the MTRRs are still being set up.
*/
- _xinc(&bar2);
- while(bar2 < conf.nmach)
+ incref(&bar2);
+ while(bar2.ref < conf.nmach)
microdelay(10);
- *op = nil;
- _xdec(&bar1);
- while(bar1 > 0)
+ decref(&bar1);
+ while(bar1.ref > 0)
microdelay(10);
- _xdec(&bar2);
+ decref(&bar2);
+ *op = nil;
wakeup(&oprend);
splx(s);
}
@@ -288,6 +288,10 @@
}
qlock(&mtrrlk);
+ if(waserror()){+ qunlock(&mtrrlk);
+ nexterror();
+ }
slot = -1;
vcnt = cap & Capvcnt;
if(vcnt > Nmtrr)
@@ -305,8 +309,9 @@
if(slot == -1)
error("no free mtrr slots");- while(postedop != nil)
+ while(!opavail(0))
sleep(&oprend, opavail, 0);
+
mtrrenc(&entry, base, size, type, 1);
op.reg = &entry;
op.slot = slot;
@@ -313,6 +318,7 @@
postedop = &op;
mtrrop(&postedop);
qunlock(&mtrrlk);
+ poperror();
return 0;
}
--
⑨