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

ether82598: support for T540-T1, use physical addresses for isaconf port

Browse source 
reading mac doesnt work yet, requires ea= option in isaconf.
This commit is contained in:
cinap_lenrek 2017-09-27 14:13:18 +02:00
parent 797952d065
commit d9b37eff37
1 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
sys/src/9/pc/ether82598.c
View file

@ -101,7 +101,8 @@ enum {
Txdctl = 0x06028/4, /* " control */ Txdctl = 0x06028/4, /* " control */
Tdwbal = 0x06038/4, /* " write-back address low */ Tdwbal = 0x06038/4, /* " write-back address low */
Tdwbah = 0x0603c/4, Tdwbah = 0x0603c/4,
Dmatxctl = 0x04a80/4,
Dtxctl = 0x07e00/4, /* tx dma control */ Dtxctl = 0x07e00/4, /* tx dma control */
Tdcatxctrl = 0x07200/4, /* tx dca register (0-15) */ Tdcatxctrl = 0x07200/4, /* tx dca register (0-15) */
Tipg = 0x0cb00/4, /* tx inter-packet gap */ Tipg = 0x0cb00/4, /* tx inter-packet gap */
@ -141,6 +142,9 @@ enum {
Wthresh = 16, /* writeback threshold */ Wthresh = 16, /* writeback threshold */
Renable = 1<<25, Renable = 1<<25,
/* Dmatxctl */
Txen = 1<<0,
/* Rxctl */ /* Rxctl */
Rxen = 1<<0, Rxen = 1<<0,
Dmbyps = 1<<1, Dmbyps = 1<<1,
@ -263,6 +267,7 @@ enum {
typedef struct { typedef struct {
Pcidev *p; Pcidev *p;
Ether *edev; Ether *edev;
uintptr io;
u32int *reg; u32int *reg;
u32int *regmsi; u32int *regmsi;
uchar flag; uchar flag;
@ -708,7 +713,6 @@ static int
reset(Ctlr *c) reset(Ctlr *c)
{ {
int i; int i;
uchar *p;
if(detach(c)){ if(detach(c)){
print("82598: reset timeout\n"); print("82598: reset timeout\n");
@ -716,11 +720,8 @@ reset(Ctlr *c)
} }
if(eeload(c)){ if(eeload(c)){
print("82598: eeprom failure\n"); print("82598: eeprom failure\n");
return -1; memset(c->ra, 0, Eaddrlen);
} }
p = c->ra;
c->reg[Ral] = p[3]<<24 | p[2]<<16 | p[1]<<8 | p[0];
c->reg[Rah] = p[5]<<8 | p[4] | 1<<31;
readstats(c); readstats(c);
for(i = 0; i<nelem(c->stats); i++) for(i = 0; i<nelem(c->stats); i++)
@ -766,6 +767,8 @@ txinit(Ctlr *c)
c->tdh = c->ntd - 1; c->tdh = c->ntd - 1;
c->tdt = 0; c->tdt = 0;
c->reg[Txdctl] |= Ten; c->reg[Txdctl] |= Ten;
c->reg[Dmatxctl] |= Txen;
} }
static void static void
@ -845,7 +848,7 @@ interrupt(Ureg*, void *v)
static void static void
scan(void) scan(void)
{ {
ulong io, iomsi; uintptr io, iomsi;
void *mem, *memmsi; void *mem, *memmsi;
int pciregs, pcimsix; int pciregs, pcimsix;
Ctlr *c; Ctlr *c;
@ -862,8 +865,10 @@ scan(void)
pcimsix = 3; pcimsix = 3;
break; break;
case 0x10fb: /* 82599 */ case 0x10fb: /* 82599 */
case 0x1528: /* T540-T1 */
pcimsix = 4; pcimsix = 4;
break; break;
default: default:
continue; continue;
} }
@ -880,19 +885,20 @@ scan(void)
io = p->mem[pciregs].bar & ~0xf; io = p->mem[pciregs].bar & ~0xf;
mem = vmap(io, p->mem[pciregs].size); mem = vmap(io, p->mem[pciregs].size);
if(mem == nil){ if(mem == nil){
print("i82598: can't map regs %#p\n", p->mem[pciregs].bar); print("i82598: can't map regs %#p\n", io);
free(c); free(c);
continue; continue;
} }
iomsi = p->mem[pcimsix].bar & ~0xf; iomsi = p->mem[pcimsix].bar & ~0xf;
memmsi = vmap(iomsi, p->mem[pcimsix].size); memmsi = vmap(iomsi, p->mem[pcimsix].size);
if(memmsi == nil){ if(memmsi == nil){
print("i82598: can't map msi-x regs %#p\n", p->mem[pcimsix].bar); print("i82598: can't map msi-x regs %#p\n", iomsi);
vunmap(mem, p->mem[pciregs].size); vunmap(mem, p->mem[pciregs].size);
free(c); free(c);
continue; continue;
} }
c->p = p; c->p = p;
c->io = io;
c->reg = (u32int*)mem; c->reg = (u32int*)mem;
c->regmsi = (u32int*)memmsi; c->regmsi = (u32int*)memmsi;
c->rbsz = Rbsz; c->rbsz = Rbsz;
@ -911,8 +917,10 @@ scan(void)
static int static int
pnp(Ether *e) pnp(Ether *e)
{ {
static uchar zeros[Eaddrlen];
int i; int i;
Ctlr *c = nil; Ctlr *c = nil;
uchar *p;
if(nctlr == 0) if(nctlr == 0)
scan(); scan();
@ -920,11 +928,19 @@ pnp(Ether *e)
c = ctlrtab[i]; c = ctlrtab[i];
if(c == nil || c->flag & Factive) if(c == nil || c->flag & Factive)
continue; continue;
if(e->port == 0 || e->port == (ulong)c->reg) if(e->port == 0 || e->port == c->io)
break; break;
} }
if (i >= nctlr) if (i >= nctlr)
return -1; return -1;
if(memcmp(c->ra, zeros, Eaddrlen) != 0)
memmove(e->ea, c->ra, Eaddrlen);
p = e->ea;
c->reg[Ral] = p[3]<<24 | p[2]<<16 | p[1]<<8 | p[0];
c->reg[Rah] = p[5]<<8 | p[4] | 1<<31;
c->flag |= Factive; c->flag |= Factive;
e->ctlr = c; e->ctlr = c;
e->port = (uintptr)c->reg; e->port = (uintptr)c->reg;
@ -932,7 +948,7 @@ pnp(Ether *e)
e->tbdf = c->p->tbdf; e->tbdf = c->p->tbdf;
e->mbps = 10000; e->mbps = 10000;
e->maxmtu = c->rbsz; e->maxmtu = c->rbsz;
memmove(e->ea, c->ra, Eaddrlen);
e->arg = e; e->arg = e;
e->attach = attach; e->attach = attach;
e->ctl = ctl; e->ctl = ctl;