From 075bbc718253e94387bd857b22c7bedea259651b Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 06:10:48 -0500 Subject: [PATCH 01/16] RFB should flag copies properly, and only commit output when it needs to. --- net/rfb.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/net/rfb.c b/net/rfb.c index eff9c41..ff0f089 100644 --- a/net/rfb.c +++ b/net/rfb.c @@ -177,8 +177,7 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { hdr.width = htons(fb->curmode.xres); hdr.height = htons(fb->curmode.yres); hdr.enctype = htonl(0); - tcp_write(pcb, &hdr, sizeof(hdr), 0); - tcp_output(pcb); + tcp_write(pcb, &hdr, sizeof(hdr), TCP_WRITE_FLAG_COPY); state->update_pos = 0; state->send_state = SST_SENDING; @@ -188,21 +187,28 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { case SST_SENDING: while (1) { + unsigned char mbuf[8192 /* XXX magic */]; + left = state->frame_bytes - state->update_pos; if (left == 0) { state->send_state = SST_IDLE; break; } + + if (left > 8192) + left = 8192; if (left > tcp_mss(pcb)) { sndlength = tcp_mss(pcb); } else { sndlength = left; } + + memcpy(mbuf, fb->fbaddr + state->update_pos, sndlength); /* It's OK if it becomes smaller later. */ do { - err = tcp_write(pcb, fb->fbaddr + state->update_pos, sndlength, 0); + err = tcp_write(pcb, mbuf, sndlength, TCP_WRITE_FLAG_COPY /* This is my memory on the stack, thank you very much. */); if (err == ERR_MEM) { outputf("RFB: ERR_MEM sending %d", sndlength); sndlength /= 2; @@ -216,11 +222,6 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { break; } - if (tcp_output(pcb) != ERR_OK) { - outputf("RFB: tcp_output has had enough"); - break; - } - state->update_pos += sndlength; if (tcp_sndbuf(pcb) == 0) { @@ -230,6 +231,11 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { break; } + + if (tcp_output(pcb) != ERR_OK) + { + outputf("RFB: tcp_output bailed in send_fsm?"); + } } static err_t rfb_sent(void *arg, struct tcp_pcb *pcb, uint16_t len) { @@ -309,7 +315,7 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { state->state = ST_MAIN; outputf("RFB: Sending server info", state->version); - tcp_write(pcb, &server_info, sizeof(server_info), 0); + tcp_write(pcb, &server_info, sizeof(server_info), TCP_WRITE_FLAG_COPY); tcp_output(pcb); return OK; -- 2.43.0 From aa9bc58fc6be92126c89fda9b5e9c0b102d0fcca Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 06:11:01 -0500 Subject: [PATCH 02/16] Remove dead code from net.c. --- net/net.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/net.c b/net/net.c index 598ea75..0c83b9b 100644 --- a/net/net.c +++ b/net/net.c @@ -97,12 +97,6 @@ static err_t _transmit(struct netif *netif, struct pbuf *p) { struct nic *nic = netif->state; -/* for(q = p; q != NULL; q = q->next) - { - memcpy(pkt + len, q->payload, q->len); - len += q->len; - }*/ - outputf("NIC: Transmit packet"); nic->transmit(p); -- 2.43.0 From 057f0bb976a93bfa290b20a2192837e324573d9b Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 06:11:50 -0500 Subject: [PATCH 03/16] Properly ref and deref old pbufs in 3c90x.c. --- net/3c90x.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/3c90x.c b/net/3c90x.c index 30283a2..a1b319c 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -478,10 +478,10 @@ static void a3c90x_transmit(struct pbuf *p) { unsigned char status; - static unsigned int stillwaiting = 0; + static struct pbuf *oldpbuf = NULL; unsigned int n, len; - if (stillwaiting) + if (oldpbuf) { while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running()) ; @@ -492,7 +492,8 @@ a3c90x_transmit(struct pbuf *p) } status = inb(INF_3C90X.IOAddr + regTxStatus_b); outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00); - stillwaiting = 0; + pbuf_free(oldpbuf); + oldpbuf = NULL; } _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */); @@ -501,11 +502,13 @@ a3c90x_transmit(struct pbuf *p) INF_3C90X.TransmitDPD.DnNextPtr = 0; len = 0; n = 0; + oldpbuf = p; for (; p; p = p->next) { INF_3C90X.TransmitDPD.segments[n].addr = v2p(p->payload); INF_3C90X.TransmitDPD.segments[n].len = p->len | (p->next ? 0 : (1 << 31)); len += p->len; + pbuf_ref(p); n++; } /** set notification for transmission completion (bit 15) **/ @@ -526,9 +529,6 @@ a3c90x_transmit(struct pbuf *p) return; } - oneshot_start_ms(10); - stillwaiting = 1; - #if 0 /** successful completion (sans "interrupt Requested" bit) **/ if ((status & 0xbf) == 0x80) -- 2.43.0 From 9c86d6da946b19a513ab554ee12473360d38d93d Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 06:45:16 -0500 Subject: [PATCH 04/16] Allow NIC poll routine to do packet chain handling on our behalf. --- net/3c90x.c | 173 +++++++++++++++++++---------------------- net/etherboot-compat.h | 2 +- net/net.c | 29 +------ 3 files changed, 83 insertions(+), 121 deletions(-) diff --git a/net/3c90x.c b/net/3c90x.c index a1b319c..ce35b95 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -218,28 +218,24 @@ enum Commands #define INT_CMDINPROGRESS (1<<12) #define INT_WINDOWNUMBER (7<<13) - -/*** TX descriptor ***/ -typedef struct - { - unsigned int DnNextPtr; - unsigned int FrameStartHeader; - struct { - unsigned int addr; - unsigned int len; - } __attribute ((aligned(8))) segments[64]; - } - TXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */ +/* These structures are all 64-bit aligned, as needed for bus-mastering I/O. */ +typedef struct { + unsigned int addr; + unsigned int len; +} segment_t __attribute__ ((aligned(8))); + +typedef struct { + unsigned int next; + unsigned int hdr; + segment_t segments[64 /* XXX magic */]; +} txdesc_t __attribute__ ((aligned(8))); /*** RX descriptor ***/ -typedef struct - { - unsigned int UpNextPtr; - unsigned int UpPktStatus; - unsigned int DataAddr; - unsigned int DataLength; - } - RXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */ +typedef struct { + unsigned int next; + unsigned int status; + segment_t segments[64]; +} rxdesc_t __attribute__ ((aligned(8))); /*** Global variables ***/ static struct @@ -249,11 +245,13 @@ static struct unsigned char CurrentWindow; unsigned int IOAddr; unsigned char HWAddr[ETH_ALEN]; - TXD TransmitDPD; - RXD ReceiveUPD; } INF_3C90X; + static struct nic nic; +static txdesc_t txdesc; +static rxdesc_t rxdesc; + #define _outl(v,a) outl((a),(v)) #define _outw(v,a) outw((a),(v)) @@ -407,13 +405,6 @@ a3c90x_internal_WriteEeprom(int ioaddr, int address, unsigned short value) ***/ static void a3c90x_reset(void) { -#ifdef CFG_3C90X_PRESERVE_XCVR - int cfg; - /** Read the current InternalConfig value. **/ - _set_window(INF_3C90X.IOAddr, winTxRxOptions3); - cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l); -#endif - /** Send the reset command to the card **/ outputf("3c90x: issuing RESET"); _issue_command(INF_3C90X.IOAddr, cmdGlobalReset, 0); @@ -426,18 +417,6 @@ static void a3c90x_reset(void) _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2); _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4); -#ifdef CFG_3C90X_PRESERVE_XCVR - /** Re-set the original InternalConfig value from before reset **/ - _set_window(INF_3C90X.IOAddr, winTxRxOptions3); - _outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l); - - /** enable DC converter for 10-Base-T **/ - if ((cfg&0x0300) == 0x0300) - { - _issue_command(INF_3C90X.IOAddr, cmdEnableDcConverter, 0); - } -#endif - /** Issue transmit reset, wait for command completion **/ _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0); if (! INF_3C90X.isBrev) @@ -499,25 +478,25 @@ a3c90x_transmit(struct pbuf *p) _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */); /** Setup the DPD (download descriptor) **/ - INF_3C90X.TransmitDPD.DnNextPtr = 0; + txdesc.next = 0; len = 0; n = 0; oldpbuf = p; for (; p; p = p->next) { - INF_3C90X.TransmitDPD.segments[n].addr = v2p(p->payload); - INF_3C90X.TransmitDPD.segments[n].len = p->len | (p->next ? 0 : (1 << 31)); + txdesc.segments[n].addr = v2p(p->payload); + txdesc.segments[n].len = p->len | (p->next ? 0 : (1 << 31)); len += p->len; pbuf_ref(p); n++; } /** set notification for transmission completion (bit 15) **/ - INF_3C90X.TransmitDPD.FrameStartHeader = (len) | 0x8000; + txdesc.hdr = (len) | 0x8000; outputf("3c90x: Sending %d byte %d seg packet", len, n); /** Send the packet **/ - outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&(INF_3C90X.TransmitDPD))); + outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&txdesc)); _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */); oneshot_start_ms(10); @@ -570,63 +549,69 @@ a3c90x_transmit(struct pbuf *p) *** copy the packet to nic->packet if it gets a packet and set the size *** in nic->packetlen. Return 1 if a packet was found. ***/ -static int -a3c90x_poll(struct nic *nic, int retrieve) - { - int i, errcode; - - if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0010)) +static struct pbuf * a3c90x_poll(struct nic *nic) +{ + int i, errcode; + struct pbuf *p, *q; + + /* Upload engine acks rxComplete for us later. */ + if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & 0x0010)) + return NULL; + + p = pbuf_alloc(PBUF_RAW, 1536 /* XXX magic Max len */, PBUF_POOL); + if (!p) { - return 0; + outputf("3c90x: out of memory for packet?"); + return NULL; } - if ( ! retrieve ) return 1; - - /** we don't need to acknowledge rxComplete -- the upload engine - ** does it for us. - **/ - - /** Build the up-load descriptor **/ - INF_3C90X.ReceiveUPD.UpNextPtr = 0; - INF_3C90X.ReceiveUPD.UpPktStatus = 0; - INF_3C90X.ReceiveUPD.DataAddr = v2p(nic->packet); - INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31); - - /** Submit the upload descriptor to the NIC **/ - _outl(v2p(&(INF_3C90X.ReceiveUPD)), - INF_3C90X.IOAddr + regUpListPtr_l); - - /** Wait for upload completion (upComplete(15) or upError (14)) **/ - for(i=0;i<40000;i++); - while((INF_3C90X.ReceiveUPD.UpPktStatus & ((1<<14) | (1<<15))) == 0) - for(i=0;i<40000;i++); + /* We don't need to acknowledge rxComplete -- the upload engine does + * it for us. + */ - /** Check for Error (else we have good packet) **/ - if (INF_3C90X.ReceiveUPD.UpPktStatus & (1<<14)) + /** Build the up-load descriptor **/ + rxdesc.next = 0; + rxdesc.status = 0; + for (i = 0, q = p; q; q = q->next, i++) { - errcode = INF_3C90X.ReceiveUPD.UpPktStatus; - if (errcode & (1<<16)) - outputf("3C90X: Rx Overrun (%hX)",errcode>>16); - else if (errcode & (1<<17)) - outputf("3C90X: Runt Frame (%hX)",errcode>>16); - else if (errcode & (1<<18)) - outputf("3C90X: Alignment Error (%hX)",errcode>>16); - else if (errcode & (1<<19)) - outputf("3C90X: CRC Error (%hX)",errcode>>16); - else if (errcode & (1<<20)) - outputf("3C90X: Oversized Frame (%hX)",errcode>>16); - else - outputf("3C90X: Packet error (%hX)",errcode>>16); - return 0; + rxdesc.segments[i].addr = v2p(q->payload); + rxdesc.segments[i].len = q->len | (q->next ? 0 : (1 << 31)); } - /** Ok, got packet. Set length in nic->packetlen. **/ - nic->packetlen = (INF_3C90X.ReceiveUPD.UpPktStatus & 0x1FFF); + /** Submit the upload descriptor to the NIC **/ + outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdesc)); - return 1; - } + /** Wait for upload completion (upComplete(15) or upError (14)) **/ + for (i = 0; i < 40000; i++) /* XXX What is this shit?! */ + ; + while((rxdesc.status & ((1<<14) | (1<<15))) == 0) + for (i = 0; i < 40000; i++) + ; + /** Check for Error (else we have good packet) **/ + if (rxdesc.status & (1<<14)) + { + errcode = rxdesc.status; + if (errcode & (1<<16)) + outputf("3C90X: Rx Overrun (%hX)",errcode>>16); + else if (errcode & (1<<17)) + outputf("3C90X: Runt Frame (%hX)",errcode>>16); + else if (errcode & (1<<18)) + outputf("3C90X: Alignment Error (%hX)",errcode>>16); + else if (errcode & (1<<19)) + outputf("3C90X: CRC Error (%hX)",errcode>>16); + else if (errcode & (1<<20)) + outputf("3C90X: Oversized Frame (%hX)",errcode>>16); + else + outputf("3C90X: Packet error (%hX)",errcode>>16); + return NULL; + } + /* Resize the packet to how large it actually is. */ + pbuf_realloc(p, rxdesc.status & 0x1FFF); + + return p; +} /*** a3c90x_disable: exported routine to disable the card. What's this for? *** the eepro100.c driver didn't have one, so I just left this one empty too. @@ -930,7 +915,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661); /* * Set our exported functions **/ - nic.poll = a3c90x_poll; + nic.recv = a3c90x_poll; nic.transmit = a3c90x_transmit; memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6); eth_register(&nic); diff --git a/net/etherboot-compat.h b/net/etherboot-compat.h index 6982a21..0b121a3 100644 --- a/net/etherboot-compat.h +++ b/net/etherboot-compat.h @@ -19,7 +19,7 @@ struct nic { unsigned char hwaddr[6]; - int (*poll) (struct nic *nic, int retrieve); + struct pbuf * (*recv) (struct nic *nic); void (*transmit) (struct pbuf *p); }; diff --git a/net/net.c b/net/net.c index 0c83b9b..3e6130f 100644 --- a/net/net.c +++ b/net/net.c @@ -27,11 +27,8 @@ extern struct pci_driver a3c90x_driver; void eth_poll() { - unsigned char pkt[1600]; - int len; - struct pbuf *p, *q; + struct pbuf *p; struct eth_hdr *ethhdr; - int pos = 0; static int ticks = 0; if (!_nic) @@ -47,30 +44,10 @@ void eth_poll() tcp_tmr(); ticks++; - if (_nic->poll(_nic, 0)) + if ((p = _nic->recv(_nic)) != NULL) { - _nic->packet = pkt; - _nic->poll(_nic, 1); - - len = _nic->packetlen; - - outputf("NIC: Packet: %d bytes", len); + outputf("NIC: Packet: %d bytes", p->tot_len); - p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL); - if (p == NULL) - { - outputf("NIC: out of memory for packet?"); - LINK_STATS_INC(link.memerr); - LINK_STATS_INC(link.drop); - return; - } - - for(q = p; q != NULL; q = q->next) - { - memcpy(q->payload, pkt+pos, q->len); - pos += q->len; - } - LINK_STATS_INC(link.recv); ethhdr = p->payload; -- 2.43.0 From 80c7c8bffb0bdf3bc667a00bccae4dfe877906d4 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 07:05:15 -0500 Subject: [PATCH 05/16] Queue up a rxdesc, instead of busy waiting for the card to get back to us. This is a HUGE performance improvement; in particular, the host OS does not slow down dramatically under any/all network load. --- net/3c90x.c | 90 +++++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/net/3c90x.c b/net/3c90x.c index ce35b95..74035e0 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -251,6 +251,7 @@ static struct static struct nic nic; static txdesc_t txdesc; static rxdesc_t rxdesc; +static struct pbuf *currecv; #define _outl(v,a) outl((a),(v)) @@ -542,34 +543,25 @@ a3c90x_transmit(struct pbuf *p) #endif } - - -/*** a3c90x_poll: exported routine that waits for a certain length of time - *** for a packet, and if it sees none, returns 0. This routine should - *** copy the packet to nic->packet if it gets a packet and set the size - *** in nic->packetlen. Return 1 if a packet was found. - ***/ -static struct pbuf * a3c90x_poll(struct nic *nic) +/* _setup_recv allocates and sets a pbuf from lwIP as the active receive + * packet chain for the 3c90x. The 3c90x must not be trying to receive + * when _setup_recv is being called. + */ +static void _setup_recv(struct nic *nic) { - int i, errcode; struct pbuf *p, *q; + int i; - /* Upload engine acks rxComplete for us later. */ - if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & 0x0010)) - return NULL; + rxdesc.status = 0; /* Clear it out in the very beginning. */ p = pbuf_alloc(PBUF_RAW, 1536 /* XXX magic Max len */, PBUF_POOL); if (!p) { outputf("3c90x: out of memory for packet?"); - return NULL; + currecv = p; + return; } - - /* We don't need to acknowledge rxComplete -- the upload engine does - * it for us. - */ - - /** Build the up-load descriptor **/ + rxdesc.next = 0; rxdesc.status = 0; for (i = 0, q = p; q; q = q->next, i++) @@ -577,17 +569,31 @@ static struct pbuf * a3c90x_poll(struct nic *nic) rxdesc.segments[i].addr = v2p(q->payload); rxdesc.segments[i].len = q->len | (q->next ? 0 : (1 << 31)); } - - /** Submit the upload descriptor to the NIC **/ + outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdesc)); + + currecv = p; +} - /** Wait for upload completion (upComplete(15) or upError (14)) **/ - for (i = 0; i < 40000; i++) /* XXX What is this shit?! */ - ; - while((rxdesc.status & ((1<<14) | (1<<15))) == 0) - for (i = 0; i < 40000; i++) - ; - +/*** a3c90x_poll: exported routine that waits for a certain length of time + *** for a packet, and if it sees none, returns 0. This routine should + *** copy the packet to nic->packet if it gets a packet and set the size + *** in nic->packetlen. Return 1 if a packet was found. + ***/ +static struct pbuf * a3c90x_poll(struct nic *nic) +{ + int errcode; + struct pbuf *p; + + if (!currecv) + _setup_recv(nic); + + /* Nothing to do? */ + if ((rxdesc.status & ((1<<14) | (1<<15))) == 0) + return NULL; + + p = currecv; + /** Check for Error (else we have good packet) **/ if (rxdesc.status & (1<<14)) { @@ -604,11 +610,14 @@ static struct pbuf * a3c90x_poll(struct nic *nic) outputf("3C90X: Oversized Frame (%hX)",errcode>>16); else outputf("3C90X: Packet error (%hX)",errcode>>16); + + pbuf_free(p); /* Bounce the old one before setting it up again. */ + _setup_recv(nic); return NULL; } - /* Resize the packet to how large it actually is. */ - pbuf_realloc(p, rxdesc.status & 0x1FFF); + pbuf_realloc(p, rxdesc.status & 0x1FFF); /* Resize the packet to how large it actually is. */ + _setup_recv(nic); /* ..and light the NIC up again. */ return p; } @@ -805,45 +814,44 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) linktype = 0x0008; if (mopt & 0x01) { - outputf("%s100Base-T4",(c++)?", ":""); + outputf(" 100Base-T4"); linktype = 0x0006; } if (mopt & 0x04) { - outputf("%s100Base-FX",(c++)?", ":""); + outputf(" 100Base-FX"); linktype = 0x0005; } if (mopt & 0x10) { - outputf("%s10Base-2",(c++)?", ":""); + outputf(" 10Base-2"); linktype = 0x0003; } if (mopt & 0x20) { - outputf("%sAUI",(c++)?", ":""); + outputf(" AUI"); linktype = 0x0001; } if (mopt & 0x40) { - outputf("%sMII",(c++)?", ":""); + outputf(" MII"); linktype = 0x0006; } if ((mopt & 0xA) == 0xA) { - outputf("%s10Base-T / 100Base-TX",(c++)?", ":""); + outputf(" 10Base-T / 100Base-TX"); linktype = 0x0008; } else if ((mopt & 0xA) == 0x2) { - outputf("%s100Base-TX",(c++)?", ":""); + outputf(" 100Base-TX"); linktype = 0x0008; } else if ((mopt & 0xA) == 0x8) { - outputf("%s10Base-T",(c++)?", ":""); + outputf(" 10Base-T"); linktype = 0x0008; } - outputf("."); /** Determine transceiver type to use, depending on value stored in ** eeprom 0x16 @@ -905,7 +913,9 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) /** Set the RX filter = receive only individual pkts & multicast & bcast. **/ _issue_command(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04); _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0); - + + /* Now stick a packet in the queue. */ + _setup_recv(&nic); /** ** set Indication and Interrupt flags , acknowledge any IRQ's -- 2.43.0 From bc9e1044fd166db4e75cdc39b2aaa17d942b3ca4 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 07:10:18 -0500 Subject: [PATCH 06/16] Be more quiet about this whole transmit and receive business. This time, we actually *are* spending a lot of time in the serial console. --- net/3c90x.c | 11 ++++------- net/net.c | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/net/3c90x.c b/net/3c90x.c index 74035e0..936f297 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -454,8 +454,7 @@ static void a3c90x_reset(void) *** size - size of the non-header part of the packet that needs transmitted; *** pkt - the pointer to the packet data itself. ***/ -static void -a3c90x_transmit(struct pbuf *p) +static void _transmit(struct pbuf *p) { unsigned char status; static struct pbuf *oldpbuf = NULL; @@ -494,8 +493,6 @@ a3c90x_transmit(struct pbuf *p) /** set notification for transmission completion (bit 15) **/ txdesc.hdr = (len) | 0x8000; - outputf("3c90x: Sending %d byte %d seg packet", len, n); - /** Send the packet **/ outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&txdesc)); _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */); @@ -580,7 +577,7 @@ static void _setup_recv(struct nic *nic) *** copy the packet to nic->packet if it gets a packet and set the size *** in nic->packetlen. Return 1 if a packet was found. ***/ -static struct pbuf * a3c90x_poll(struct nic *nic) +static struct pbuf * _recv(struct nic *nic) { int errcode; struct pbuf *p; @@ -925,8 +922,8 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661); /* * Set our exported functions **/ - nic.recv = a3c90x_poll; - nic.transmit = a3c90x_transmit; + nic.recv = _recv; + nic.transmit = _transmit; memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6); eth_register(&nic); diff --git a/net/net.c b/net/net.c index 3e6130f..5d0c75b 100644 --- a/net/net.c +++ b/net/net.c @@ -46,7 +46,7 @@ void eth_poll() if ((p = _nic->recv(_nic)) != NULL) { - outputf("NIC: Packet: %d bytes", p->tot_len); +// outputf("NIC: Packet: %d bytes", p->tot_len); LINK_STATS_INC(link.recv); @@ -74,7 +74,7 @@ static err_t _transmit(struct netif *netif, struct pbuf *p) { struct nic *nic = netif->state; - outputf("NIC: Transmit packet"); +// outputf("NIC: Transmit packet"); nic->transmit(p); -- 2.43.0 From 03bcc4db7995b38ecda927e65d7bf2e657477664 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 07:22:48 -0500 Subject: [PATCH 07/16] Be a little bit quieter, and consequentially be a lot bit faster. --- net/net.c | 3 ++- net/rfb.c | 23 +++++++---------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/net/net.c b/net/net.c index 5d0c75b..e7bb80a 100644 --- a/net/net.c +++ b/net/net.c @@ -30,6 +30,7 @@ void eth_poll() struct pbuf *p; struct eth_hdr *ethhdr; static int ticks = 0; + int i = 15; /* Don't process more than 15 packets at a time; we don't want the host to get TOO badly slowed down... */ if (!_nic) return; @@ -44,7 +45,7 @@ void eth_poll() tcp_tmr(); ticks++; - if ((p = _nic->recv(_nic)) != NULL) + while ((i--) && ((p = _nic->recv(_nic)) != NULL)) { // outputf("NIC: Packet: %d bytes", p->tot_len); diff --git a/net/rfb.c b/net/rfb.c index ff0f089..057c406 100644 --- a/net/rfb.c +++ b/net/rfb.c @@ -185,7 +185,6 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { /* FALL THROUGH */ case SST_SENDING: - while (1) { unsigned char mbuf[8192 /* XXX magic */]; @@ -199,26 +198,18 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { if (left > 8192) left = 8192; - if (left > tcp_mss(pcb)) { - sndlength = tcp_mss(pcb); - } else { - sndlength = left; - } + memcpy(mbuf, fb->fbaddr + state->update_pos, left); /* It's OK if it becomes smaller later. */ - memcpy(mbuf, fb->fbaddr + state->update_pos, sndlength); /* It's OK if it becomes smaller later. */ - + sndlength = left; do { err = tcp_write(pcb, mbuf, sndlength, TCP_WRITE_FLAG_COPY /* This is my memory on the stack, thank you very much. */); - if (err == ERR_MEM) { - outputf("RFB: ERR_MEM sending %d", sndlength); + if (err == ERR_MEM) /* Back down until lwip says we've got space. */ sndlength /= 2; - } } while (err == ERR_MEM && sndlength > 1); - if (err == ERR_OK) { - outputf("RFB: attempting send %d", sndlength); - } else { - outputf("RFB: send error %d", err); + if (err != ERR_OK) { + /* We'll just give up for now and come back when we have space later. */ + //outputf("RFB: send error %d", err); break; } @@ -460,7 +451,7 @@ static err_t rfb_recv(void *arg, struct tcp_pcb *pcb, case OK: outputf("RFB FSM: ok"); - /* Might as well send now... */ + /* Kick off a send. */ if (state->send_state == SST_IDLE && state->update_requested) { send_fsm(pcb, state); -- 2.43.0 From 8cc40c4dafdeb2d5786695c19163c8e7cc757a46 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 08:00:02 -0500 Subject: [PATCH 08/16] Only memcpy as much as we need to when we need to. --- net/rfb.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/net/rfb.c b/net/rfb.c index 057c406..1f620f0 100644 --- a/net/rfb.c +++ b/net/rfb.c @@ -164,8 +164,7 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { break; } - /* potential FALL THROUGH */ - + /* FALL THROUGH to SST_NEEDS_UPDATE*/ case SST_NEEDS_UPDATE: outputf("RFB send: sending header"); /* Send a header */ @@ -182,12 +181,9 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { state->update_pos = 0; state->send_state = SST_SENDING; - /* FALL THROUGH */ - + /* FALL THROUGH to SST_SENDING*/ case SST_SENDING: while (1) { - unsigned char mbuf[8192 /* XXX magic */]; - left = state->frame_bytes - state->update_pos; if (left == 0) { @@ -195,21 +191,21 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { break; } - if (left > 8192) + if (left > 8192) /* Sounds good enough to me. */ left = 8192; - memcpy(mbuf, fb->fbaddr + state->update_pos, left); /* It's OK if it becomes smaller later. */ - sndlength = left; do { - err = tcp_write(pcb, mbuf, sndlength, TCP_WRITE_FLAG_COPY /* This is my memory on the stack, thank you very much. */); + err = tcp_write(pcb, fb->fbaddr + state->update_pos, sndlength, TCP_WRITE_FLAG_COPY /* The card can't DMA from there. */); if (err == ERR_MEM) /* Back down until lwip says we've got space. */ sndlength /= 2; } while (err == ERR_MEM && sndlength > 1); if (err != ERR_OK) { + if (err != ERR_MEM) + outputf("RFB: send error %d", err); + /* We'll just give up for now and come back when we have space later. */ - //outputf("RFB: send error %d", err); break; } @@ -224,9 +220,7 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { } if (tcp_output(pcb) != ERR_OK) - { outputf("RFB: tcp_output bailed in send_fsm?"); - } } static err_t rfb_sent(void *arg, struct tcp_pcb *pcb, uint16_t len) { @@ -344,7 +338,6 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { for (i = 0; i < ntohs(req->num); i++) { outputf("RFB: Encoding: %d", ntohl(req->encodings[i])); /* XXX ... */ - } state->readpos += pktsize; -- 2.43.0 From eda689ee9aa29e6c4e791a7f295bc4a0a3ad5d83 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 08:56:14 -0500 Subject: [PATCH 09/16] Enable caching while in SMM. --- aseg-paging/smi.c | 7 +++++++ include/msr.h | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 include/msr.h diff --git a/aseg-paging/smi.c b/aseg-paging/smi.c index 7f75a85..d519341 100644 --- a/aseg-paging/smi.c +++ b/aseg-paging/smi.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "../net/net.h" #include "vga-overlay.h" @@ -18,6 +19,9 @@ void smi_entry(void) { char statstr[512]; + /* Reenable caching on SMRAM. */ + WRMSR(0x202, (RDMSR(0x202) & ~(0xFFULL)) | 0x06ULL); + pcisave = inl(0xCF8); vgasave = inb(0x3D4); pci_unbother_all(); @@ -51,6 +55,9 @@ void smi_entry(void) pci_bother_all(); outl(0xCF8, pcisave); outb(0x3D4, vgasave); + + /* Disable caching on SMRAM again, to prevent the user from whacking us. */ + WRMSR(0x202, RDMSR(0x202) & ~(0xFFULL)); } extern void timer_handler(smi_event_t ev); diff --git a/include/msr.h b/include/msr.h new file mode 100644 index 0000000..0bed091 --- /dev/null +++ b/include/msr.h @@ -0,0 +1,18 @@ +#ifndef _MSR_H +#define _MSR_H + +#define WRMSR(ad, da) \ + do { \ + unsigned long __a = (ad); \ + unsigned long long __d = (da); \ + asm volatile("wrmsr" : : "c" (__a), "A" (__d)); \ + } while (0) +#define RDMSR(ad) \ + ({ \ + unsigned long __a = (ad); \ + unsigned long long __d; \ + asm volatile("rdmsr" : "=A" (__d) : "c" (__a)); \ + __d; \ + }) + +#endif -- 2.43.0 From bec09bd18a879a22688c68febaff8c65da41f752 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 6 Dec 2008 10:50:53 -0500 Subject: [PATCH 10/16] Convert receive to be a ring buffer. --- net/3c90x.c | 177 ++++++++++++++++++++++++----------------- net/etherboot-compat.h | 2 +- net/net.c | 52 ++++++------ net/net.h | 2 + 4 files changed, 137 insertions(+), 96 deletions(-) diff --git a/net/3c90x.c b/net/3c90x.c index 936f297..5686327 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -250,9 +250,6 @@ static struct static struct nic nic; static txdesc_t txdesc; -static rxdesc_t rxdesc; -static struct pbuf *currecv; - #define _outl(v,a) outl((a),(v)) #define _outw(v,a) outw((a),(v)) @@ -462,8 +459,11 @@ static void _transmit(struct pbuf *p) if (oldpbuf) { + int i = 0; while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running()) - ; + i++; + if (i) + outputf("3c90x: had to wait %d loops to tx", i); if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE)) { outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b)); @@ -540,83 +540,120 @@ static void _transmit(struct pbuf *p) #endif } -/* _setup_recv allocates and sets a pbuf from lwIP as the active receive - * packet chain for the 3c90x. The 3c90x must not be trying to receive - * when _setup_recv is being called. +/***************************** Receive routines *****************************/ +#define MAX_RECV_SIZE 1536 +#define RECV_BUFS 4 + +static rxdesc_t rxdescs[RECV_BUFS]; +static struct pbuf *pbufs[RECV_BUFS] = {0,}; + +/* rxcons is the pointer to the receive descriptor that the ethernet card will + * write into next. + */ +static int rxcons = 0; + +/* rxprod is the pointer to the receive descriptor that the driver will + * allocate next. */ -static void _setup_recv(struct nic *nic) +static int rxprod = 0; + +/* _recv_prepare fills the 3c90x's ring buffer with fresh pbufs from lwIP. + * The upload engine need not be stalled. + */ +static void _recv_prepare(struct nic *nic) { - struct pbuf *p, *q; - int i; - - rxdesc.status = 0; /* Clear it out in the very beginning. */ - - p = pbuf_alloc(PBUF_RAW, 1536 /* XXX magic Max len */, PBUF_POOL); - if (!p) + int oldprod; + + oldprod = rxprod; + while ((rxprod != rxcons) || !pbufs[rxprod]) { - outputf("3c90x: out of memory for packet?"); - currecv = p; - return; + int i; + struct pbuf *p; + + if (!pbufs[rxprod]) + pbufs[rxprod] = p = pbuf_alloc(PBUF_RAW, MAX_RECV_SIZE, PBUF_POOL); + else { + outputf("WARNING: 3c90x has pbuf in slot %d", rxprod); + p = pbufs[rxprod]; + } + + if (!p) + { + outputf("3c90x: out of memory for rx pbuf?"); + break; + } + + rxdescs[rxprod].status = 0; + rxdescs[rxprod].next = 0; + for (i = 0; p; p = p->next, i++) + { + rxdescs[rxprod].segments[i].addr = v2p(p->payload); + rxdescs[rxprod].segments[i].len = p->len | (p->next ? 0 : (1 << 31)); + } + + /* Hook in the new one after and only after it's been fully set up. */ + rxdescs[(rxprod + RECV_BUFS - 1) % RECV_BUFS].next = v2p(&(rxdescs[rxprod])); + rxprod = (rxprod + 1) % RECV_BUFS; } - rxdesc.next = 0; - rxdesc.status = 0; - for (i = 0, q = p; q; q = q->next, i++) + if (inl(INF_3C90X.IOAddr + regUpListPtr_l) == 0 && pbufs[oldprod]) /* Ran out of shit, and got new shit? */ { - rxdesc.segments[i].addr = v2p(q->payload); - rxdesc.segments[i].len = q->len | (q->next ? 0 : (1 << 31)); + outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdescs[oldprod])); + outputf("3c90x: WARNING: Ran out of rx slots"); } - outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdesc)); - - currecv = p; } -/*** a3c90x_poll: exported routine that waits for a certain length of time - *** for a packet, and if it sees none, returns 0. This routine should - *** copy the packet to nic->packet if it gets a packet and set the size - *** in nic->packetlen. Return 1 if a packet was found. - ***/ -static struct pbuf * _recv(struct nic *nic) +/* _recv polls the ring buffer to see if any packets are available. If any + * are, then eth_recv is called for each available. _recv returns how many + * packets it received successfully. Whether _recv got any packets or not, + * _recv does not block, and reinitializes the ring buffer with fresh pbufs. + */ +static int _recv(struct nic *nic) { - int errcode; + int errcode, n = 0; struct pbuf *p; - if (!currecv) - _setup_recv(nic); - /* Nothing to do? */ - if ((rxdesc.status & ((1<<14) | (1<<15))) == 0) - return NULL; - - p = currecv; - - /** Check for Error (else we have good packet) **/ - if (rxdesc.status & (1<<14)) + while ((rxdescs[rxcons].status & ((1<<14) | (1<<15))) != 0) { - errcode = rxdesc.status; - if (errcode & (1<<16)) - outputf("3C90X: Rx Overrun (%hX)",errcode>>16); - else if (errcode & (1<<17)) - outputf("3C90X: Runt Frame (%hX)",errcode>>16); - else if (errcode & (1<<18)) - outputf("3C90X: Alignment Error (%hX)",errcode>>16); - else if (errcode & (1<<19)) - outputf("3C90X: CRC Error (%hX)",errcode>>16); - else if (errcode & (1<<20)) - outputf("3C90X: Oversized Frame (%hX)",errcode>>16); - else - outputf("3C90X: Packet error (%hX)",errcode>>16); + /** Check for Error (else we have good packet) **/ + if (rxdescs[rxcons].status & (1<<14)) + { + errcode = rxdescs[rxcons].status; + if (errcode & (1<<16)) + outputf("3C90X: Rx Overrun (%hX)",errcode>>16); + else if (errcode & (1<<17)) + outputf("3C90X: Runt Frame (%hX)",errcode>>16); + else if (errcode & (1<<18)) + outputf("3C90X: Alignment Error (%hX)",errcode>>16); + else if (errcode & (1<<19)) + outputf("3C90X: CRC Error (%hX)",errcode>>16); + else if (errcode & (1<<20)) + outputf("3C90X: Oversized Frame (%hX)",errcode>>16); + else + outputf("3C90X: Packet error (%hX)",errcode>>16); - pbuf_free(p); /* Bounce the old one before setting it up again. */ - _setup_recv(nic); - return NULL; + p = NULL; + pbuf_free(pbufs[rxcons]); /* Bounce the old one before setting it up again. */ + } else { + p = pbufs[rxcons]; + pbuf_realloc(p, rxdescs[rxcons].status & 0x1FFF); /* Resize the packet to how large it actually is. */ + } + + pbufs[rxcons] = NULL; + rxdescs[rxcons].status = 0; + rxcons = (rxcons + 1) % RECV_BUFS; + + if (p) + { + eth_recv(nic, p); + n++; + } } - pbuf_realloc(p, rxdesc.status & 0x1FFF); /* Resize the packet to how large it actually is. */ - _setup_recv(nic); /* ..and light the NIC up again. */ - - return p; + _recv_prepare(nic); /* Light the NIC up again. */ + return n; } /*** a3c90x_disable: exported routine to disable the card. What's this for? @@ -785,12 +822,6 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2); _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4); - /** Fill in our entry in the etherboot arp table **/ -/* XXX ? for lwip? - for(i=0;i> (8*((i&1)^1))) & 0xff; -*/ - /** Read the media options register, print a message and set default ** xcvr. ** @@ -909,10 +940,12 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) /** Set the RX filter = receive only individual pkts & multicast & bcast. **/ _issue_command(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04); - _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0); - /* Now stick a packet in the queue. */ - _setup_recv(&nic); + /* Stick some packets in the queue. */ + _recv_prepare(&nic); + + /* And light up the RX engine. */ + _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0); /** ** set Indication and Interrupt flags , acknowledge any IRQ's diff --git a/net/etherboot-compat.h b/net/etherboot-compat.h index 0b121a3..2f0626f 100644 --- a/net/etherboot-compat.h +++ b/net/etherboot-compat.h @@ -19,7 +19,7 @@ struct nic { unsigned char hwaddr[6]; - struct pbuf * (*recv) (struct nic *nic); + int (*recv) (struct nic *nic); void (*transmit) (struct pbuf *p); }; diff --git a/net/net.c b/net/net.c index e7bb80a..0b57321 100644 --- a/net/net.c +++ b/net/net.c @@ -25,10 +25,33 @@ static struct netif _netif; extern struct pci_driver a3c90x_driver; -void eth_poll() +void eth_recv(struct nic *nic, struct pbuf *p) { - struct pbuf *p; struct eth_hdr *ethhdr; + + LINK_STATS_INC(link.recv); + + ethhdr = p->payload; + + switch (htons(ethhdr->type)) { + case ETHTYPE_IP: + case ETHTYPE_ARP: + if (_netif.input(p, &_netif) != ERR_OK) + { + LWIP_DEBUGF(NETIF_DEBUG, ("netdev_input: IP input error\n")); + pbuf_free(p); + } + break; + + default: + outputf("Unhandled packet type %04x input", ethhdr->type); + pbuf_free(p); + break; + } +} + +void eth_poll() +{ static int ticks = 0; int i = 15; /* Don't process more than 15 packets at a time; we don't want the host to get TOO badly slowed down... */ @@ -45,29 +68,12 @@ void eth_poll() tcp_tmr(); ticks++; - while ((i--) && ((p = _nic->recv(_nic)) != NULL)) + while (i > 0) { -// outputf("NIC: Packet: %d bytes", p->tot_len); - - LINK_STATS_INC(link.recv); - - ethhdr = p->payload; - - switch (htons(ethhdr->type)) { - case ETHTYPE_IP: - case ETHTYPE_ARP: - if (_netif.input(p, &_netif) != ERR_OK) - { - LWIP_DEBUGF(NETIF_DEBUG, ("netdev_input: IP input error\n")); - pbuf_free(p); - } - break; - - default: - outputf("Unhandled packet type %04x input", ethhdr->type); - pbuf_free(p); + int n = _nic->recv(_nic); + i -= n; + if (n == 0) break; - } } } diff --git a/net/net.h b/net/net.h index 7b522f0..ae82f47 100644 --- a/net/net.h +++ b/net/net.h @@ -2,8 +2,10 @@ #define _NET_H #include "etherboot-compat.h" +#include extern void eth_init(); +extern void eth_recv(struct nic *nic, struct pbuf *p); extern void eth_poll(); extern int eth_register(struct nic *nic); -- 2.43.0 From 73d65ee64db897452946c14e2b911b4c1f106b26 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sun, 7 Dec 2008 04:39:50 -0500 Subject: [PATCH 11/16] Convert the transmitter to be a ring buffer, too. --- TODO | 2 + lwip/src/include/lwipopts.h | 3 +- net/3c90x.c | 132 +++++++++++++++++++++++------------- 3 files changed, 87 insertions(+), 50 deletions(-) diff --git a/TODO b/TODO index 7bb07b3..477d14e 100644 --- a/TODO +++ b/TODO @@ -16,3 +16,5 @@ To do list: as pass 1 -- later it can use the PCI scan) [ ] Synchronize headers [ ] Fix build system... +[ ] Something has gone very wrong with the receive ring buffer, and on + occasion, the machine stops receiving forever. \ No newline at end of file diff --git a/lwip/src/include/lwipopts.h b/lwip/src/include/lwipopts.h index 5288a27..974af84 100644 --- a/lwip/src/include/lwipopts.h +++ b/lwip/src/include/lwipopts.h @@ -17,12 +17,13 @@ extern void _memcpy(void *dest, const void *src, int bytes); /* Lots of tricks from http://lists.gnu.org/archive/html/lwip-users/2006-11/msg00007.html */ -#define MEM_SIZE 65536 +#define MEM_SIZE (128*1024) #define TCP_MSS 1460 #define TCP_WND 24000 #define TCP_SND_BUF (16 * TCP_MSS) #define TCP_SND_QUEUELEN 16 #define MEMP_NUM_PBUF 128 +#define PBUF_POOL_SIZE 64 #endif diff --git a/net/3c90x.c b/net/3c90x.c index 5686327..6d4eea0 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -249,7 +249,6 @@ static struct INF_3C90X; static struct nic nic; -static txdesc_t txdesc; #define _outl(v,a) outl((a),(v)) #define _outw(v,a) outw((a),(v)) @@ -442,69 +441,104 @@ static void a3c90x_reset(void) return; } +/***************************** Transmit routines *****************************/ +#define XMIT_BUFS 8 -/*** a3c90x_transmit: exported function that transmits a packet. Does not - *** return any particular status. Parameters are: - *** dest_addr[6] - destination address, ethernet; - *** proto - protocol type (ARP, IP, etc); - *** size - size of the non-header part of the packet that needs transmitted; - *** pkt - the pointer to the packet data itself. - ***/ +static txdesc_t txdescs[XMIT_BUFS]; +static struct pbuf *txpbufs[XMIT_BUFS] = {0,}; + +/* txcons is the index into the ring buffer of the last packet that the + * 3c90x was seen processing, or -1 if the 3c90x was idle. + */ +static int txcons = -1; + +/* txprod is the index of the _next_ buffer that the driver will write into. */ +static int txprod = 0; + +/* _transmit adds a packet to the transmit ring buffer. If no space is + * available in the buffer, then _transmit blocks until a packet has been + * transmitted. + */ static void _transmit(struct pbuf *p) { unsigned char status; - static struct pbuf *oldpbuf = NULL; - unsigned int n, len; + int len, n; - if (oldpbuf) + /* Wait for there to be space. */ + if (txcons == txprod) { int i = 0; - while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running()) + + outputf("3c90x: txbuf full, waiting for space..."); + while (inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0) i++; - if (i) - outputf("3c90x: had to wait %d loops to tx", i); - if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE)) + outputf("3c90x: took %d iters", i); + } + + /* Stall the download engine so it doesn't bother us. */ + _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */); + + /* Clean up old txcons. */ + if (txcons != -1) + { + unsigned long curp = inl(INF_3C90X.IOAddr + regDnListPtr_l); + int end; + + if (curp == 0) + end = txprod; + else + end = (curp - v2p(txdescs)) / sizeof(txdescs[0]); + + while (txcons != end) { - outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b)); - outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w)); + pbuf_free(txpbufs[txcons]); + txpbufs[txcons] = NULL; + txdescs[txcons].hdr = 0; + txdescs[txcons].next = 0; + txcons = (txcons + 1) % XMIT_BUFS; } - status = inb(INF_3C90X.IOAddr + regTxStatus_b); + if (txcons == txprod) + txcons = -1; + } + + /* Look at the TX status */ + status = inb(INF_3C90X.IOAddr + regTxStatus_b); + if (status) + { + outputf("3c90x: error: the nus."); outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00); - pbuf_free(oldpbuf); - oldpbuf = NULL; } - _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */); - - /** Setup the DPD (download descriptor) **/ - txdesc.next = 0; + /* Set up the new txdesc. */ + txdescs[txprod].next = 0; len = 0; n = 0; - oldpbuf = p; + txpbufs[txprod] = p; for (; p; p = p->next) { - txdesc.segments[n].addr = v2p(p->payload); - txdesc.segments[n].len = p->len | (p->next ? 0 : (1 << 31)); + txdescs[txprod].segments[n].addr = v2p(p->payload); + txdescs[txprod].segments[n].len = p->len | (p->next ? 0 : (1 << 31)); len += p->len; pbuf_ref(p); n++; } - /** set notification for transmission completion (bit 15) **/ - txdesc.hdr = (len) | 0x8000; + txdescs[txprod].hdr = len; /* If we wanted completion notification, bit 15 */ - /** Send the packet **/ - outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&txdesc)); - _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */); - - oneshot_start_ms(10); - while((inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0) && oneshot_running()) - ; - if (!oneshot_running()) + /* Now link the new one in, after it's been set up. */ + txdescs[(txprod + XMIT_BUFS - 1) % XMIT_BUFS].next = v2p(&(txdescs[txprod])); + + /* If the card is stopped, start it up again. */ + if (inl(INF_3C90X.IOAddr + regDnListPtr_l) == 0) { - outputf("3c90x: Download engine pointer timeout"); - return; + outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&(txdescs[txprod]))); + txcons = txprod; } + + txprod = (txprod + 1) % XMIT_BUFS; + + /* And let it proceed on its way. */ + _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */); #if 0 /** successful completion (sans "interrupt Requested" bit) **/ @@ -542,10 +576,10 @@ static void _transmit(struct pbuf *p) /***************************** Receive routines *****************************/ #define MAX_RECV_SIZE 1536 -#define RECV_BUFS 4 +#define RECV_BUFS 16 static rxdesc_t rxdescs[RECV_BUFS]; -static struct pbuf *pbufs[RECV_BUFS] = {0,}; +static struct pbuf *rxpbufs[RECV_BUFS] = {0,}; /* rxcons is the pointer to the receive descriptor that the ethernet card will * write into next. @@ -565,16 +599,16 @@ static void _recv_prepare(struct nic *nic) int oldprod; oldprod = rxprod; - while ((rxprod != rxcons) || !pbufs[rxprod]) + while ((rxprod != rxcons) || !rxpbufs[rxprod]) { int i; struct pbuf *p; - if (!pbufs[rxprod]) - pbufs[rxprod] = p = pbuf_alloc(PBUF_RAW, MAX_RECV_SIZE, PBUF_POOL); + if (!rxpbufs[rxprod]) + rxpbufs[rxprod] = p = pbuf_alloc(PBUF_RAW, MAX_RECV_SIZE, PBUF_POOL); else { outputf("WARNING: 3c90x has pbuf in slot %d", rxprod); - p = pbufs[rxprod]; + p = rxpbufs[rxprod]; } if (!p) @@ -596,7 +630,7 @@ static void _recv_prepare(struct nic *nic) rxprod = (rxprod + 1) % RECV_BUFS; } - if (inl(INF_3C90X.IOAddr + regUpListPtr_l) == 0 && pbufs[oldprod]) /* Ran out of shit, and got new shit? */ + if (inl(INF_3C90X.IOAddr + regUpListPtr_l) == 0 && rxpbufs[oldprod]) /* Ran out of shit, and got new shit? */ { outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdescs[oldprod])); outputf("3c90x: WARNING: Ran out of rx slots"); @@ -635,13 +669,13 @@ static int _recv(struct nic *nic) outputf("3C90X: Packet error (%hX)",errcode>>16); p = NULL; - pbuf_free(pbufs[rxcons]); /* Bounce the old one before setting it up again. */ + pbuf_free(rxpbufs[rxcons]); /* Bounce the old one before setting it up again. */ } else { - p = pbufs[rxcons]; + p = rxpbufs[rxcons]; pbuf_realloc(p, rxdescs[rxcons].status & 0x1FFF); /* Resize the packet to how large it actually is. */ } - pbufs[rxcons] = NULL; + rxpbufs[rxcons] = NULL; rxdescs[rxcons].status = 0; rxcons = (rxcons + 1) % RECV_BUFS; -- 2.43.0 From 421ccff4aaad4ddaba92ae0dba69fe6dbc9c1105 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sun, 7 Dec 2008 05:00:19 -0500 Subject: [PATCH 12/16] Tweak some values up a bit. Try harder to unstall the upload engine. Remove dead and potentially dangerous code. Change comments in header. --- lwip/src/include/lwipopts.h | 2 +- net/3c90x.c | 126 ++++-------------------------------- 2 files changed, 14 insertions(+), 114 deletions(-) diff --git a/lwip/src/include/lwipopts.h b/lwip/src/include/lwipopts.h index 974af84..ec5a614 100644 --- a/lwip/src/include/lwipopts.h +++ b/lwip/src/include/lwipopts.h @@ -24,6 +24,6 @@ extern void _memcpy(void *dest, const void *src, int bytes); #define TCP_SND_QUEUELEN 16 #define MEMP_NUM_PBUF 128 -#define PBUF_POOL_SIZE 64 +#define PBUF_POOL_SIZE 96 #endif diff --git a/net/3c90x.c b/net/3c90x.c index 6d4eea0..43546cf 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -1,10 +1,12 @@ /* - * 3c90x.c -- This file implements the 3c90x driver for etherboot. Written - * by Greg Beeley, Greg.Beeley@LightSys.org. Modified by Steve Smith, - * Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net). + * 3c90x.c + * NetWatch * - * This program Copyright (C) 1999 LightSys Technology Services, Inc. - * Portions Copyright (C) 1999 Steve Smith + * A ring buffer-based, bus-mastering Ethernet driver. + * + * Derived from Etherboot's 3c90x.c, which is + * Copyright (C) 1999 LightSys Technology Services, Inc. + * Portions Copyright (C) 1999 Steve Smith * * This program may be re-distributed in source or binary form, modified, * sold, or copied for any purpose, provided that the above copyright message @@ -15,13 +17,6 @@ * PURPOSE or MERCHANTABILITY. Please read the associated documentation * "3c90x.txt" before compiling and using this driver. * - * -------- - * - * Program written with the assistance of the 3com documentation for - * the 3c905B-TX card, as well as with some assistance from the 3c59x - * driver Donald Becker wrote for the Linux kernel, and with some assistance - * from the remainder of the Etherboot distribution. - * * REVISION HISTORY: * * v0.10 1-26-1998 GRB Initial implementation. @@ -31,9 +26,10 @@ * Re-wrote poll and transmit for * better error recovery and heavy * network traffic operation - * v2.01 5-26-2003 NN Fixed driver alignment issue which - * caused system lockups if driver structures - * not 8-byte aligned. + * v2.01 5-26-2003 NN Fixed driver alignment issue which + * caused system lockups if driver structures + * not 8-byte aligned. + * NetWatch0 12-07-2008 JAW Taken out back and shot. * */ @@ -48,11 +44,6 @@ #include #define XCVR_MAGIC (0x5A00) -/** any single transmission fails after 16 collisions or other errors - ** this is the number of times to retry the transmission -- this should - ** be plenty - **/ -#define XMIT_RETRIES 5 /*** Register definitions for the 3c905 ***/ enum Registers @@ -317,83 +308,6 @@ a3c90x_internal_ReadEeprom(int ioaddr, int address) } -#ifdef CFG_3C90X_BOOTROM_FIX -/*** a3c90x_internal_WriteEepromWord - write a physical word of - *** data to the onboard serial eeprom (not the BIOS prom, but the - *** nvram in the card that stores, among other things, the MAC - *** address). - ***/ -static int -a3c90x_internal_WriteEepromWord(int ioaddr, int address, unsigned short value) - { - /** Select register window **/ - _set_window(ioaddr, winEepromBios0); - - /** Verify Eeprom not busy **/ - while((1<<15) & inw(ioaddr + regEepromCommand_0_w)); - - /** Issue WriteEnable, and wait for completion. **/ - _outw(0x30, ioaddr + regEepromCommand_0_w); - while((1<<15) & inw(ioaddr + regEepromCommand_0_w)); - - /** Issue EraseRegister, and wait for completion. **/ - _outw(address + ((0x03)<<6), ioaddr + regEepromCommand_0_w); - while((1<<15) & inw(ioaddr + regEepromCommand_0_w)); - - /** Send the new data to the eeprom, and wait for completion. **/ - _outw(value, ioaddr + regEepromData_0_w); - _outw(0x30, ioaddr + regEepromCommand_0_w); - while((1<<15) & inw(ioaddr + regEepromCommand_0_w)); - - /** Burn the new data into the eeprom, and wait for completion. **/ - _outw(address + ((0x01)<<6), ioaddr + regEepromCommand_0_w); - while((1<<15) & inw(ioaddr + regEepromCommand_0_w)); - - return 0; - } -#endif - -#ifdef CFG_3C90X_BOOTROM_FIX -/*** a3c90x_internal_WriteEeprom - write data to the serial eeprom, - *** and re-compute the eeprom checksum. - ***/ -static int -a3c90x_internal_WriteEeprom(int ioaddr, int address, unsigned short value) - { - int cksum = 0,v; - int i; - int maxAddress, cksumAddress; - - if (INF_3C90X.isBrev) - { - maxAddress=0x1f; - cksumAddress=0x20; - } - else - { - maxAddress=0x16; - cksumAddress=0x17; - } - - /** Write the value. **/ - if (a3c90x_internal_WriteEepromWord(ioaddr, address, value) == -1) - return -1; - - /** Recompute the checksum. **/ - for(i=0;i<=maxAddress;i++) - { - v = a3c90x_internal_ReadEeprom(ioaddr, i); - cksum ^= (v & 0xFF); - cksum ^= ((v>>8) & 0xFF); - } - /** Write the checksum to the location in the eeprom **/ - if (a3c90x_internal_WriteEepromWord(ioaddr, cksumAddress, cksum) == -1) - return -1; - - return 0; - } -#endif - /*** a3c90x_reset: exported function that resets the card to its default *** state. This is so the Linux driver can re-set the card up the way *** it wants to. If CFG_3C90X_PRESERVE_XCVR is defined, then the reset will @@ -576,7 +490,7 @@ static void _transmit(struct pbuf *p) /***************************** Receive routines *****************************/ #define MAX_RECV_SIZE 1536 -#define RECV_BUFS 16 +#define RECV_BUFS 32 static rxdesc_t rxdescs[RECV_BUFS]; static struct pbuf *rxpbufs[RECV_BUFS] = {0,}; @@ -636,6 +550,7 @@ static void _recv_prepare(struct nic *nic) outputf("3c90x: WARNING: Ran out of rx slots"); } + _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 1 /* Unstall upload */); } /* _recv polls the ring buffer to see if any packets are available. If any @@ -776,12 +691,6 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) eeprom[i] = a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, i); } -#ifdef CFG_3C90X_BOOTROM_FIX - /** Set xcvrSelect in InternalConfig in eeprom. **/ - /* only necessary for 3c905b revision cards with boot PROM bug!!! */ - a3c90x_internal_WriteEeprom(INF_3C90X.IOAddr, 0x13, 0x0160); -#endif - #ifdef CFG_3C90X_XCVR if (CFG_3C90X_XCVR == 255) { @@ -806,15 +715,6 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) } } - /** Print identification message **/ -#ifdef CFG_3C90X_BOOTROM_FIX - if (INF_3C90X.isBrev) - { - outputf("NOTE: 3c905b bootrom fix enabled; has side " - "effects. See 3c90x.txt for info."); - } -#endif - /** Retrieve the Hardware address and print it on the screen. **/ INF_3C90X.HWAddr[0] = eeprom[HWADDR_OFFSET + 0]>>8; INF_3C90X.HWAddr[1] = eeprom[HWADDR_OFFSET + 0]&0xFF; -- 2.43.0 From 6d6494e427a90913216c94306593a65cb5361c0d Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sun, 7 Dec 2008 06:10:33 -0500 Subject: [PATCH 13/16] Another set of 3c90x style cleanups. --- TODO | 5 +- net/3c90x.c | 598 ++++++++++++++++++----------------------- net/etherboot-compat.h | 2 +- net/net.c | 2 +- 4 files changed, 261 insertions(+), 346 deletions(-) diff --git a/TODO b/TODO index 477d14e..6234244 100644 --- a/TODO +++ b/TODO @@ -16,5 +16,6 @@ To do list: as pass 1 -- later it can use the PCI scan) [ ] Synchronize headers [ ] Fix build system... -[ ] Something has gone very wrong with the receive ring buffer, and on - occasion, the machine stops receiving forever. \ No newline at end of file +[X] Something has gone very wrong with the receive ring buffer, and on + occasion, the machine stops receiving forever. + fixed a few hours later... diff --git a/net/3c90x.c b/net/3c90x.c index 43546cf..f0d303a 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -228,28 +228,25 @@ typedef struct { segment_t segments[64]; } rxdesc_t __attribute__ ((aligned(8))); -/*** Global variables ***/ -static struct - { - unsigned int is3c556; - unsigned char isBrev; - unsigned char CurrentWindow; - unsigned int IOAddr; - unsigned char HWAddr[ETH_ALEN]; - } - INF_3C90X; +typedef struct { + struct nic nic; + int is3c556; + int isBrev; + int curwnd; + int ioaddr; +} nic_3c90x_t; -static struct nic nic; +static nic_3c90x_t _nic; #define _outl(v,a) outl((a),(v)) #define _outw(v,a) outw((a),(v)) #define _outb(v,a) outb((a),(v)) -static int _issue_command(int ioaddr, int cmd, int param) +static int _issue_command(nic_3c90x_t *nic, int cmd, int param) { - outw(ioaddr + regCommandIntStatus_w, (cmd << 11) | param); + outw(nic->ioaddr + regCommandIntStatus_w, (cmd << 11) | param); - while (inw(ioaddr + regCommandIntStatus_w) & INT_CMDINPROGRESS) + while (inw(nic->ioaddr + regCommandIntStatus_w) & INT_CMDINPROGRESS) ; return 0; @@ -258,27 +255,27 @@ static int _issue_command(int ioaddr, int cmd, int param) /*** a3c90x_internal_SetWindow: selects a register window set. ***/ -static int _set_window(int ioaddr, int window) +static int _set_window(nic_3c90x_t *nic, int window) { - if (INF_3C90X.CurrentWindow == window) + if (nic->curwnd == window) return 0; - _issue_command(ioaddr, cmdSelectRegisterWindow, window); - INF_3C90X.CurrentWindow = window; + _issue_command(nic, cmdSelectRegisterWindow, window); + nic->curwnd = window; return 0; } -/*** a3c90x_internal_ReadEeprom - read data from the serial eeprom. +/*** _read_eeprom - read data from the serial eeprom. ***/ static unsigned short -a3c90x_internal_ReadEeprom(int ioaddr, int address) +_read_eeprom(nic_3c90x_t *nic, int address) { unsigned short val; /** Select correct window **/ - _set_window(INF_3C90X.IOAddr, winEepromBios0); + _set_window(nic, winEepromBios0); /** Make sure the eeprom isn't busy **/ do @@ -287,13 +284,13 @@ a3c90x_internal_ReadEeprom(int ioaddr, int address) for (i = 0; i < 165; i++) inb(0x80); /* wait 165 usec */ } - while(0x8000 & inw(ioaddr + regEepromCommand_0_w)); + while(0x8000 & inw(nic->ioaddr + regEepromCommand_0_w)); /** Read the value. **/ - if (INF_3C90X.is3c556) - _outw(address + (0x230), ioaddr + regEepromCommand_0_w); + if (nic->is3c556) + _outw(address + (0x230), nic->ioaddr + regEepromCommand_0_w); else - _outw(address + 0x80, ioaddr + regEepromCommand_0_w); + _outw(address + 0x80, nic->ioaddr + regEepromCommand_0_w); do { @@ -301,59 +298,59 @@ a3c90x_internal_ReadEeprom(int ioaddr, int address) for (i = 0; i < 165; i++) inb(0x80); /* wait 165 usec */ } - while(0x8000 & inw(ioaddr + regEepromCommand_0_w)); - val = inw(ioaddr + regEepromData_0_w); + while(0x8000 & inw(nic->ioaddr + regEepromCommand_0_w)); + val = inw(nic->ioaddr + regEepromData_0_w); return val; } +#if 0 /*** a3c90x_reset: exported function that resets the card to its default *** state. This is so the Linux driver can re-set the card up the way *** it wants to. If CFG_3C90X_PRESERVE_XCVR is defined, then the reset will *** not alter the selected transceiver that we used to download the boot *** image. ***/ -static void a3c90x_reset(void) - { +static void _reset(nic_3c90x_t *nic) +{ /** Send the reset command to the card **/ outputf("3c90x: issuing RESET"); - _issue_command(INF_3C90X.IOAddr, cmdGlobalReset, 0); + _issue_command(nic, cmdGlobalReset, 0); /** global reset command resets station mask, non-B revision cards ** require explicit reset of values **/ - _set_window(INF_3C90X.IOAddr, winAddressing2); - _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0); - _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2); - _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4); + _set_window(nic, winAddressing2); + _outw(0, nic->ioaddr + regStationMask_2_3w+0); + _outw(0, nic->ioaddr + regStationMask_2_3w+2); + _outw(0, nic->ioaddr + regStationMask_2_3w+4); /** Issue transmit reset, wait for command completion **/ - _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0); - if (! INF_3C90X.isBrev) - _outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b); - _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0); + _issue_command(nic, cmdTxReset, 0); + if (!nic->isBrev) + _outb(0x01, nic->ioaddr + regTxFreeThresh_b); + _issue_command(nic, cmdTxEnable, 0); /** ** reset of the receiver on B-revision cards re-negotiates the link ** takes several seconds (a computer eternity) **/ - if (INF_3C90X.isBrev) - _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x04); + if (nic->isBrev) + _issue_command(nic, cmdRxReset, 0x04); else - _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x00); - while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS) - ; - _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0); + _issue_command(nic, cmdRxReset, 0x00); + _issue_command(nic, cmdRxEnable, 0); - _issue_command(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0); + _issue_command(nic, cmdSetInterruptEnable, 0); /** enable rxComplete and txComplete **/ - _issue_command(INF_3C90X.IOAddr, cmdSetIndicationEnable, 0x0014); + _issue_command(nic, cmdSetIndicationEnable, 0x0014); /** acknowledge any pending status flags **/ - _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661); + _issue_command(nic, cmdAcknowledgeInterrupt, 0x661); return; - } +} +#endif /***************************** Transmit routines *****************************/ @@ -374,8 +371,9 @@ static int txprod = 0; * available in the buffer, then _transmit blocks until a packet has been * transmitted. */ -static void _transmit(struct pbuf *p) +static void _transmit(struct nic *_nic, struct pbuf *p) { + nic_3c90x_t *nic = (nic_3c90x_t *)_nic; unsigned char status; int len, n; @@ -385,18 +383,18 @@ static void _transmit(struct pbuf *p) int i = 0; outputf("3c90x: txbuf full, waiting for space..."); - while (inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0) + while (inl(nic->ioaddr + regDnListPtr_l) != 0) i++; outputf("3c90x: took %d iters", i); } /* Stall the download engine so it doesn't bother us. */ - _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */); + _issue_command(nic, cmdStallCtl, 2 /* Stall download */); /* Clean up old txcons. */ if (txcons != -1) { - unsigned long curp = inl(INF_3C90X.IOAddr + regDnListPtr_l); + unsigned long curp = inl(nic->ioaddr + regDnListPtr_l); int end; if (curp == 0) @@ -417,11 +415,11 @@ static void _transmit(struct pbuf *p) } /* Look at the TX status */ - status = inb(INF_3C90X.IOAddr + regTxStatus_b); + status = inb(nic->ioaddr + regTxStatus_b); if (status) { outputf("3c90x: error: the nus."); - outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00); + outb(nic->ioaddr + regTxStatus_b, 0x00); } /* Set up the new txdesc. */ @@ -443,16 +441,16 @@ static void _transmit(struct pbuf *p) txdescs[(txprod + XMIT_BUFS - 1) % XMIT_BUFS].next = v2p(&(txdescs[txprod])); /* If the card is stopped, start it up again. */ - if (inl(INF_3C90X.IOAddr + regDnListPtr_l) == 0) + if (inl(nic->ioaddr + regDnListPtr_l) == 0) { - outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&(txdescs[txprod]))); + outl(nic->ioaddr + regDnListPtr_l, v2p(&(txdescs[txprod]))); txcons = txprod; } txprod = (txprod + 1) % XMIT_BUFS; /* And let it proceed on its way. */ - _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */); + _issue_command(nic, cmdStallCtl, 3 /* Unstall download */); #if 0 /** successful completion (sans "interrupt Requested" bit) **/ @@ -464,26 +462,26 @@ static void _transmit(struct pbuf *p) if (status & 0x02) { outputf("3c90x: Tx Reclaim Error (%hhX)", status); - a3c90x_reset(); + _reset(nic); } else if (status & 0x04) { outputf("3c90x: Tx Status Overflow (%hhX)", status); for (i=0; i<32; i++) - _outb(0x00, INF_3C90X.IOAddr + regTxStatus_b); + _outb(0x00, nic->ioaddr + regTxStatus_b); /** must re-enable after max collisions before re-issuing tx **/ - _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0); + _issue_command(nic, cmdTxEnable, 0); } else if (status & 0x08) { outputf("3c90x: Tx Max Collisions (%hhX)", status); /** must re-enable after max collisions before re-issuing tx **/ - _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0); + _issue_command(nic, cmdTxEnable, 0); } else if (status & 0x10) { outputf("3c90x: Tx Underrun (%hhX)", status); - a3c90x_reset(); + _reset(nic); } else if (status & 0x20) { outputf("3c90x: Tx Jabber (%hhX)", status); - a3c90x_reset(); + _reset(nic); } else if ((status & 0x80) != 0x80) { outputf("3c90x: Internal Error - Incomplete Transmission (%hhX)", status); - a3c90x_reset(); + _reset(nic); } #endif } @@ -508,7 +506,7 @@ static int rxprod = 0; /* _recv_prepare fills the 3c90x's ring buffer with fresh pbufs from lwIP. * The upload engine need not be stalled. */ -static void _recv_prepare(struct nic *nic) +static void _recv_prepare(nic_3c90x_t *nic) { int oldprod; @@ -544,13 +542,13 @@ static void _recv_prepare(struct nic *nic) rxprod = (rxprod + 1) % RECV_BUFS; } - if (inl(INF_3C90X.IOAddr + regUpListPtr_l) == 0 && rxpbufs[oldprod]) /* Ran out of shit, and got new shit? */ + if (inl(nic->ioaddr + regUpListPtr_l) == 0 && rxpbufs[oldprod]) /* Ran out of shit, and got new shit? */ { - outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdescs[oldprod])); + outl(nic->ioaddr + regUpListPtr_l, v2p(&rxdescs[oldprod])); outputf("3c90x: WARNING: Ran out of rx slots"); } - _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 1 /* Unstall upload */); + _issue_command(nic, cmdStallCtl, 1 /* Unstall upload */); } /* _recv polls the ring buffer to see if any packets are available. If any @@ -558,8 +556,9 @@ static void _recv_prepare(struct nic *nic) * packets it received successfully. Whether _recv got any packets or not, * _recv does not block, and reinitializes the ring buffer with fresh pbufs. */ -static int _recv(struct nic *nic) +static int _recv(struct nic *_nic) { + nic_3c90x_t *nic = (nic_3c90x_t *)_nic; int errcode, n = 0; struct pbuf *p; @@ -596,7 +595,7 @@ static int _recv(struct nic *nic) if (p) { - eth_recv(nic, p); + eth_recv(_nic, p); n++; } } @@ -605,70 +604,54 @@ static int _recv(struct nic *nic) return n; } -/*** a3c90x_disable: exported routine to disable the card. What's this for? - *** the eepro100.c driver didn't have one, so I just left this one empty too. - *** Ideas anyone? - *** Must turn off receiver at least so stray packets will not corrupt memory - *** [Ken] - ***/ -void a3c90x_disable(struct dev *dev) -{ - /* reset and disable merge */ - a3c90x_reset(); - /* Disable the receiver and transmitter. */ - _outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w); - _outw(cmdTxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w); -} - - /*** a3c90x_probe: exported routine to probe for the 3c905 card and perform *** initialization. If this routine is called, the pci functions did find the *** card. We just have to init it here. ***/ -static int a3c90x_probe(struct pci_dev * pci, void * data) +static int _probe(struct pci_dev *pci, void *data) { - INF_3C90X.is3c556 = (pci->did == 0x6055); - - int i, c; - unsigned short eeprom[0x100]; - unsigned int cfg; - unsigned int mopt; - unsigned int mstat; - unsigned short linktype; + nic_3c90x_t *nic = &_nic; + int i, c; + unsigned short eeprom[0x100]; + unsigned int cfg; + unsigned int mopt; + unsigned int mstat; + unsigned short linktype; #define HWADDR_OFFSET 10 - unsigned long ioaddr = 0; - for (i = 0; i < 6; i++) { - if (pci->bars[i].type == PCI_BAR_IO) { - ioaddr = pci->bars[i].addr; - break; - } - } - - if (ioaddr == 0) - { - outputf("3c90x: Unable to find I/O address"); - return 0; - } - - /* Power it on */ - pci_write16(pci->bus, pci->dev, pci->fn, 0xE0, - pci_read16(pci->bus, pci->dev, pci->fn, 0xE0) & ~0x3); + unsigned long ioaddr = 0; + for (i = 0; i < 6; i++) + if (pci->bars[i].type == PCI_BAR_IO) + { + ioaddr = pci->bars[i].addr; + break; + } + + if (ioaddr == 0) + { + outputf("3c90x: Unable to find I/O address"); + return 0; + } - outputf("3c90x: Picked I/O address %04x", ioaddr); - pci_bother_add(pci); - nic.ioaddr = ioaddr & ~3; - nic.irqno = 0; - - INF_3C90X.IOAddr = ioaddr; - INF_3C90X.CurrentWindow = 255; - switch (a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, 0x03)) + /* Power it on */ + pci_write16(pci->bus, pci->dev, pci->fn, 0xE0, + pci_read16(pci->bus, pci->dev, pci->fn, 0xE0) & ~0x3); + + outputf("3c90x: Picked I/O address %04x", ioaddr); + pci_bother_add(pci); + nic->nic.ioaddr = ioaddr & ~3; + nic->nic.irqno = 0; + + nic->ioaddr = ioaddr; + nic->is3c556 = (pci->did == 0x6055); + nic->curwnd = 255; + switch (_read_eeprom(nic, 0x03)) { case 0x9000: /** 10 Base TPO **/ case 0x9001: /** 10/100 T4 **/ case 0x9050: /** 10/100 TPO **/ case 0x9051: /** 10 Base Combo **/ - INF_3C90X.isBrev = 0; + nic->isBrev = 0; break; case 0x9004: /** 10 Base TPO **/ @@ -679,255 +662,186 @@ static int a3c90x_probe(struct pci_dev * pci, void * data) case 0x9056: /** 10/100 T4 **/ case 0x905A: /** 10 Base FX **/ default: - INF_3C90X.isBrev = 1; + nic->isBrev = 1; break; } - /** Load the EEPROM contents **/ - if (INF_3C90X.isBrev) - { - for(i=0;i<=/*0x20*/0x7F;i++) - { - eeprom[i] = a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, i); - } - -#ifdef CFG_3C90X_XCVR - if (CFG_3C90X_XCVR == 255) - { - /** Clear the LanWorks register **/ - a3c90x_internal_WriteEeprom(INF_3C90X.IOAddr, 0x16, 0); - } + /** Load the EEPROM contents **/ + if (nic->isBrev) + for(i=0;i<=0x20;i++) + eeprom[i] = _read_eeprom(nic, i); else - { - /** Set the selected permanent-xcvrSelect in the - ** LanWorks register - **/ - a3c90x_internal_WriteEeprom(INF_3C90X.IOAddr, 0x16, - XCVR_MAGIC + ((CFG_3C90X_XCVR) & 0x000F)); - } -#endif + for(i=0;i<=0x17;i++) + eeprom[i] = _read_eeprom(nic, i); + + /** Retrieve the Hardware address and print it on the screen. **/ + nic->nic.hwaddr[0] = eeprom[HWADDR_OFFSET + 0]>>8; + nic->nic.hwaddr[1] = eeprom[HWADDR_OFFSET + 0]&0xFF; + nic->nic.hwaddr[2] = eeprom[HWADDR_OFFSET + 1]>>8; + nic->nic.hwaddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF; + nic->nic.hwaddr[4] = eeprom[HWADDR_OFFSET + 2]>>8; + nic->nic.hwaddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF; + outputf("MAC Address = %02x:%02x:%02x:%02x:%02x:%02x", + nic->nic.hwaddr[0], nic->nic.hwaddr[1], + nic->nic.hwaddr[2], nic->nic.hwaddr[3], + nic->nic.hwaddr[4], nic->nic.hwaddr[5]); + + /** 3C556: Invert MII power **/ + if (nic->is3c556) { + _set_window(nic, winAddressing2); + outw(nic->ioaddr + regResetOptions_2_w, + inw(nic->ioaddr + regResetOptions_2_w) | 0x4000); } - else - { - for(i=0;i<=/*0x17*/0x7F;i++) - { - eeprom[i] = a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, i); - } - } - - /** Retrieve the Hardware address and print it on the screen. **/ - INF_3C90X.HWAddr[0] = eeprom[HWADDR_OFFSET + 0]>>8; - INF_3C90X.HWAddr[1] = eeprom[HWADDR_OFFSET + 0]&0xFF; - INF_3C90X.HWAddr[2] = eeprom[HWADDR_OFFSET + 1]>>8; - INF_3C90X.HWAddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF; - INF_3C90X.HWAddr[4] = eeprom[HWADDR_OFFSET + 2]>>8; - INF_3C90X.HWAddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF; - outputf("MAC Address = %02x:%02x:%02x:%02x:%02x:%02x", - INF_3C90X.HWAddr[0], - INF_3C90X.HWAddr[1], - INF_3C90X.HWAddr[2], - INF_3C90X.HWAddr[3], - INF_3C90X.HWAddr[4], - INF_3C90X.HWAddr[5]); - - /** 3C556: Invert MII power **/ - if (INF_3C90X.is3c556) { - unsigned int tmp; - _set_window(INF_3C90X.IOAddr, winAddressing2); - tmp = inw(INF_3C90X.IOAddr + regResetOptions_2_w); - tmp |= 0x4000; - _outw(tmp, INF_3C90X.IOAddr + regResetOptions_2_w); - } - - /* Test if the link is good, if not continue */ - _set_window(INF_3C90X.IOAddr, winDiagnostics4); - mstat = inw(INF_3C90X.IOAddr + regMediaStatus_4_w); - if((mstat & (1<<11)) == 0) { - outputf("Valid link not established"); - return 0; - } - - /** Program the MAC address into the station address registers **/ - _set_window(INF_3C90X.IOAddr, winAddressing2); - _outw(htons(eeprom[HWADDR_OFFSET + 0]), INF_3C90X.IOAddr + regStationAddress_2_3w); - _outw(htons(eeprom[HWADDR_OFFSET + 1]), INF_3C90X.IOAddr + regStationAddress_2_3w+2); - _outw(htons(eeprom[HWADDR_OFFSET + 2]), INF_3C90X.IOAddr + regStationAddress_2_3w+4); - _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0); - _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2); - _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4); - - /** Read the media options register, print a message and set default - ** xcvr. - ** - ** Uses Media Option command on B revision, Reset Option on non-B - ** revision cards -- same register address - **/ - _set_window(INF_3C90X.IOAddr, winTxRxOptions3); - mopt = inw(INF_3C90X.IOAddr + regResetMediaOptions_3_w); - /** mask out VCO bit that is defined as 10baseFL bit on B-rev cards **/ - if (! INF_3C90X.isBrev) - { - mopt &= 0x7F; + /* Test if the link is good; if not, bail out */ + _set_window(nic, winDiagnostics4); + mstat = inw(nic->ioaddr + regMediaStatus_4_w); + if((mstat & (1<<11)) == 0) { + outputf("3c90x: valid link not established"); + return 0; } - outputf("Connectors present: "); - c = 0; - linktype = 0x0008; - if (mopt & 0x01) - { - outputf(" 100Base-T4"); - linktype = 0x0006; - } - if (mopt & 0x04) - { - outputf(" 100Base-FX"); - linktype = 0x0005; - } - if (mopt & 0x10) - { - outputf(" 10Base-2"); - linktype = 0x0003; - } - if (mopt & 0x20) + /* Program the MAC address into the station address registers */ + _set_window(nic, winAddressing2); + outw(nic->ioaddr + regStationAddress_2_3w, htons(eeprom[HWADDR_OFFSET + 0])); + outw(nic->ioaddr + regStationAddress_2_3w+2, htons(eeprom[HWADDR_OFFSET + 1])); + outw(nic->ioaddr + regStationAddress_2_3w+4, htons(eeprom[HWADDR_OFFSET + 2])); + outw(nic->ioaddr + regStationMask_2_3w+0, 0); + outw(nic->ioaddr + regStationMask_2_3w+2, 0); + outw(nic->ioaddr + regStationMask_2_3w+4, 0); + + /** Read the media options register, print a message and set default + ** xcvr. + ** + ** Uses Media Option command on B revision, Reset Option on non-B + ** revision cards -- same register address + **/ + _set_window(nic, winTxRxOptions3); + mopt = inw(nic->ioaddr + regResetMediaOptions_3_w); + + /** mask out VCO bit that is defined as 10baseFL bit on B-rev cards **/ + if (!nic->isBrev) + mopt &= 0x7F; + + outputf("3c90x: connectors present: "); + c = 0; + linktype = 0x0008; + if (mopt & 0x01) { - outputf(" AUI"); - linktype = 0x0001; + outputf(" 100Base-T4"); + linktype = 0x0006; } - if (mopt & 0x40) + if (mopt & 0x04) { - outputf(" MII"); - linktype = 0x0006; + outputf(" 100Base-FX"); + linktype = 0x0005; } - if ((mopt & 0xA) == 0xA) + if (mopt & 0x10) { - outputf(" 10Base-T / 100Base-TX"); - linktype = 0x0008; + outputf(" 10Base-2"); + linktype = 0x0003; } - else if ((mopt & 0xA) == 0x2) + if (mopt & 0x20) { - outputf(" 100Base-TX"); - linktype = 0x0008; + outputf(" AUI"); + linktype = 0x0001; } - else if ((mopt & 0xA) == 0x8) + if (mopt & 0x40) { - outputf(" 10Base-T"); - linktype = 0x0008; + outputf(" MII"); + linktype = 0x0006; } - - /** Determine transceiver type to use, depending on value stored in - ** eeprom 0x16 - **/ - if (INF_3C90X.isBrev) + if ((mopt & 0xA) == 0xA) { - if ((eeprom[0x16] & 0xFF00) == XCVR_MAGIC) - { - /** User-defined **/ - linktype = eeprom[0x16] & 0x000F; - } + outputf(" 10Base-T / 100Base-TX"); + linktype = 0x0008; + } else if ((mopt & 0xA) == 0x2) { + outputf(" 100Base-TX"); + linktype = 0x0008; + } else if ((mopt & 0xA) == 0x8) { + outputf(" 10Base-T"); + linktype = 0x0008; } - else - { -#ifdef CFG_3C90X_XCVR - if (CFG_3C90X_XCVR != 255) - linktype = CFG_3C90X_XCVR; -#endif /* CFG_3C90X_XCVR */ - /** I don't know what MII MAC only mode is!!! **/ - if (linktype == 0x0009) - { - if (INF_3C90X.isBrev) + /** Determine transceiver type to use, depending on value stored in + ** eeprom 0x16 + **/ + if (nic->isBrev && ((eeprom[0x16] & 0xFF00) == XCVR_MAGIC)) + linktype = eeprom[0x16] & 0x000F; /* User-defined */ + else if (linktype == 0x0009) { + if (nic->isBrev) outputf("WARNING: MII External MAC Mode only supported on B-revision " - "cards!!!!\nFalling Back to MII Mode\n"); + "cards!!!!\nFalling Back to MII Mode\n"); linktype = 0x0006; - } } - /** enable DC converter for 10-Base-T **/ - if (linktype == 0x0003) - { - _issue_command(INF_3C90X.IOAddr, cmdEnableDcConverter, 0); - } - - /** Set the link to the type we just determined. **/ - _set_window(INF_3C90X.IOAddr, winTxRxOptions3); - cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l); - cfg &= ~(0xF<<20); - cfg |= (linktype<<20); - _outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l); - - /** Now that we set the xcvr type, reset the Tx and Rx, re-enable. **/ - _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0); - if (!INF_3C90X.isBrev) - _outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b); - - _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0); - - /** - ** reset of the receiver on B-revision cards re-negotiates the link - ** takes several seconds (a computer eternity) - **/ - if (INF_3C90X.isBrev) - _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x04); - else - _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x00); - - /** Set the RX filter = receive only individual pkts & multicast & bcast. **/ - _issue_command(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04); - - /* Stick some packets in the queue. */ - _recv_prepare(&nic); - - /* And light up the RX engine. */ - _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0); - - /** - ** set Indication and Interrupt flags , acknowledge any IRQ's - **/ - _issue_command(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0); - _issue_command(INF_3C90X.IOAddr, cmdSetIndicationEnable, 0x0014); - _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661); - - /* * Set our exported functions **/ - nic.recv = _recv; - nic.transmit = _transmit; - memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6); - eth_register(&nic); - - return 1; + /** enable DC converter for 10-Base-T **/ + if (linktype == 0x0003) + _issue_command(nic, cmdEnableDcConverter, 0); + + /** Set the link to the type we just determined. **/ + _set_window(nic, winTxRxOptions3); + cfg = inl(nic->ioaddr + regInternalConfig_3_l); + cfg &= ~(0xF<<20); + cfg |= (linktype<<20); + outl(nic->ioaddr + regInternalConfig_3_l, cfg); + + /* Reset and turn on the transmit engine. */ + _issue_command(nic, cmdTxReset, 0); + if (!nic->isBrev) + _outb(0x01, nic->ioaddr + regTxFreeThresh_b); + _issue_command(nic, cmdTxEnable, 0); + + /* Reset and turn on the receive engine. */ + _issue_command(nic, cmdRxReset, nic->isBrev ? 0x04 : 0x00); + _issue_command(nic, cmdSetRxFilter, 0x01 + 0x02 + 0x04); /* Individual, multicast, broadcast */ + _recv_prepare(nic); /* Set up the ring buffer... */ + _issue_command(nic, cmdRxEnable, 0); /* ... and light it up. */ + + /* Turn on interrupts, and ack any that are hanging out. */ + _issue_command(nic, cmdSetInterruptEnable, 0); + _issue_command(nic, cmdSetIndicationEnable, 0x0014); + _issue_command(nic, cmdAcknowledgeInterrupt, 0x661); + + /* Register with lwIP. */ + nic->nic.recv = _recv; + nic->nic.transmit = _transmit; + eth_register(&(nic->nic)); + + return 1; } -static struct pci_id a3c90x_nics[] = { -/* Original 90x revisions: */ -PCI_ROM(0x10b7, 0x6055, "3c556", "3C556"), /* Huricane */ -PCI_ROM(0x10b7, 0x9000, "3c905-tpo", "3Com900-TPO"), /* 10 Base TPO */ -PCI_ROM(0x10b7, 0x9001, "3c905-t4", "3Com900-Combo"), /* 10/100 T4 */ -PCI_ROM(0x10b7, 0x9050, "3c905-tpo100", "3Com905-TX"), /* 100 Base TX / 10/100 TPO */ -PCI_ROM(0x10b7, 0x9051, "3c905-combo", "3Com905-T4"), /* 100 Base T4 / 10 Base Combo */ -/* Newer 90xB revisions: */ -PCI_ROM(0x10b7, 0x9004, "3c905b-tpo", "3Com900B-TPO"), /* 10 Base TPO */ -PCI_ROM(0x10b7, 0x9005, "3c905b-combo", "3Com900B-Combo"), /* 10 Base Combo */ -PCI_ROM(0x10b7, 0x9006, "3c905b-tpb2", "3Com900B-2/T"), /* 10 Base TP and Base2 */ -PCI_ROM(0x10b7, 0x900a, "3c905b-fl", "3Com900B-FL"), /* 10 Base FL */ -PCI_ROM(0x10b7, 0x9055, "3c905b-tpo100", "3Com905B-TX"), /* 10/100 TPO */ -PCI_ROM(0x10b7, 0x9056, "3c905b-t4", "3Com905B-T4"), /* 10/100 T4 */ -PCI_ROM(0x10b7, 0x9058, "3c905b-9058", "3Com905B-9058"), /* Cyclone 10/100/BNC */ -PCI_ROM(0x10b7, 0x905a, "3c905b-fx", "3Com905B-FL"), /* 100 Base FX / 10 Base FX */ -/* Newer 90xC revision: */ -PCI_ROM(0x10b7, 0x9200, "3c905c-tpo", "3Com905C-TXM"), /* 10/100 TPO (3C905C-TXM) */ -PCI_ROM(0x10b7, 0x9202, "3c920b-emb-ati", "3c920B-EMB-WNM (ATI Radeon 9100 IGP)"), /* 3c920B-EMB-WNM (ATI Radeon 9100 IGP) */ -PCI_ROM(0x10b7, 0x9210, "3c920b-emb-wnm","3Com20B-EMB WNM"), -PCI_ROM(0x10b7, 0x9800, "3c980", "3Com980-Cyclone"), /* Cyclone */ -PCI_ROM(0x10b7, 0x9805, "3c9805", "3Com9805"), /* Dual Port Server Cyclone */ -PCI_ROM(0x10b7, 0x7646, "3csoho100-tx", "3CSOHO100-TX"), /* Hurricane */ -PCI_ROM(0x10b7, 0x4500, "3c450", "3Com450 HomePNA Tornado"), -PCI_ROM(0x10b7, 0x1201, "3c982a", "3Com982A"), -PCI_ROM(0x10b7, 0x1202, "3c982b", "3Com982B"), +static struct pci_id _pci_ids[] = { + /* Original 90x revisions: */ + PCI_ROM(0x10b7, 0x6055, "3c556", "3C556"), /* Huricane */ + PCI_ROM(0x10b7, 0x9000, "3c905-tpo", "3Com900-TPO"), /* 10 Base TPO */ + PCI_ROM(0x10b7, 0x9001, "3c905-t4", "3Com900-Combo"), /* 10/100 T4 */ + PCI_ROM(0x10b7, 0x9050, "3c905-tpo100", "3Com905-TX"), /* 100 Base TX / 10/100 TPO */ + PCI_ROM(0x10b7, 0x9051, "3c905-combo", "3Com905-T4"), /* 100 Base T4 / 10 Base Combo */ + /* Newer 90xB revisions: */ + PCI_ROM(0x10b7, 0x9004, "3c905b-tpo", "3Com900B-TPO"), /* 10 Base TPO */ + PCI_ROM(0x10b7, 0x9005, "3c905b-combo", "3Com900B-Combo"), /* 10 Base Combo */ + PCI_ROM(0x10b7, 0x9006, "3c905b-tpb2", "3Com900B-2/T"), /* 10 Base TP and Base2 */ + PCI_ROM(0x10b7, 0x900a, "3c905b-fl", "3Com900B-FL"), /* 10 Base FL */ + PCI_ROM(0x10b7, 0x9055, "3c905b-tpo100", "3Com905B-TX"), /* 10/100 TPO */ + PCI_ROM(0x10b7, 0x9056, "3c905b-t4", "3Com905B-T4"), /* 10/100 T4 */ + PCI_ROM(0x10b7, 0x9058, "3c905b-9058", "3Com905B-9058"), /* Cyclone 10/100/BNC */ + PCI_ROM(0x10b7, 0x905a, "3c905b-fx", "3Com905B-FL"), /* 100 Base FX / 10 Base FX */ + /* Newer 90xC revision: */ + PCI_ROM(0x10b7, 0x9200, "3c905c-tpo", "3Com905C-TXM"), /* 10/100 TPO (3C905C-TXM) */ + PCI_ROM(0x10b7, 0x9202, "3c920b-emb-ati", "3c920B-EMB-WNM (ATI Radeon 9100 IGP)"), /* 3c920B-EMB-WNM (ATI Radeon 9100 IGP) */ + PCI_ROM(0x10b7, 0x9210, "3c920b-emb-wnm","3Com20B-EMB WNM"), + PCI_ROM(0x10b7, 0x9800, "3c980", "3Com980-Cyclone"), /* Cyclone */ + PCI_ROM(0x10b7, 0x9805, "3c9805", "3Com9805"), /* Dual Port Server Cyclone */ + PCI_ROM(0x10b7, 0x7646, "3csoho100-tx", "3CSOHO100-TX"), /* Hurricane */ + PCI_ROM(0x10b7, 0x4500, "3c450", "3Com450 HomePNA Tornado"), + PCI_ROM(0x10b7, 0x1201, "3c982a", "3Com982A"), + PCI_ROM(0x10b7, 0x1202, "3c982b", "3Com982B"), }; struct pci_driver a3c90x_driver = { - .name = "3C90X", - .probe = a3c90x_probe, - .ids = a3c90x_nics, - .id_count = sizeof(a3c90x_nics)/sizeof(a3c90x_nics[0]), + .name = "3c90x", + .probe = _probe, + .ids = _pci_ids, + .id_count = sizeof(_pci_ids)/sizeof(_pci_ids[0]), }; diff --git a/net/etherboot-compat.h b/net/etherboot-compat.h index 2f0626f..b3ccc51 100644 --- a/net/etherboot-compat.h +++ b/net/etherboot-compat.h @@ -20,7 +20,7 @@ struct nic { unsigned char hwaddr[6]; int (*recv) (struct nic *nic); - void (*transmit) (struct pbuf *p); + void (*transmit) (struct nic *nic, struct pbuf *p); }; #define virt_to_bus(x) memory_v2p((void *)(x)) diff --git a/net/net.c b/net/net.c index 0b57321..25926af 100644 --- a/net/net.c +++ b/net/net.c @@ -83,7 +83,7 @@ static err_t _transmit(struct netif *netif, struct pbuf *p) // outputf("NIC: Transmit packet"); - nic->transmit(p); + nic->transmit(nic, p); LINK_STATS_INC(link.xmit); -- 2.43.0 From 4a7183911c58bc79653e663bc3711d48b5027655 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sun, 7 Dec 2008 06:17:26 -0500 Subject: [PATCH 14/16] Fix modulo issues in vga-overlay --- aseg-paging/vga-overlay.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/aseg-paging/vga-overlay.c b/aseg-paging/vga-overlay.c index e6e223c..f7d7bf4 100644 --- a/aseg-paging/vga-overlay.c +++ b/aseg-paging/vga-overlay.c @@ -74,7 +74,7 @@ void outlog() int y; for (y = -LOG_ONSCREEN; y < 0; y++) - strblit(logents[(y + prodptr) % LOGLEN], y + LOG_ONSCREEN, 40, 1); + strblit(logents[(y + prodptr + LOGLEN) % LOGLEN], y + LOG_ONSCREEN, 40, 1); } void dolog(const char *s) @@ -112,4 +112,3 @@ void (*outputf)(const char *s, ...) = dologf; void dump_log (char * target) { memcpy(target, logents, sizeof(logents)); } - -- 2.43.0 From 2c9b12c13a216fbaca15d3c0d4bf0b994950117f Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sun, 7 Dec 2008 06:30:45 -0500 Subject: [PATCH 15/16] Cleanup pass on 3c90x; in -> _in, out -> _out --- net/3c90x.c | 77 ++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/net/3c90x.c b/net/3c90x.c index f0d303a..7b6a72e 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -238,15 +238,20 @@ typedef struct { static nic_3c90x_t _nic; -#define _outl(v,a) outl((a),(v)) -#define _outw(v,a) outw((a),(v)) -#define _outb(v,a) outb((a),(v)) +#define _inb(n,a) (inb((n)->ioaddr + (a))) +#define _inw(n,a) (inw((n)->ioaddr + (a))) +#define _inl(n,a) (inl((n)->ioaddr + (a))) + +#define _outb(n,a,d) (outb((n)->ioaddr + (a), (d))) +#define _outw(n,a,d) (outw((n)->ioaddr + (a), (d))) +#define _outl(n,a,d) (outl((n)->ioaddr + (a), (d))) + static int _issue_command(nic_3c90x_t *nic, int cmd, int param) { - outw(nic->ioaddr + regCommandIntStatus_w, (cmd << 11) | param); + _outw(nic, regCommandIntStatus_w, (cmd << 11) | param); - while (inw(nic->ioaddr + regCommandIntStatus_w) & INT_CMDINPROGRESS) + while (_inw(nic, regCommandIntStatus_w) & INT_CMDINPROGRESS) ; return 0; @@ -284,13 +289,13 @@ _read_eeprom(nic_3c90x_t *nic, int address) for (i = 0; i < 165; i++) inb(0x80); /* wait 165 usec */ } - while(0x8000 & inw(nic->ioaddr + regEepromCommand_0_w)); + while(0x8000 & _inw(nic, regEepromCommand_0_w)); /** Read the value. **/ if (nic->is3c556) - _outw(address + (0x230), nic->ioaddr + regEepromCommand_0_w); + _outw(nic, regEepromCommand_0_w, address + 0x230); else - _outw(address + 0x80, nic->ioaddr + regEepromCommand_0_w); + _outw(nic, regEepromCommand_0_w, address + 0x80); do { @@ -298,8 +303,8 @@ _read_eeprom(nic_3c90x_t *nic, int address) for (i = 0; i < 165; i++) inb(0x80); /* wait 165 usec */ } - while(0x8000 & inw(nic->ioaddr + regEepromCommand_0_w)); - val = inw(nic->ioaddr + regEepromData_0_w); + while(0x8000 & _inw(nic, regEepromCommand_0_w)); + val = _inw(nic, regEepromData_0_w); return val; } @@ -322,14 +327,14 @@ static void _reset(nic_3c90x_t *nic) ** require explicit reset of values **/ _set_window(nic, winAddressing2); - _outw(0, nic->ioaddr + regStationMask_2_3w+0); - _outw(0, nic->ioaddr + regStationMask_2_3w+2); - _outw(0, nic->ioaddr + regStationMask_2_3w+4); + _outw(nic, regStationMask_2_3w+0, 0); + _outw(nic, regStationMask_2_3w+2, 0); + _outw(nic, regStationMask_2_3w+4, 0); /** Issue transmit reset, wait for command completion **/ _issue_command(nic, cmdTxReset, 0); if (!nic->isBrev) - _outb(0x01, nic->ioaddr + regTxFreeThresh_b); + _outb(nic, regTxFreeThresh_b, 0x01); _issue_command(nic, cmdTxEnable, 0); /** @@ -383,7 +388,7 @@ static void _transmit(struct nic *_nic, struct pbuf *p) int i = 0; outputf("3c90x: txbuf full, waiting for space..."); - while (inl(nic->ioaddr + regDnListPtr_l) != 0) + while (_inl(nic, regDnListPtr_l) != 0) i++; outputf("3c90x: took %d iters", i); } @@ -394,7 +399,7 @@ static void _transmit(struct nic *_nic, struct pbuf *p) /* Clean up old txcons. */ if (txcons != -1) { - unsigned long curp = inl(nic->ioaddr + regDnListPtr_l); + unsigned long curp = _inl(nic, regDnListPtr_l); int end; if (curp == 0) @@ -415,11 +420,11 @@ static void _transmit(struct nic *_nic, struct pbuf *p) } /* Look at the TX status */ - status = inb(nic->ioaddr + regTxStatus_b); + status = _inb(nic, regTxStatus_b); if (status) { outputf("3c90x: error: the nus."); - outb(nic->ioaddr + regTxStatus_b, 0x00); + _outb(nic, regTxStatus_b, 0x00); } /* Set up the new txdesc. */ @@ -441,9 +446,9 @@ static void _transmit(struct nic *_nic, struct pbuf *p) txdescs[(txprod + XMIT_BUFS - 1) % XMIT_BUFS].next = v2p(&(txdescs[txprod])); /* If the card is stopped, start it up again. */ - if (inl(nic->ioaddr + regDnListPtr_l) == 0) + if (_inl(nic, regDnListPtr_l) == 0) { - outl(nic->ioaddr + regDnListPtr_l, v2p(&(txdescs[txprod]))); + _outl(nic, regDnListPtr_l, v2p(&(txdescs[txprod]))); txcons = txprod; } @@ -466,7 +471,7 @@ static void _transmit(struct nic *_nic, struct pbuf *p) } else if (status & 0x04) { outputf("3c90x: Tx Status Overflow (%hhX)", status); for (i=0; i<32; i++) - _outb(0x00, nic->ioaddr + regTxStatus_b); + _outb(nic, regTxStatus_b, 0x00); /** must re-enable after max collisions before re-issuing tx **/ _issue_command(nic, cmdTxEnable, 0); } else if (status & 0x08) { @@ -542,9 +547,9 @@ static void _recv_prepare(nic_3c90x_t *nic) rxprod = (rxprod + 1) % RECV_BUFS; } - if (inl(nic->ioaddr + regUpListPtr_l) == 0 && rxpbufs[oldprod]) /* Ran out of shit, and got new shit? */ + if (_inl(nic, regUpListPtr_l) == 0 && rxpbufs[oldprod]) /* Ran out of shit, and got new shit? */ { - outl(nic->ioaddr + regUpListPtr_l, v2p(&rxdescs[oldprod])); + _outl(nic, regUpListPtr_l, v2p(&rxdescs[oldprod])); outputf("3c90x: WARNING: Ran out of rx slots"); } @@ -689,13 +694,13 @@ static int _probe(struct pci_dev *pci, void *data) /** 3C556: Invert MII power **/ if (nic->is3c556) { _set_window(nic, winAddressing2); - outw(nic->ioaddr + regResetOptions_2_w, - inw(nic->ioaddr + regResetOptions_2_w) | 0x4000); + _outw(nic, regResetOptions_2_w, + _inw(nic, regResetOptions_2_w) | 0x4000); } /* Test if the link is good; if not, bail out */ _set_window(nic, winDiagnostics4); - mstat = inw(nic->ioaddr + regMediaStatus_4_w); + mstat = _inw(nic, regMediaStatus_4_w); if((mstat & (1<<11)) == 0) { outputf("3c90x: valid link not established"); return 0; @@ -703,12 +708,12 @@ static int _probe(struct pci_dev *pci, void *data) /* Program the MAC address into the station address registers */ _set_window(nic, winAddressing2); - outw(nic->ioaddr + regStationAddress_2_3w, htons(eeprom[HWADDR_OFFSET + 0])); - outw(nic->ioaddr + regStationAddress_2_3w+2, htons(eeprom[HWADDR_OFFSET + 1])); - outw(nic->ioaddr + regStationAddress_2_3w+4, htons(eeprom[HWADDR_OFFSET + 2])); - outw(nic->ioaddr + regStationMask_2_3w+0, 0); - outw(nic->ioaddr + regStationMask_2_3w+2, 0); - outw(nic->ioaddr + regStationMask_2_3w+4, 0); + _outw(nic, regStationAddress_2_3w, htons(eeprom[HWADDR_OFFSET + 0])); + _outw(nic, regStationAddress_2_3w+2, htons(eeprom[HWADDR_OFFSET + 1])); + _outw(nic, regStationAddress_2_3w+4, htons(eeprom[HWADDR_OFFSET + 2])); + _outw(nic, regStationMask_2_3w+0, 0); + _outw(nic, regStationMask_2_3w+2, 0); + _outw(nic, regStationMask_2_3w+4, 0); /** Read the media options register, print a message and set default ** xcvr. @@ -717,7 +722,7 @@ static int _probe(struct pci_dev *pci, void *data) ** revision cards -- same register address **/ _set_window(nic, winTxRxOptions3); - mopt = inw(nic->ioaddr + regResetMediaOptions_3_w); + mopt = _inw(nic, regResetMediaOptions_3_w); /** mask out VCO bit that is defined as 10baseFL bit on B-rev cards **/ if (!nic->isBrev) @@ -781,15 +786,15 @@ static int _probe(struct pci_dev *pci, void *data) /** Set the link to the type we just determined. **/ _set_window(nic, winTxRxOptions3); - cfg = inl(nic->ioaddr + regInternalConfig_3_l); + cfg = _inl(nic, regInternalConfig_3_l); cfg &= ~(0xF<<20); cfg |= (linktype<<20); - outl(nic->ioaddr + regInternalConfig_3_l, cfg); + _outl(nic, regInternalConfig_3_l, cfg); /* Reset and turn on the transmit engine. */ _issue_command(nic, cmdTxReset, 0); if (!nic->isBrev) - _outb(0x01, nic->ioaddr + regTxFreeThresh_b); + _outb(nic, regTxFreeThresh_b, 0x01); _issue_command(nic, cmdTxEnable, 0); /* Reset and turn on the receive engine. */ -- 2.43.0 From e78043912656bb21b61f963ae7a6a5b5e24758e3 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Fri, 12 Dec 2008 17:04:07 -0500 Subject: [PATCH 16/16] move keyboard to aseg-paging --- aseg-paging/Makefile | 2 +- aseg-paging/keyboard.c | 207 +++++++++++++++++++++++++++++++++++++++++ aseg-paging/keyboard.h | 11 +++ 3 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 aseg-paging/keyboard.c create mode 100644 aseg-paging/keyboard.h diff --git a/aseg-paging/Makefile b/aseg-paging/Makefile index ec70ea4..ae63244 100644 --- a/aseg-paging/Makefile +++ b/aseg-paging/Makefile @@ -52,7 +52,7 @@ OBJS = ../ich2/smi.o \ ../lib/sprintf.o \ ../lib/console.o \ ../lib/serial.o \ - ../aseg/keyboard.o \ + keyboard.o \ ../aseg/packet.o \ $(LWIP_OBJS) \ smi.o \ diff --git a/aseg-paging/keyboard.c b/aseg-paging/keyboard.c new file mode 100644 index 0000000..4b84b4f --- /dev/null +++ b/aseg-paging/keyboard.c @@ -0,0 +1,207 @@ +#include "keyboard.h" +#include + +static unsigned char kbd_inj_buffer[128]; +static int kbd_inj_start = 0; +static int kbd_inj_end = 0; +int kbd_mode = 1; + +static const char scancodes2[][8] = { + ['a'] = "\x1c\xf0\x1c", + ['b'] = "\x32\xf0\x32", + ['c'] = "\x21\xf0\x21", + ['d'] = "\x23\xf0\x23", + ['e'] = "\x24\xf0\x24", + ['f'] = "\x2b\xf0\x2b", + ['g'] = "\x34\xf0\x34", + ['h'] = "\x33\xf0\x33", + ['i'] = "\x43\xf0\x43", + ['j'] = "\x3b\xf0\x3b", + ['k'] = "\x42\xf0\x42", + ['l'] = "\x4b\xf0\x4b", + ['m'] = "\x3a\xf0\x3a", + ['n'] = "\x31\xf0\x31", + ['o'] = "\x44\xf0\x44", + ['p'] = "\x4d\xf0\x4d", + ['q'] = "\x15\xf0\x15", + ['r'] = "\x2d\xf0\x2d", + ['s'] = "\x1b\xf0\x1b", + ['t'] = "\x2c\xf0\x2c", + ['u'] = "\x3c\xf0\x3c", + ['v'] = "\x2a\xf0\x2a", + ['w'] = "\x1d\xf0\x1d", + ['x'] = "\x22\xf0\x22", + ['y'] = "\x35\xf0\x35", + ['z'] = "\x1a\xf0\x1a", + ['A'] = "\x12\x1c\xf0\x1c\xf0\x12", + ['B'] = "\x12\x32\xf0\x32\xf0\x12", + ['C'] = "\x12\x21\xf0\x21\xf0\x12", + ['D'] = "\x12\x23\xf0\x23\xf0\x12", + ['E'] = "\x12\x24\xf0\x24\xf0\x12", + ['F'] = "\x12\x2b\xf0\x2b\xf0\x12", + ['G'] = "\x12\x34\xf0\x34\xf0\x12", + ['H'] = "\x12\x33\xf0\x33\xf0\x12", + ['I'] = "\x12\x43\xf0\x43\xf0\x12", + ['J'] = "\x12\x3b\xf0\x3b\xf0\x12", + ['K'] = "\x12\x42\xf0\x42\xf0\x12", + ['L'] = "\x12\x4b\xf0\x4b\xf0\x12", + ['M'] = "\x12\x3a\xf0\x3a\xf0\x12", + ['N'] = "\x12\x31\xf0\x31\xf0\x12", + ['O'] = "\x12\x44\xf0\x44\xf0\x12", + ['P'] = "\x12\x4d\xf0\x4d\xf0\x12", + ['Q'] = "\x12\x15\xf0\x15\xf0\x12", + ['R'] = "\x12\x2d\xf0\x2d\xf0\x12", + ['S'] = "\x12\x1b\xf0\x1b\xf0\x12", + ['T'] = "\x12\x2c\xf0\x2c\xf0\x12", + ['U'] = "\x12\x3c\xf0\x3c\xf0\x12", + ['V'] = "\x12\x2a\xf0\x2a\xf0\x12", + ['W'] = "\x12\x1d\xf0\x1d\xf0\x12", + ['X'] = "\x12\x22\xf0\x22\xf0\x12", + ['Y'] = "\x12\x35\xf0\x35\xf0\x12", + ['Z'] = "\x12\x1a\xf0\x1a\xf0\x12", + ['`'] = "\x0e\xf0\x0e", + ['~'] = "\x12\x0e\xf0\x0e\xf0\x12", + ['1'] = "\x16\xf0\x16", + ['!'] = "\x12\x16\xf0\x16\xf0\x12", + ['2'] = "\x1e\xf0\x1e", + ['@'] = "\x12\x1e\xf0\x1e\xf0\x12", + ['3'] = "\x26\xf0\x26", + ['#'] = "\x12\x26\xf0\x26\xf0\x12", + ['4'] = "\x25\xf0\x25", + ['$'] = "\x12\x25\xf0\x25\xf0\x12", + ['5'] = "\x2e\xf0\x2e", + ['%'] = "\x12\x2e\xf0\x2e\xf0\x12", + ['6'] = "\x36\xf0\x36", + ['^'] = "\x12\x36\xf0\x36\xf0\x12", + ['7'] = "\x3d\xf0\x3d", + ['&'] = "\x12\x3d\xf0\x3d\xf0\x12", + ['8'] = "\x3e\xf0\x3e", + ['*'] = "\x12\x3e\xf0\x3e\xf0\x12", + ['9'] = "\x46\xf0\x46", + ['('] = "\x12\x46\xf0\x46\xf0\x12", + ['0'] = "\x45\xf0\x45", + [')'] = "\x12\x45\xf0\x45\xf0\x12", + ['-'] = "\x4e\xf0\x4e", + ['_'] = "\x12\x4e\xf0\x4e\xf0\x12", + ['='] = "\x55\xf0\x55", + ['+'] = "\x12\x55\xf0\x55\xf0\x12", + ['['] = "\x54\xf0\x54", + ['{'] = "\x12\x54\xf0\x54\xf0\x12", + [']'] = "\x5b\xf0\x5b", + ['}'] = "\x12\x5b\xf0\x5b\xf0\x12", + ['\\'] = "\x5d\xf0\x5d", + ['|'] = "\x12\x5d\xf0\x5d\xf0\x12", + [';'] = "\x4c\xf0\x4c", + [':'] = "\x12\x4c\xf0\x4c\xf0\x12", + ['\''] = "\x52\xf0\x52", + ['"'] = "\x12\x52\xf0\x52\xf0\x12", + [','] = "\x41\xf0\x41", + ['<'] = "\x12\x41\xf0\x41\xf0\x12", + ['.'] = "\x49\xf0\x49", + ['>'] = "\x12\x49\xf0\x49\xf0\x12", + ['/'] = "\x4a\xf0\x4a", + ['?'] = "\x12\x4a\xf0\x4a\xf0\x12", + ['\n'] = "\x5a\xf0\x5a", + ['\t'] = "\x0d\xf0\x0d", + ['\b'] = "\x66\xf0\x66", + [' '] = "\x29\xf0\x29", + [0x82] = "\xE0\x75\xE0\xF0\x75", + [0x83] = "\xE0\x72\xE0\xF0\x72", + [0x84] = "\xE0\x6B\xE0\xF0\x6B", + [0x85] = "\xE0\x74\xE0\xF0\x74" +}; + +const unsigned char convert_table[] = { + 0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58, 0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59, + 0x65, 0x38, 0x2a, 0x70, 0x1d, 0x10, 0x02, 0x5a, 0x66, 0x71, 0x2c, 0x1f, 0x1e, 0x11, 0x03, 0x5b, + 0x67, 0x2e, 0x2d, 0x20, 0x12, 0x05, 0x04, 0x5c, 0x68, 0x39, 0x2f, 0x21, 0x14, 0x13, 0x06, 0x5d, + 0x69, 0x31, 0x30, 0x23, 0x22, 0x15, 0x07, 0x5e, 0x6a, 0x72, 0x32, 0x24, 0x16, 0x08, 0x09, 0x5f, + 0x6b, 0x33, 0x25, 0x17, 0x18, 0x0b, 0x0a, 0x60, 0x6c, 0x34, 0x35, 0x26, 0x27, 0x19, 0x0c, 0x61, + 0x6d, 0x73, 0x28, 0x74, 0x1a, 0x0d, 0x62, 0x6e, 0x3a, 0x36, 0x1c, 0x1b, 0x75, 0x2b, 0x63, 0x76, + 0x55, 0x56, 0x77, 0x78, 0x79, 0x7a, 0x0e, 0x7b, 0x7c, 0x4f, 0x7d, 0x4b, 0x47, 0x7e, 0x7f, 0x6f, + 0x52, 0x53, 0x50, 0x4c, 0x4d, 0x48, 0x01, 0x45, 0x57, 0x4e, 0x51, 0x4a, 0x37, 0x49, 0x46, 0x54, + 0x80, 0x81, 0x82, 0x41, 0x54, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, + 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, + 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, + 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, + 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, + 0x00, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff +}; + +unsigned char sc_convert_1(unsigned char in) +{ + static int shifted = 0; + + if (shifted) + { + shifted = 0; + return convert_table[in] | 0x80; + } + + if (in == 0xF0) + { + shifted = 1; + return 0; + } else { + return convert_table[in]; + } +} + +void kbd_inject_scancode (unsigned char sc) +{ + outputf("Buffering %02x", sc); + kbd_inj_buffer[kbd_inj_end] = sc; + kbd_inj_end += 1; + kbd_inj_end %= sizeof(kbd_inj_buffer); +} + +void kbd_inject_key(unsigned char k) +{ + const char * c; + + if (kbd_mode == 1) { + c = scancodes2[k]; + if (!c) return; + while (*c) { + char cconv = sc_convert_1(*c); + if (cconv) kbd_inject_scancode(cconv); + c++; + } + } else { + c = scancodes2[k]; + if (!c) return; + while (*c) { + kbd_inject_scancode(*c); + c++; + } + } +} + +unsigned char kbd_get_injected_scancode() +{ + unsigned char b; + + if (kbd_inj_end != kbd_inj_start) + { + b = kbd_inj_buffer[kbd_inj_start]; + kbd_inj_start += 1; + kbd_inj_start %= sizeof(kbd_inj_buffer); + outputf("Injecting %02x", b); + return b; + } else { + outputf("Not injecting"); + return 0; + } +} + +int kbd_has_injected_scancode() +{ + if (kbd_inj_end != kbd_inj_start) + { + return 1; + } else { + return 0; + } +} diff --git a/aseg-paging/keyboard.h b/aseg-paging/keyboard.h new file mode 100644 index 0000000..3f66867 --- /dev/null +++ b/aseg-paging/keyboard.h @@ -0,0 +1,11 @@ +#ifndef KEYBOARD_H +#define KEYBOARD_H + +void kbd_inject_key(unsigned char k); + +unsigned char kbd_get_injected_scancode(); +int kbd_has_injected_scancode(); + +extern int kbd_mode; + +#endif -- 2.43.0