sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-21 12:30:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Modify gPXE core and drivers to work with the new timer subsystem

Browse Source 
Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
This commit is contained in:
Alexey Zaytsev
2008-03-02 03:41:10 +03:00
parent 4006d229e5
commit a1572e0ab0
58 changed files with 62 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/net/3c509.c
View File

@@ -9,7 +9,7 @@
#include <string.h>
#include <errno.h>
#include <io.h>
#include <timer.h>
#include <unistd.h>
#include <gpxe/device.h>
#include <gpxe/isa.h>
#include "3c509.h"

1
src/drivers/net/3c515.c
View File

@@ -50,7 +50,6 @@
#include "nic.h"
#include <gpxe/isapnp.h>
#include <gpxe/isa.h> /* for ISA_ROM */
#include "timer.h"
#include <gpxe/ethernet.h>
static void t3c515_wait(unsigned int nticks)

1
src/drivers/net/3c595.c
View File

@@ -30,7 +30,6 @@
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "3c595.h"
#include "timer.h"
static struct nic_operations t595_operations;

1
src/drivers/net/3c5x9.c
View File

@@ -28,7 +28,6 @@ $Id$
#include "etherboot.h"
#include "nic.h"
#include <gpxe/isa.h>
#include "timer.h"
#include "3c509.h"
static enum { none, bnc, utp } connector = none; /* for 3C509 */

7
src/drivers/net/3c90x.c
View File

@@ -43,7 +43,6 @@
#include "nic.h"
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "timer.h"
static struct nic_operations a3c90x_operations;
@@ -498,6 +497,7 @@ a3c90x_transmit(struct nic *nic __unused, const char *d, unsigned int t,
unsigned char status;
unsigned i, retries;
tick_t ct;
for (retries=0; retries < XMIT_RETRIES ; retries++)
{
@@ -540,9 +540,10 @@ a3c90x_transmit(struct nic *nic __unused, const char *d, unsigned int t,
;
/** Wait for NIC Transmit to Complete **/
load_timer2(10*TICKS_PER_MS); /* Give it 10 ms */
ct = currticks();
while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004) &&
timer2_running())
ct + 10*USECS_IN_MSEC < currticks());
;
if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004))

1
src/drivers/net/amd8111e.c
View File

@@ -33,7 +33,6 @@
#include "mii.h"
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "timer.h"
#include "string.h"
#include "stdint.h"
#include "amd8111e.h"

1
src/drivers/net/bnx2.c
View File

@@ -18,7 +18,6 @@
#include <errno.h>
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "timer.h"
#include "string.h"
#include "bnx2.h"
#include "bnx2_fw.h"

1
src/drivers/net/dmfe.c
View File

@@ -43,7 +43,6 @@
/* to get the PCI support functions, if this is a PCI NIC */
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "timer.h"
/* #define EDEBUG 1 */
#ifdef EDEBUG

1
src/drivers/net/e1000/e1000.h
View File

@@ -36,7 +36,6 @@
#include <stdio.h>
#include <io.h>
#include <errno.h>
#include <timer.h>
#include <byteswap.h>
#include <gpxe/pci.h>
#include <gpxe/malloc.h>

2
src/drivers/net/e1000/e1000_osdep.h
View File

@@ -39,7 +39,7 @@
#include <stdio.h>
#include <io.h>
#include <errno.h>
#include <timer.h>
#include <unistd.h>
#include <byteswap.h>
#include <gpxe/pci.h>
#include <gpxe/if_ether.h>

1
src/drivers/net/eepro.c
View File

@@ -35,7 +35,6 @@ has 34 pins, the top row of 2 are not used.
#include <errno.h>
#include "nic.h"
#include <gpxe/isa.h>
#include "timer.h"
#include <gpxe/ethernet.h>
/* Different 82595 chips */

13
src/drivers/net/eepro100.c
View File

@@ -107,7 +107,6 @@
#include "nic.h"
#include <gpxe/ethernet.h>
#include <gpxe/pci.h>
#include "timer.h"
static int ioaddr;
@@ -408,6 +407,7 @@ static void eepro100_transmit(struct nic *nic, const char *d, unsigned int t, un
} hdr;
unsigned short status;
int s1, s2;
tick_t ct;
status = inw(ioaddr + SCBStatus);
/* Acknowledge all of the current interrupt sources ASAP. */
@@ -445,8 +445,10 @@ static void eepro100_transmit(struct nic *nic, const char *d, unsigned int t, un
wait_for_cmd_done(ioaddr + SCBCmd);
s1 = inw (ioaddr + SCBStatus);
load_timer2(10*TICKS_PER_MS); /* timeout 10 ms for transmit */
while (!txfd.status && timer2_running())
ct = currticks();
/* timeout 10 ms for transmit */
while (!txfd.status && ct + 10*USECS_IN_MSEC)
/* Wait */;
s2 = inw (ioaddr + SCBStatus);
@@ -606,6 +608,7 @@ static int eepro100_probe ( struct nic *nic, struct pci_device *pci ) {
int read_cmd, ee_size;
int options;
int rx_mode;
tick_t ct;
/* we cache only the first few words of the EEPROM data
be careful not to access beyond this array */
@@ -749,8 +752,8 @@ static int eepro100_probe ( struct nic *nic, struct pci_device *pci ) {
whereami ("started TX thingy (config, iasetup).");
load_timer2(10*TICKS_PER_MS);
while (!txfd.status && timer2_running())
ct = currticks();
while (!txfd.status && ct + 10*USECS_IN_MSEC < currticks())
/* Wait */;
/* Read the status register once to disgard stale data */

16
src/drivers/net/epic100.c
View File

@@ -8,7 +8,6 @@
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "nic.h"
#include "timer.h"
#include "console.h"
#include "epic100.h"
@@ -310,6 +309,7 @@ epic100_transmit(struct nic *nic, const char *destaddr, unsigned int type,
unsigned short nstype;
unsigned char *txp;
int entry;
tick_t ct;
/* Calculate the next Tx descriptor entry. */
entry = cur_tx % TX_RING_SIZE;
@@ -339,18 +339,20 @@ epic100_transmit(struct nic *nic, const char *destaddr, unsigned int type,
* set the base address with the "ownership"
* bits last.
*/
tx_ring[entry].buflength |= cpu_to_le32(len);
tx_ring[entry].status = cpu_to_le32(len << 16) |
tx_ring[entry].status = cpu_to_le32(len << 16) |
cpu_to_le32(TRING_OWN); /* Pass ownership to the chip. */
cur_tx++;
/* Trigger an immediate transmit demand. */
outl(CR_QUEUE_TX, command);
load_timer2(10*TICKS_PER_MS); /* timeout 10 ms for transmit */
while ((le32_to_cpu(tx_ring[entry].status) & (TRING_OWN)) && timer2_running())
outl(CR_QUEUE_TX, command);
ct = currticks();
/* timeout 10 ms for transmit */
while ((le32_to_cpu(tx_ring[entry].status) & (TRING_OWN)) &&
ct + 10*USECS_IN_MSEC < currticks())
/* Wait */;
if ((le32_to_cpu(tx_ring[entry].status) & TRING_OWN) != 0)

1
src/drivers/net/etherfabric.c
View File

@@ -24,7 +24,6 @@
#include <gpxe/i2c.h>
#include <gpxe/spi.h>
#include <gpxe/nvo.h>
#include "timer.h"
#define dma_addr_t unsigned long
#include "etherfabric.h"

1
src/drivers/net/forcedeth.c
View File

@@ -51,7 +51,6 @@
#include <gpxe/pci.h>
/* Include timer support functions */
#include <gpxe/ethernet.h>
#include "timer.h"
#include "mii.h"
#define drv_version "v1.2"

1
src/drivers/net/ipoib.c
View File

@@ -22,7 +22,6 @@
#include <string.h>
#include <byteswap.h>
#include <errno.h>
#include "timer.h"
#include <gpxe/if_arp.h>
#include <gpxe/iobuf.h>
#include <gpxe/netdevice.h>

1
src/drivers/net/mlx_ipoib/mt23108_imp.c
View File

@@ -37,7 +37,6 @@ static void be_to_cpu_buf(void *buf, int size)
}
}
#include "timer.h"
#include "cmdif_mt23108.c"
#include "cmdif_comm.c"
#include "ib_mt23108.c"

1
src/drivers/net/mlx_ipoib/mt25218_imp.c
View File

@@ -37,7 +37,6 @@ static void be_to_cpu_buf(void *buf, int size)
}
}
#include "timer.h"
#include "cmdif_mt25218.c"
#include "cmdif_comm.c"
#include "ib_mt25218.c"

2
src/drivers/net/mtnic.c
View File

@@ -37,7 +37,7 @@
#include <gpxe/umalloc.h>
#include <bits/byteswap.h>
#include <little_bswap.h>
#include <timer.h>
#include <unistd.h>
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include <gpxe/netdevice.h>

2
src/drivers/net/natsemi.c
View File

@@ -63,8 +63,8 @@
#include <stdio.h>
#include <io.h>
#include <errno.h>
#include <timer.h>
#include <byteswap.h>
#include <unistd.h>
#include <gpxe/pci.h>
#include <gpxe/if_ether.h>
#include <gpxe/ethernet.h>

1
src/drivers/net/pcnet32.c
View File

@@ -43,7 +43,6 @@
#include "nic.h"
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "timer.h"
#include "mii.h"
/* void hex_dump(const char *data, const unsigned int len); */

1
src/drivers/net/prism2.c
View File

@@ -62,7 +62,6 @@ static const char hardcoded_ssid[] = "";
* quicker to convert code from the Linux Prism2 driver.
*/
#include <errno.h>
#include "timer.h"
#define __le16_to_cpu(x) (x)
#define __le32_to_cpu(x) (x)
#define __cpu_to_le16(x) (x)

1
src/drivers/net/r8169.c
View File

@@ -49,7 +49,6 @@
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include <gpxe/malloc.h>
#include "timer.h"
#define drv_version "v1.6"
#define drv_date "03-27-2004"

2
src/drivers/net/rtl8139.c
View File

@@ -71,7 +71,7 @@
#include <stdio.h>
#include <io.h>
#include <errno.h>
#include <timer.h>
#include <unistd.h>
#include <byteswap.h>
#include <gpxe/pci.h>
#include <gpxe/if_ether.h>

1
src/drivers/net/sis900.c
View File

@@ -46,7 +46,6 @@
#include "etherboot.h"
#include <gpxe/pci.h>
#include "nic.h"
#include "timer.h"
#include "sis900.h"

1
src/drivers/net/smc9000.c
View File

@@ -40,7 +40,6 @@
#include "etherboot.h"
#include "nic.h"
#include <gpxe/isa.h>
#include "timer.h"
#include "smc9000.h"
# define _outb outb

1
src/drivers/net/sundance.c
View File

@@ -46,7 +46,6 @@
#include "nic.h"
/* to get the PCI support functions, if this is a PCI NIC */
#include <gpxe/pci.h>
#include "timer.h"
#include "mii.h"
#define drv_version "v1.12"

1
src/drivers/net/tg3.c
View File

@@ -17,7 +17,6 @@
#include <errno.h>
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "timer.h"
#include "string.h"
#include "tg3.h"

1
src/drivers/net/tlan.c
View File

@@ -42,7 +42,6 @@
#include "nic.h"
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "timer.h"
#include "tlan.h"
#define drv_version "v1.4"

21
src/drivers/net/via-rhine.c
View File

@@ -50,7 +50,6 @@ static const char *version = "rhine.c v1.0.2 2004-10-29\n";
#include "nic.h"
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "timer.h"
/* define all ioaddr */
@@ -785,6 +784,7 @@ ReadMII (int byMIIIndex, int ioaddr)
char byMIIAdrbak;
char byMIICRbak;
char byMIItemp;
tick_t ct;
byMIIAdrbak = inb (byMIIAD);
byMIICRbak = inb (byMIICR);
@@ -799,8 +799,8 @@ ReadMII (int byMIIIndex, int ioaddr)
byMIItemp = inb (byMIICR);
byMIItemp = byMIItemp & 0x40;
load_timer2(2*TICKS_PER_MS);
while (byMIItemp != 0 && timer2_running())
ct = currticks();
while (byMIItemp != 0 && ct + 2*USECS_IN_MSEC < currticks())
{
byMIItemp = inb (byMIICR);
byMIItemp = byMIItemp & 0x40;
@@ -825,6 +825,7 @@ WriteMII (char byMIISetByte, char byMIISetBit, char byMIIOP, int ioaddr)
char byMIIAdrbak;
char byMIICRbak;
char byMIItemp;
tick_t ct;
byMIIAdrbak = inb (byMIIAD);
@@ -840,8 +841,8 @@ WriteMII (char byMIISetByte, char byMIISetBit, char byMIIOP, int ioaddr)
byMIItemp = inb (byMIICR);
byMIItemp = byMIItemp & 0x40;
load_timer2(2*TICKS_PER_MS);
while (byMIItemp != 0 && timer2_running())
ct = currticks();
while (byMIItemp != 0 && ct + 2*USECS_IN_MSEC < currticks())
{
byMIItemp = inb (byMIICR);
byMIItemp = byMIItemp & 0x40;
@@ -870,8 +871,8 @@ WriteMII (char byMIISetByte, char byMIISetBit, char byMIIOP, int ioaddr)
byMIItemp = inb (byMIICR);
byMIItemp = byMIItemp & 0x20;
load_timer2(2*TICKS_PER_MS);
while (byMIItemp != 0 && timer2_running())
ct = currticks();
while (byMIItemp != 0 && ct + 2*USECS_IN_MSEC < currticks())
{
byMIItemp = inb (byMIICR);
byMIItemp = byMIItemp & 0x20;
@@ -1345,6 +1346,7 @@ rhine_transmit (struct nic *nic,
unsigned char CR1bak;
unsigned char CR0bak;
unsigned int nstype;
tick_t ct;
/*printf ("rhine_transmit\n"); */
@@ -1385,9 +1387,10 @@ rhine_transmit (struct nic *nic,
outb (CR1bak, byCR1);
do
{
load_timer2(10*TICKS_PER_MS);
ct = currticks();
/* Wait until transmit is finished or timeout*/
while((tp->tx_ring[entry].tx_status.bits.own_bit !=0) && timer2_running())
while((tp->tx_ring[entry].tx_status.bits.own_bit !=0) &&
ct + 10*USECS_IN_MSEC < currticks())
;
if(tp->tx_ring[entry].tx_status.bits.terr == 0)

2
src/drivers/net/via-velocity.h
View File

@@ -24,8 +24,6 @@
* Copyright (c) 2006 by Timothy Legge <tlegge@rogers.com>
*/
#include "timer.h"
#ifndef VELOCITY_H
#define VELOCITY_H

9
src/drivers/net/w89c840.c
View File

@@ -81,7 +81,6 @@
#include "nic.h"
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "timer.h"
static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
@@ -113,7 +112,7 @@ static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
/* Operational parameters that usually are not changed. */
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (10*TICKS_PER_MS)
#define TX_TIMEOUT (10*USECS_IN_MSEC)
#define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/
@@ -487,6 +486,7 @@ static void w89c840_transmit(
/* send the packet to destination */
unsigned entry;
int transmit_status;
tick_t ct;
/* Caution: the write order is important here, set the field
with the "ownership" bits last. */
@@ -535,8 +535,7 @@ static void w89c840_transmit(
/* Now wait for TX to complete. */
transmit_status = w840private.tx_ring[entry].status;
load_timer2(TX_TIMEOUT);
ct = currticks();
{
#if defined W89C840_DEBUG
u32 intr_stat = 0;
@@ -547,7 +546,7 @@ static void w89c840_transmit(
decode_interrupt(intr_stat);
#endif
while ( (transmit_status & DescOwn) && timer2_running()) {
while ( (transmit_status & DescOwn) && ct + TX_TIMEOUT < currticks()) {
transmit_status = w840private.tx_ring[entry].status;
}