summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/vx/if_vx.c180
-rw-r--r--sys/dev/vx/if_vx_eisa.c14
-rw-r--r--sys/dev/vx/if_vx_pci.c155
-rw-r--r--sys/dev/vx/if_vxreg.h24
4 files changed, 193 insertions, 180 deletions
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 03d3e64..30ce7cc 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -54,13 +54,6 @@
* babkin@hq.icb.chel.su
*/
-#include "vx.h"
-
-#if NVX < 4 /* These cost 4 bytes apiece, so give us 4 */
-#undef NVX
-#define NVX 4
-#endif
-
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,6 +67,9 @@
#include <net/ethernet.h>
#include <net/if_arp.h>
+#include <machine/bus_pio.h>
+#include <machine/bus.h>
+
#include <net/bpf.h>
@@ -82,10 +78,6 @@
#define ETHER_MAX_LEN 1518
#define ETHER_ADDR_LEN 6
-struct vx_softc *vx_softc[NVX];
-
-u_long vx_count; /* both PCI and EISA */
-
static struct connector_entry {
int bit;
char *name;
@@ -107,8 +99,6 @@ static struct connector_entry {
{ 0, "???"}
};
-/* struct vx_softc *vxalloc __P((int)); */
-/* void *vxfree __P((struct vx_softc *)); */
/* int vxattach __P((struct vx_softc *)); */
static void vxtxstat __P((struct vx_softc *));
static int vxstatus __P((struct vx_softc *));
@@ -127,43 +117,6 @@ static void vxgetlink __P((struct vx_softc *));
static void vxsetlink __P((struct vx_softc *));
/* int vxbusyeeprom __P((struct vx_softc *)); */
-struct vx_softc *
-vxalloc(unit)
- int unit;
-{
- struct vx_softc *sc;
-
- if (unit >= NVX) {
- printf("vx%d: unit number too high.\n", unit);
- return NULL;
- }
-
- if (vx_softc[unit]) {
- printf("vx%d: already allocated.\n", unit);
- return NULL;
- }
-
- sc = malloc(sizeof(struct vx_softc), M_DEVBUF, M_NOWAIT);
- if (sc == NULL) {
- printf("vx%d: cannot malloc.\n", unit);
- return NULL;
- }
- bzero(sc, sizeof(struct vx_softc));
- callout_handle_init(&sc->ch);
-
- vx_softc[unit] = sc;
- sc->unit = unit;
- return (sc);
-}
-
-void
-vxfree(sc)
- struct vx_softc *sc;
-{
- vx_softc[sc->unit] = NULL;
- free(sc, M_DEVBUF);
- return;
-}
int
vxattach(sc)
@@ -172,8 +125,9 @@ vxattach(sc)
struct ifnet *ifp = &sc->arpcom.ac_if;
int i;
+ callout_handle_init(&sc->ch);
GO_WINDOW(0);
- outw(VX_COMMAND, GLOBAL_RESET);
+ CSR_WRITE_2(sc, VX_COMMAND, GLOBAL_RESET);
VX_BUSY_WAIT;
vxgetlink(sc);
@@ -186,11 +140,11 @@ vxattach(sc)
int x;
if (vxbusyeeprom(sc))
return 0;
- outw(BASE + VX_W0_EEPROM_COMMAND, EEPROM_CMD_RD
+ CSR_WRITE_2(sc, VX_W0_EEPROM_COMMAND, EEPROM_CMD_RD
| (EEPROM_OEM_ADDR_0 + i));
if (vxbusyeeprom(sc))
return 0;
- x = inw(BASE + VX_W0_EEPROM_DATA);
+ x = CSR_READ_2(sc, VX_W0_EEPROM_DATA);
sc->arpcom.ac_enaddr[(i << 1)] = x >> 8;
sc->arpcom.ac_enaddr[(i << 1) + 1] = x;
}
@@ -237,20 +191,20 @@ vxinit(xsc)
GO_WINDOW(2);
for (i = 0; i < 6; i++) /* Reload the ether_addr. */
- outb(BASE + VX_W2_ADDR_0 + i, sc->arpcom.ac_enaddr[i]);
+ CSR_WRITE_1(sc, VX_W2_ADDR_0 + i, sc->arpcom.ac_enaddr[i]);
- outw(BASE + VX_COMMAND, RX_RESET);
+ CSR_WRITE_2(sc, VX_COMMAND, RX_RESET);
VX_BUSY_WAIT;
- outw(BASE + VX_COMMAND, TX_RESET);
+ CSR_WRITE_2(sc, VX_COMMAND, TX_RESET);
VX_BUSY_WAIT;
GO_WINDOW(1); /* Window 1 is operating window */
for (i = 0; i < 31; i++)
- inb(BASE + VX_W1_TX_STATUS);
+ CSR_READ_1(sc, VX_W1_TX_STATUS);
- outw(BASE + VX_COMMAND,SET_RD_0_MASK | S_CARD_FAILURE |
+ CSR_WRITE_2(sc, VX_COMMAND,SET_RD_0_MASK | S_CARD_FAILURE |
S_RX_COMPLETE | S_TX_COMPLETE | S_TX_AVAIL);
- outw(BASE + VX_COMMAND,SET_INTR_MASK | S_CARD_FAILURE |
+ CSR_WRITE_2(sc, VX_COMMAND,SET_INTR_MASK | S_CARD_FAILURE |
S_RX_COMPLETE | S_TX_COMPLETE | S_TX_AVAIL);
/*
@@ -259,13 +213,13 @@ vxinit(xsc)
* already be queued. However, a single stray interrupt is
* unimportant.
*/
- outw(BASE + VX_COMMAND, ACK_INTR | 0xff);
+ CSR_WRITE_2(sc, VX_COMMAND, ACK_INTR | 0xff);
vxsetfilter(sc);
vxsetlink(sc);
- outw(BASE + VX_COMMAND, RX_ENABLE);
- outw(BASE + VX_COMMAND, TX_ENABLE);
+ CSR_WRITE_2(sc, VX_COMMAND, RX_ENABLE);
+ CSR_WRITE_2(sc, VX_COMMAND, TX_ENABLE);
vxmbuffill((caddr_t) sc);
@@ -284,7 +238,7 @@ vxsetfilter(sc)
register struct ifnet *ifp = &sc->arpcom.ac_if;
GO_WINDOW(1); /* Window 1 is operating window */
- outw(BASE + VX_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | FIL_BRDCST |
+ CSR_WRITE_2(sc, VX_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | FIL_BRDCST |
FIL_MULTICAST |
((ifp->if_flags & IFF_PROMISC) ? FIL_PROMISC : 0 ));
}
@@ -296,7 +250,7 @@ vxgetlink(sc)
int n, k;
GO_WINDOW(3);
- sc->vx_connectors = inw(BASE + VX_W3_RESET_OPT) & 0x7f;
+ sc->vx_connectors = CSR_READ_2(sc, VX_W3_RESET_OPT) & 0x7f;
for (n = 0, k = 0; k < VX_CONNECTORS; k++) {
if (sc->vx_connectors & conn_tab[k].bit) {
if (n > 0) {
@@ -311,7 +265,7 @@ vxgetlink(sc)
return;
}
GO_WINDOW(3);
- sc->vx_connector = (inl(BASE + VX_W3_INTERNAL_CFG)
+ sc->vx_connector = (CSR_READ_4(sc, VX_W3_INTERNAL_CFG)
& INTERNAL_CONNECTOR_MASK)
>> INTERNAL_CONNECTOR_BITS;
if (sc->vx_connector & 0x10) {
@@ -397,29 +351,29 @@ vxsetlink(sc)
/* Set the selected connector. */
GO_WINDOW(3);
- j = inl(BASE + VX_W3_INTERNAL_CFG) & ~INTERNAL_CONNECTOR_MASK;
- outl(BASE + VX_W3_INTERNAL_CFG, j | (i <<INTERNAL_CONNECTOR_BITS));
+ j = CSR_READ_4(sc, VX_W3_INTERNAL_CFG) & ~INTERNAL_CONNECTOR_MASK;
+ CSR_WRITE_4(sc, VX_W3_INTERNAL_CFG, j | (i <<INTERNAL_CONNECTOR_BITS));
/* First, disable all. */
- outw(BASE + VX_COMMAND, STOP_TRANSCEIVER);
+ CSR_WRITE_2(sc, VX_COMMAND, STOP_TRANSCEIVER);
DELAY(800);
GO_WINDOW(4);
- outw(BASE + VX_W4_MEDIA_TYPE, 0);
+ CSR_WRITE_2(sc, VX_W4_MEDIA_TYPE, 0);
/* Second, enable the selected one. */
switch(i) {
case CONNECTOR_UTP:
GO_WINDOW(4);
- outw(BASE + VX_W4_MEDIA_TYPE, ENABLE_UTP);
+ CSR_WRITE_2(sc, VX_W4_MEDIA_TYPE, ENABLE_UTP);
break;
case CONNECTOR_BNC:
- outw(BASE + VX_COMMAND, START_TRANSCEIVER);
+ CSR_WRITE_2(sc, VX_COMMAND, START_TRANSCEIVER);
DELAY(800);
break;
case CONNECTOR_TX:
case CONNECTOR_FX:
GO_WINDOW(4);
- outw(BASE + VX_W4_MEDIA_TYPE, LINKBEAT_ENABLE);
+ CSR_WRITE_2(sc, VX_W4_MEDIA_TYPE, LINKBEAT_ENABLE);
break;
default: /* AUI and MII fall here */
break;
@@ -434,7 +388,7 @@ static void
vxstart(ifp)
struct ifnet *ifp;
{
- register struct vx_softc *sc = vx_softc[ifp->if_unit];
+ register struct vx_softc *sc = ifp->if_softc;
register struct mbuf *m, *m0;
int sh, len, pad;
@@ -468,23 +422,23 @@ startagain:
goto readcheck;
}
VX_BUSY_WAIT;
- if (inw(BASE + VX_W1_FREE_TX) < len + pad + 4) {
- outw(BASE + VX_COMMAND, SET_TX_AVAIL_THRESH | ((len + pad + 4) >> 2));
+ if (CSR_READ_2(sc, VX_W1_FREE_TX) < len + pad + 4) {
+ CSR_WRITE_2(sc, VX_COMMAND, SET_TX_AVAIL_THRESH | ((len + pad + 4) >> 2));
/* not enough room in FIFO */
- if (inw(BASE + VX_W1_FREE_TX) < len + pad + 4) { /* make sure */
+ if (CSR_READ_2(sc, VX_W1_FREE_TX) < len + pad + 4) { /* make sure */
ifp->if_flags |= IFF_OACTIVE;
ifp->if_timer = 1;
return;
}
}
- outw(BASE + VX_COMMAND, SET_TX_AVAIL_THRESH | (8188 >> 2));
+ CSR_WRITE_2(sc, VX_COMMAND, SET_TX_AVAIL_THRESH | (8188 >> 2));
IF_DEQUEUE(&ifp->if_snd, m0);
if (m0 == 0) { /* not really needed */
return;
}
VX_BUSY_WAIT;
- outw(BASE + VX_COMMAND, SET_TX_START_THRESH |
+ CSR_WRITE_2(sc, VX_COMMAND, SET_TX_START_THRESH |
((len / 4 + sc->tx_start_thresh) >> 2));
if (sc->arpcom.ac_if.if_bpf) {
@@ -497,19 +451,21 @@ startagain:
*/
sh = splhigh();
- outl(BASE + VX_W1_TX_PIO_WR_1, len | TX_INDICATE);
+ CSR_WRITE_4(sc, VX_W1_TX_PIO_WR_1, len | TX_INDICATE);
for (m = m0; m != 0;) {
if (m->m_len > 3)
- outsl(BASE + VX_W1_TX_PIO_WR_1, mtod(m, caddr_t), m->m_len / 4);
+ bus_space_write_multi_4(sc->vx_btag, sc->vx_bhandle,
+ VX_W1_TX_PIO_WR_1, (u_int32_t *)mtod(m, caddr_t), m->m_len / 4);
if (m->m_len & 3)
- outsb(BASE + VX_W1_TX_PIO_WR_1,
- mtod(m, caddr_t) + (m->m_len & ~3) , m->m_len & 3);
+ bus_space_write_multi_1(sc->vx_btag, sc->vx_bhandle,
+ VX_W1_TX_PIO_WR_1,
+ mtod(m, caddr_t) + (m->m_len & ~3) , m->m_len & 3);
MFREE(m, m0);
m = m0;
}
while (pad--)
- outb(BASE + VX_W1_TX_PIO_WR_1, 0); /* Padding */
+ CSR_WRITE_1(sc, VX_W1_TX_PIO_WR_1, 0); /* Padding */
splx(sh);
@@ -517,10 +473,10 @@ startagain:
ifp->if_timer = 1;
readcheck:
- if ((inw(BASE + VX_W1_RX_STATUS) & ERR_INCOMPLETE) == 0) {
+ if ((CSR_READ_2(sc, VX_W1_RX_STATUS) & ERR_INCOMPLETE) == 0) {
/* We received a complete packet. */
- if ((inw(BASE + VX_STATUS) & S_INTR_LATCH) == 0) {
+ if ((CSR_READ_2(sc, VX_STATUS) & S_INTR_LATCH) == 0) {
/*
* No interrupt, read the packet and continue
* Is this supposed to happen? Is my motherboard
@@ -559,7 +515,7 @@ vxstatus(sc)
* Check the FIFO status and act accordingly
*/
GO_WINDOW(4);
- fifost = inw(BASE + VX_W4_FIFO_DIAG);
+ fifost = CSR_READ_2(sc, VX_W4_FIFO_DIAG);
GO_WINDOW(1);
if (fifost & FIFOS_RX_UNDERRUN) {
@@ -601,8 +557,8 @@ vxtxstat(sc)
* We need to read+write TX_STATUS until we get a 0 status
* in order to turn off the interrupt flag.
*/
- while ((i = inb(BASE + VX_W1_TX_STATUS)) & TXS_COMPLETE) {
- outb(BASE + VX_W1_TX_STATUS, 0x0);
+ while ((i = CSR_READ_1(sc, VX_W1_TX_STATUS)) & TXS_COMPLETE) {
+ CSR_WRITE_1(sc, VX_W1_TX_STATUS, 0x0);
if (i & TXS_JABBER) {
++sc->arpcom.ac_if.if_oerrors;
@@ -620,7 +576,7 @@ vxtxstat(sc)
vxreset(sc);
} else if (i & TXS_MAX_COLLISION) {
++sc->arpcom.ac_if.if_collisions;
- outw(BASE + VX_COMMAND, TX_ENABLE);
+ CSR_WRITE_2(sc, VX_COMMAND, TX_ENABLE);
sc->arpcom.ac_if.if_flags &= ~IFF_OACTIVE;
} else
sc->tx_succ_ok = (sc->tx_succ_ok+1) & 127;
@@ -636,9 +592,9 @@ vxintr(voidsc)
struct ifnet *ifp = &sc->arpcom.ac_if;
for (;;) {
- outw(BASE + VX_COMMAND, C_INTR_LATCH);
+ CSR_WRITE_2(sc, VX_COMMAND, C_INTR_LATCH);
- status = inw(BASE + VX_STATUS);
+ status = CSR_READ_2(sc, VX_STATUS);
if ((status & (S_TX_COMPLETE | S_TX_AVAIL |
S_RX_COMPLETE | S_CARD_FAILURE)) == 0)
@@ -650,7 +606,7 @@ vxintr(voidsc)
* Due to the i386 interrupt queueing, we may get spurious
* interrupts occasionally.
*/
- outw(BASE + VX_COMMAND, ACK_INTR | status);
+ CSR_WRITE_2(sc, VX_COMMAND, ACK_INTR | status);
if (status & S_RX_COMPLETE)
vxread(sc);
@@ -685,7 +641,7 @@ vxread(sc)
struct ether_header *eh;
u_int len;
- len = inw(BASE + VX_W1_RX_STATUS);
+ len = CSR_READ_2(sc, VX_W1_RX_STATUS);
again:
@@ -766,7 +722,7 @@ again:
* I'll modify vxread() so that it can handle RX_EARLY interrupts.
*/
if (vxstatus(sc)) {
- len = inw(BASE + VX_W1_RX_STATUS);
+ len = CSR_READ_2(sc, VX_W1_RX_STATUS);
/* Check if we are stuck and reset [see XXX comment] */
if (len & ERR_INCOMPLETE) {
if (ifp->if_flags & IFF_DEBUG)
@@ -780,7 +736,7 @@ again:
return;
abort:
- outw(BASE + VX_COMMAND, RX_DISCARD_TOP_PACK);
+ CSR_WRITE_2(sc, VX_COMMAND, RX_DISCARD_TOP_PACK);
}
static struct mbuf *
@@ -853,9 +809,11 @@ vxget(sc, totlen)
}
len = min(totlen, len);
if (len > 3)
- insl(BASE + VX_W1_RX_PIO_RD_1, mtod(m, u_int32_t *), len / 4);
+ bus_space_read_multi_4(sc->vx_btag, sc->vx_bhandle,
+ VX_W1_RX_PIO_RD_1, mtod(m, u_int32_t *), len / 4);
if (len & 3) {
- insb(BASE + VX_W1_RX_PIO_RD_1, mtod(m, u_int8_t *) + (len & ~3),
+ bus_space_read_multi_1(sc->vx_btag, sc->vx_bhandle,
+ VX_W1_RX_PIO_RD_1, mtod(m, u_int8_t *) + (len & ~3),
len & 3);
}
m->m_len = len;
@@ -864,7 +822,7 @@ vxget(sc, totlen)
mp = &m->m_next;
}
- outw(BASE +VX_COMMAND, RX_DISCARD_TOP_PACK);
+ CSR_WRITE_2(sc, VX_COMMAND, RX_DISCARD_TOP_PACK);
splx(sh);
@@ -878,7 +836,7 @@ vxioctl(ifp, cmd, data)
u_long cmd;
caddr_t data;
{
- struct vx_softc *sc = vx_softc[ifp->if_unit];
+ struct vx_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
int s, error = 0;
@@ -964,7 +922,7 @@ static void
vxwatchdog(ifp)
struct ifnet *ifp;
{
- struct vx_softc *sc = vx_softc[ifp->if_unit];
+ struct vx_softc *sc = ifp->if_softc;
if (ifp->if_flags & IFF_DEBUG)
printf("vx%d: device timeout\n", ifp->if_unit);
@@ -981,20 +939,20 @@ vxstop(sc)
ifp->if_timer = 0;
- outw(BASE + VX_COMMAND, RX_DISABLE);
- outw(BASE + VX_COMMAND, RX_DISCARD_TOP_PACK);
+ CSR_WRITE_2(sc, VX_COMMAND, RX_DISABLE);
+ CSR_WRITE_2(sc, VX_COMMAND, RX_DISCARD_TOP_PACK);
VX_BUSY_WAIT;
- outw(BASE + VX_COMMAND, TX_DISABLE);
- outw(BASE + VX_COMMAND, STOP_TRANSCEIVER);
+ CSR_WRITE_2(sc, VX_COMMAND, TX_DISABLE);
+ CSR_WRITE_2(sc, VX_COMMAND, STOP_TRANSCEIVER);
DELAY(800);
- outw(BASE + VX_COMMAND, RX_RESET);
+ CSR_WRITE_2(sc, VX_COMMAND, RX_RESET);
VX_BUSY_WAIT;
- outw(BASE + VX_COMMAND, TX_RESET);
+ CSR_WRITE_2(sc, VX_COMMAND, TX_RESET);
VX_BUSY_WAIT;
- outw(BASE + VX_COMMAND, C_INTR_LATCH);
- outw(BASE + VX_COMMAND, SET_RD_0_MASK);
- outw(BASE + VX_COMMAND, SET_INTR_MASK);
- outw(BASE + VX_COMMAND, SET_RX_FILTER);
+ CSR_WRITE_2(sc, VX_COMMAND, C_INTR_LATCH);
+ CSR_WRITE_2(sc, VX_COMMAND, SET_RD_0_MASK);
+ CSR_WRITE_2(sc, VX_COMMAND, SET_INTR_MASK);
+ CSR_WRITE_2(sc, VX_COMMAND, SET_RX_FILTER);
vxmbufempty(sc);
}
@@ -1006,7 +964,7 @@ vxbusyeeprom(sc)
int j, i = 100;
while (i--) {
- j = inw(BASE + VX_W0_EEPROM_COMMAND);
+ j = CSR_READ_2(sc, VX_W0_EEPROM_COMMAND);
if (j & EEPROM_BUSY)
DELAY(100);
else
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index 134c360..b231243 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -111,7 +111,6 @@ static int
vx_eisa_attach(device_t dev)
{
struct vx_softc *sc;
- int unit = device_get_unit(dev);
struct resource *io = 0;
struct resource *eisa_io = 0;
struct resource *irq = 0;
@@ -139,29 +138,32 @@ vx_eisa_attach(device_t dev)
goto bad;
}
- if ((sc = vxalloc(unit)) == NULL)
- goto bad;
+ sc = device_get_softc(dev);
- sc->vx_io_addr = rman_get_start(io);
+ sc->vx_res = io;
+ sc->vx_bhandle = rman_get_bushandle(io);
+ sc->vx_btag = rman_get_bustag(io);
rid = 0;
irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
0, ~0, 1, RF_ACTIVE);
if (!irq) {
device_printf(dev, "No irq?!\n");
- vxfree(sc);
goto bad;
}
+ sc->vx_irq = irq;
+
/* Now the registers are availible through the lower ioport */
vxattach(sc);
if (bus_setup_intr(dev, irq, INTR_TYPE_NET, vxintr, sc, &ih)) {
- vxfree(sc);
goto bad;
}
+ sc->vx_intrhand = ih;
+
return 0;
bad:
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 39ef809..df73eaf 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -29,115 +29,150 @@
* $FreeBSD$
*/
-#include "vx.h"
-
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/eventhandler.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_arp.h>
+#include <machine/bus_pio.h>
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
#include <pci/pcivar.h>
+#include <pci/pcireg.h>
#include <dev/vx/if_vxreg.h>
-#ifndef COMPAT_OLDPCI
-#error "The vx driver requires the old pci compatability shims."
-#endif
+static void vx_pci_shutdown(device_t);
+static int vx_pci_probe(device_t);
+static int vx_pci_attach(device_t);
-static void vx_pci_shutdown(void *, int);
-static const char *vx_pci_probe(pcici_t, pcidi_t);
-static void vx_pci_attach(pcici_t, int unit);
+static device_method_t vx_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, vx_pci_probe),
+ DEVMETHOD(device_attach, vx_pci_attach),
+ DEVMETHOD(device_shutdown, vx_pci_shutdown),
+
+ { 0, 0 }
+};
+
+static driver_t vx_driver = {
+ "vx",
+ vx_methods,
+ sizeof(struct vx_softc)
+};
+
+static devclass_t vx_devclass;
+
+DRIVER_MODULE(if_vx, pci, vx_driver, vx_devclass, 0, 0);
static void
vx_pci_shutdown(
- void *sc,
- int howto)
+ device_t dev)
{
+ struct vx_softc *sc;
+
+ sc = device_get_softc(dev);
vxstop(sc);
- vxfree(sc);
+ return;
}
-static const char*
+static int
vx_pci_probe(
- pcici_t config_id,
- pcidi_t device_id)
+ device_t dev)
{
- if(device_id == 0x590010b7ul)
- return "3COM 3C590 Etherlink III PCI";
+ u_int32_t device_id;
+
+ device_id = pci_read_config(dev, PCIR_DEVVENDOR, 4);
+
+ if(device_id == 0x590010b7ul) {
+ device_set_desc(dev, "3COM 3C590 Etherlink III PCI");
+ return(0);
+ }
if(device_id == 0x595010b7ul || device_id == 0x595110b7ul ||
- device_id == 0x595210b7ul)
- return "3COM 3C595 Fast Etherlink III PCI";
+ device_id == 0x595210b7ul) {
+ device_set_desc(dev, "3COM 3C595 Etherlink III PCI");
+ return(0);
+ }
/*
* The (Fast) Etherlink XL adapters are now supported by
* the xl driver, which uses bus master DMA and is much
* faster. (And which also supports the 3c905B.
*/
#ifdef VORTEX_ETHERLINK_XL
- if(device_id == 0x900010b7ul || device_id == 0x900110b7ul)
- return "3COM 3C900 Etherlink XL PCI";
- if(device_id == 0x905010b7ul || device_id == 0x905110b7ul)
- return "3COM 3C905 Fast Etherlink XL PCI";
+ if(device_id == 0x900010b7ul || device_id == 0x900110b7ul) {
+ device_set_desc(dev, "3COM 3C900 Etherlink XL PCI");
+ return(0);
+ }
+ if(device_id == 0x905010b7ul || device_id == 0x905110b7ul) {
+ device_set_desc(dev, "3COM 3C905 Etherlink XL PCI");
+ return(0);
+ }
#endif
- return NULL;
+ return (ENXIO);
}
-static void
+static int
vx_pci_attach(
- pcici_t config_id,
- int unit)
+ device_t dev)
{
struct vx_softc *sc;
+ int rid;
- if (unit >= NVX) {
- printf("vx%d: not configured; kernel is built for only %d device%s.\n",
- unit, NVX, NVX == 1 ? "" : "s");
- return;
- }
+ sc = device_get_softc(dev);
- if ((sc = vxalloc(unit)) == NULL) {
- return;
- }
+ rid = PCIR_MAPS;
+ sc->vx_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
+ 0, ~0, 1, RF_ACTIVE);
+
+ if (sc->vx_res == NULL)
+ goto bad;
+
+ sc->vx_btag = rman_get_bustag(sc->vx_res);
+ sc->vx_bhandle = rman_get_bushandle(sc->vx_res);
- sc->vx_io_addr = pci_conf_read(config_id, 0x10) & 0xffffffe0;
+ rid = 0;
+ sc->vx_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+ RF_SHAREABLE | RF_ACTIVE);
+
+ if (sc->vx_irq == NULL)
+ goto bad;
+
+ if (bus_setup_intr(dev, sc->vx_irq, INTR_TYPE_NET,
+ vxintr, sc, &sc->vx_intrhand))
+ goto bad;
if (vxattach(sc) == 0) {
- return;
+ goto bad;
}
/* defect check for 3C590 */
- if ((pci_conf_read(config_id, 0) >> 16) == 0x5900) {
+ if ((pci_read_config(dev, PCIR_DEVVENDOR, 4) >> 16) == 0x5900) {
GO_WINDOW(0);
if (vxbusyeeprom(sc))
- return;
- outw(BASE + VX_W0_EEPROM_COMMAND, EEPROM_CMD_RD | EEPROM_SOFT_INFO_2);
+ goto bad;
+ CSR_WRITE_2(sc, VX_W0_EEPROM_COMMAND,
+ EEPROM_CMD_RD | EEPROM_SOFT_INFO_2);
if (vxbusyeeprom(sc))
- return;
- if (!(inw(BASE + VX_W0_EEPROM_DATA) & NO_RX_OVN_ANOMALY)) {
+ goto bad;
+ if (!(CSR_READ_2(sc, VX_W0_EEPROM_DATA) & NO_RX_OVN_ANOMALY)) {
printf("Warning! Defective early revision adapter!\n");
}
}
- /*
- * Add shutdown hook so that DMA is disabled prior to reboot. Not
- * doing do could allow DMA to corrupt kernel memory during the
- * reboot before the driver initializes.
- */
- EVENTHANDLER_REGISTER(shutdown_post_sync, vx_pci_shutdown, sc,
- SHUTDOWN_PRI_DEFAULT);
+ return(0);
- pci_map_int(config_id, vxintr, (void *) sc, &net_imask);
+bad:
+ if (sc->vx_intrhand != NULL)
+ bus_teardown_intr(dev, sc->vx_irq, sc->vx_intrhand);
+ if (sc->vx_res != NULL)
+ bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->vx_res);
+ if (sc->vx_irq != NULL)
+ bus_release_resource(dev, SYS_RES_IRQ, 0, sc->vx_irq);
+ return(ENXIO);
}
-
-static struct pci_device vxdevice = {
- "vx",
- vx_pci_probe,
- vx_pci_attach,
- &vx_count,
- NULL
-};
-
-COMPAT_PCI_DRIVER (vx, vxdevice);
diff --git a/sys/dev/vx/if_vxreg.h b/sys/dev/vx/if_vxreg.h
index 3794add..4d5f198 100644
--- a/sys/dev/vx/if_vxreg.h
+++ b/sys/dev/vx/if_vxreg.h
@@ -53,7 +53,11 @@
struct vx_softc {
struct arpcom arpcom; /* Ethernet common part */
int unit; /* unit number */
- u_int vx_io_addr; /* i/o bus address */
+ bus_space_handle_t vx_bhandle;
+ bus_space_tag_t vx_btag;
+ void *vx_intrhand;
+ struct resource *vx_irq;
+ struct resource *vx_res;
#define MAX_MBS 8 /* # of mbufs we keep around */
struct mbuf *mb[MAX_MBS]; /* spare mbuf storage. */
int next_mb; /* Which mbuf to use next. */
@@ -67,6 +71,20 @@ struct vx_softc {
int buffill_pending;
};
+#define CSR_WRITE_4(sc, reg, val) \
+ bus_space_write_4(sc->vx_btag, sc->vx_bhandle, reg, val)
+#define CSR_WRITE_2(sc, reg, val) \
+ bus_space_write_2(sc->vx_btag, sc->vx_bhandle, reg, val)
+#define CSR_WRITE_1(sc, reg, val) \
+ bus_space_write_1(sc->vx_btag, sc->vx_bhandle, reg, val)
+
+#define CSR_READ_4(sc, reg) \
+ bus_space_read_4(sc->vx_btag, sc->vx_bhandle, reg)
+#define CSR_READ_2(sc, reg) \
+ bus_space_read_2(sc->vx_btag, sc->vx_bhandle, reg)
+#define CSR_READ_1(sc, reg) \
+ bus_space_read_1(sc->vx_btag, sc->vx_bhandle, reg)
+
/*
* Some global constants
*/
@@ -316,7 +334,7 @@ struct vx_softc {
#define S_UPD_STATS (u_short) (0x80)
#define S_COMMAND_IN_PROGRESS (u_short) (0x1000)
-#define VX_BUSY_WAIT while (inw(BASE + VX_STATUS) & S_COMMAND_IN_PROGRESS)
+#define VX_BUSY_WAIT while (CSR_READ_2(sc, VX_STATUS) & S_COMMAND_IN_PROGRESS)
/* Address Config. Register.
* Window 0/Port 06
@@ -436,7 +454,7 @@ struct vx_softc {
#define ENABLE_DRQ_IRQ 0x0001
#define MFG_ID 0x506d /* `TCM' */
#define PROD_ID 0x5090
-#define GO_WINDOW(x) outw(BASE+VX_COMMAND, WINDOW_SELECT|(x))
+#define GO_WINDOW(x) CSR_WRITE_2(sc, VX_COMMAND, WINDOW_SELECT|(x))
#define JABBER_GUARD_ENABLE 0x40
#define LINKBEAT_ENABLE 0x80
#define ENABLE_UTP (JABBER_GUARD_ENABLE | LINKBEAT_ENABLE)
OpenPOWER on IntegriCloud