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

bcm: simplify irq handling by having per cpu Vctl chain

Browse source
This commit is contained in:
cinap_lenrek 2018-11-07 16:49:50 +01:00
parent b0d226705c
commit 385f52183c
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
sys/src/9/bcm/trap.c
View file

@ -13,7 +13,6 @@
#include "arm.h" #include "arm.h"
#define INTREGS (VIRTIO+0xB200) #define INTREGS (VIRTIO+0xB200)
#define LOCALREGS (VIRTIO+IOSIZE)
typedef struct Intregs Intregs; typedef struct Intregs Intregs;
typedef struct Vctl Vctl; typedef struct Vctl Vctl;
@ -51,7 +50,6 @@ struct Intregs {
struct Vctl { struct Vctl {
Vctl *next; Vctl *next;
int irq; int irq;
int cpu;
u32int *reg; u32int *reg;
u32int mask; u32int mask;
void (*f)(Ureg*, void*); void (*f)(Ureg*, void*);
@ -59,7 +57,7 @@ struct Vctl {
}; };
static Lock vctllock; static Lock vctllock;
static Vctl *vctl, *vfiq; static Vctl *vctl[MAXMACH], *vfiq;
static char *trapnames[PsrMask+1] = { static char *trapnames[PsrMask+1] = {
[ PsrMusr ] "user mode", [ PsrMusr ] "user mode",
@ -82,6 +80,7 @@ trapinit(void)
{ {
Vpage0 *vpage0; Vpage0 *vpage0;
intrcpushutdown();
if (m->machno == 0) { if (m->machno == 0) {
/* disable everything */ /* disable everything */
intrsoff(); intrsoff();
@ -110,10 +109,10 @@ intrcpushutdown(void)
if(soc.armlocal == 0) if(soc.armlocal == 0)
return; return;
enable = (u32int*)(LOCALREGS + Localtimerint) + m->machno; enable = (u32int*)(ARMLOCAL + Localtimerint) + m->machno;
*enable = 0; *enable = 0;
if(m->machno){ if(m->machno){
enable = (u32int*)(LOCALREGS + Localmboxint) + m->machno; enable = (u32int*)(ARMLOCAL + Localmboxint) + m->machno;
*enable = 1; *enable = 1;
} }
} }
@ -143,8 +142,8 @@ irq(Ureg* ureg)
int clockintr; int clockintr;
clockintr = 0; clockintr = 0;
for(v = vctl; v; v = v->next) for(v = vctl[m->machno]; v != nil; v = v->next)
if(v->cpu == m->machno && (*v->reg & v->mask) != 0){ if((*v->reg & v->mask) != 0){
coherence(); coherence();
v->f(ureg, v->a); v->f(ureg, v->a);
coherence(); coherence();
@ -180,19 +179,16 @@ irqenable(int irq, void (*f)(Ureg*, void*), void* a)
u32int *enable; u32int *enable;
ip = (Intregs*)INTREGS; ip = (Intregs*)INTREGS;
v = (Vctl*)malloc(sizeof(Vctl)); if((v = xalloc(sizeof(Vctl))) == nil)
if(v == nil)
panic("irqenable: no mem"); panic("irqenable: no mem");
v->irq = irq; v->irq = irq;
v->cpu = 0;
if(irq >= IRQlocal){ if(irq >= IRQlocal){
v->reg = (u32int*)(LOCALREGS + Localintpending) + m->machno; v->reg = (u32int*)(ARMLOCAL + Localintpending) + m->machno;
if(irq >= IRQmbox0) if(irq >= IRQmbox0)
enable = (u32int*)(LOCALREGS + Localmboxint) + m->machno; enable = (u32int*)(ARMLOCAL + Localmboxint) + m->machno;
else else
enable = (u32int*)(LOCALREGS + Localtimerint) + m->machno; enable = (u32int*)(ARMLOCAL + Localtimerint) + m->machno;
v->mask = 1 << (irq - IRQlocal); v->mask = 1 << (irq - IRQlocal);
v->cpu = m->machno;
}else if(irq >= IRQbasic){ }else if(irq >= IRQbasic){
enable = &ip->ARMenable; enable = &ip->ARMenable;
v->reg = &ip->ARMpending; v->reg = &ip->ARMpending;
@ -211,8 +207,8 @@ irqenable(int irq, void (*f)(Ureg*, void*), void* a)
vfiq = v; vfiq = v;
ip->FIQctl = Fiqenable | irq; ip->FIQctl = Fiqenable | irq;
}else{ }else{
v->next = vctl; v->next = vctl[m->machno];
vctl = v; vctl[m->machno] = v;
if(irq >= IRQmbox0){ if(irq >= IRQmbox0){
if(irq <= IRQmbox3) if(irq <= IRQmbox3)
*enable |= 1 << (irq - IRQmbox0); *enable |= 1 << (irq - IRQmbox0);