svn commit: r260050 - head/sys/dev/ed
Marius Strobl
marius at FreeBSD.org
Sun Dec 29 19:22:01 UTC 2013
Author: marius
Date: Sun Dec 29 19:21:59 2013
New Revision: 260050
URL: http://svnweb.freebsd.org/changeset/base/260050
Log:
- Switch to using the common MII bitbang'ing code instead of duplicating it.
- Based on lessons learnt with dc(4) (see r185750), add bus space barriers to
the MII bitbang read and write functions as well as to instances of page
switching.
- Add missing locking to ed_ifmedia_{upd,sts}().
- Canonicalize some messages.
- Based on actual functionality, ED_TC5299J_MII_DIROUT should be rather named
ED_TC5299J_MII_DIRIN.
- Remove unused headers.
- Use DEVMETHOD_END.
- Use NULL instead of 0 for pointers.
MFC after: 1 week
Modified:
head/sys/dev/ed/if_ed.c
head/sys/dev/ed/if_ed_3c503.c
head/sys/dev/ed/if_ed_pccard.c
head/sys/dev/ed/if_ed_rtl80x9.c
head/sys/dev/ed/if_edreg.h
head/sys/dev/ed/if_edvar.h
head/sys/dev/ed/tc5299jreg.h
Modified: head/sys/dev/ed/if_ed.c
==============================================================================
--- head/sys/dev/ed/if_ed.c Sun Dec 29 19:02:33 2013 (r260049)
+++ head/sys/dev/ed/if_ed.c Sun Dec 29 19:21:59 2013 (r260050)
@@ -591,7 +591,11 @@ ed_init_locked(struct ed_softc *sc)
/*
* Program Command Register for page 1
*/
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_nic_outb(sc, ED_P0_CR, sc->cr_proto | ED_CR_PAGE_1 | ED_CR_STP);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
/*
* Copy out our station address
@@ -801,7 +805,11 @@ ed_rint(struct ed_softc *sc)
/*
* Set NIC to page 1 registers to get 'current' pointer
*/
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_nic_outb(sc, ED_P0_CR, sc->cr_proto | ED_CR_PAGE_1 | ED_CR_STA);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
/*
* 'sc->next_packet' is the logical beginning of the ring-buffer -
@@ -912,7 +920,11 @@ ed_rint(struct ed_softc *sc)
* Set NIC to page 1 registers before looping to top (prepare
* to get 'CURR' current pointer)
*/
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_nic_outb(sc, ED_P0_CR, sc->cr_proto | ED_CR_PAGE_1 | ED_CR_STA);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
}
}
@@ -1556,7 +1568,11 @@ ed_setrcr(struct ed_softc *sc)
reg1 = 0x00;
/* set page 1 registers */
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_nic_outb(sc, ED_P0_CR, sc->cr_proto | ED_CR_PAGE_1 | ED_CR_STP);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
if (ifp->if_flags & IFF_PROMISC) {
Modified: head/sys/dev/ed/if_ed_3c503.c
==============================================================================
--- head/sys/dev/ed/if_ed_3c503.c Sun Dec 29 19:02:33 2013 (r260049)
+++ head/sys/dev/ed/if_ed_3c503.c Sun Dec 29 19:21:59 2013 (r260050)
@@ -217,7 +217,11 @@ ed_probe_3Com(device_t dev, int port_rid
/*
* select page 0 registers
*/
- ed_nic_outb(sc, ED_P0_CR, ED_CR_RD2 | ED_CR_STP);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ ed_nic_outb(sc, ED_P0_CR, ED_CR_PAGE_0 | ED_CR_RD2 | ED_CR_STP);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
/*
* Attempt to clear WTS bit. If it doesn't clear, then this is a 16bit
@@ -228,7 +232,11 @@ ed_probe_3Com(device_t dev, int port_rid
/*
* select page 2 registers
*/
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_nic_outb(sc, ED_P0_CR, ED_CR_PAGE_2 | ED_CR_RD2 | ED_CR_STP);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
/*
* The 3c503 forces the WTS bit to a one if this is a 16bit board
Modified: head/sys/dev/ed/if_ed_pccard.c
==============================================================================
--- head/sys/dev/ed/if_ed_pccard.c Sun Dec 29 19:02:33 2013 (r260049)
+++ head/sys/dev/ed/if_ed_pccard.c Sun Dec 29 19:21:59 2013 (r260050)
@@ -75,9 +75,6 @@
#include <sys/systm.h>
#include <sys/socket.h>
#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/uio.h>
-
#include <sys/module.h>
#include <sys/bus.h>
#include <machine/bus.h>
@@ -247,6 +244,54 @@ static const struct ed_product {
};
/*
+ * MII bit-bang glue
+ */
+static uint32_t ed_pccard_dl100xx_mii_bitbang_read(device_t dev);
+static void ed_pccard_dl100xx_mii_bitbang_write(device_t dev, uint32_t val);
+
+static const struct mii_bitbang_ops ed_pccard_dl100xx_mii_bitbang_ops = {
+ ed_pccard_dl100xx_mii_bitbang_read,
+ ed_pccard_dl100xx_mii_bitbang_write,
+ {
+ ED_DL100XX_MII_DATAOUT, /* MII_BIT_MDO */
+ ED_DL100XX_MII_DATAIN, /* MII_BIT_MDI */
+ ED_DL100XX_MII_CLK, /* MII_BIT_MDC */
+ ED_DL100XX_MII_DIROUT, /* MII_BIT_DIR_HOST_PHY */
+ 0 /* MII_BIT_DIR_PHY_HOST */
+ }
+};
+
+static uint32_t ed_pccard_ax88x90_mii_bitbang_read(device_t dev);
+static void ed_pccard_ax88x90_mii_bitbang_write(device_t dev, uint32_t val);
+
+static const struct mii_bitbang_ops ed_pccard_ax88x90_mii_bitbang_ops = {
+ ed_pccard_ax88x90_mii_bitbang_read,
+ ed_pccard_ax88x90_mii_bitbang_write,
+ {
+ ED_AX88X90_MII_DATAOUT, /* MII_BIT_MDO */
+ ED_AX88X90_MII_DATAIN, /* MII_BIT_MDI */
+ ED_AX88X90_MII_CLK, /* MII_BIT_MDC */
+ 0, /* MII_BIT_DIR_HOST_PHY */
+ ED_AX88X90_MII_DIRIN /* MII_BIT_DIR_PHY_HOST */
+ }
+};
+
+static uint32_t ed_pccard_tc5299j_mii_bitbang_read(device_t dev);
+static void ed_pccard_tc5299j_mii_bitbang_write(device_t dev, uint32_t val);
+
+static const struct mii_bitbang_ops ed_pccard_tc5299j_mii_bitbang_ops = {
+ ed_pccard_tc5299j_mii_bitbang_read,
+ ed_pccard_tc5299j_mii_bitbang_write,
+ {
+ ED_TC5299J_MII_DATAOUT, /* MII_BIT_MDO */
+ ED_TC5299J_MII_DATAIN, /* MII_BIT_MDI */
+ ED_TC5299J_MII_CLK, /* MII_BIT_MDC */
+ 0, /* MII_BIT_DIR_HOST_PHY */
+ ED_AX88X90_MII_DIRIN /* MII_BIT_DIR_PHY_HOST */
+ }
+};
+
+/*
* PC Card (PCMCIA) specific code.
*/
static int ed_pccard_probe(device_t);
@@ -255,23 +300,14 @@ static void ed_pccard_tick(struct ed_sof
static int ed_pccard_dl100xx(device_t dev, const struct ed_product *);
static void ed_pccard_dl100xx_mii_reset(struct ed_softc *sc);
-static u_int ed_pccard_dl100xx_mii_readbits(struct ed_softc *sc, int nbits);
-static void ed_pccard_dl100xx_mii_writebits(struct ed_softc *sc, u_int val,
- int nbits);
static int ed_pccard_ax88x90(device_t dev, const struct ed_product *);
-static u_int ed_pccard_ax88x90_mii_readbits(struct ed_softc *sc, int nbits);
-static void ed_pccard_ax88x90_mii_writebits(struct ed_softc *sc, u_int val,
- int nbits);
static int ed_miibus_readreg(device_t dev, int phy, int reg);
static int ed_ifmedia_upd(struct ifnet *);
static void ed_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static int ed_pccard_tc5299j(device_t dev, const struct ed_product *);
-static u_int ed_pccard_tc5299j_mii_readbits(struct ed_softc *sc, int nbits);
-static void ed_pccard_tc5299j_mii_writebits(struct ed_softc *sc, u_int val,
- int nbits);
static void
ed_pccard_print_entry(const struct ed_product *pp)
@@ -502,7 +538,7 @@ ed_pccard_attach(device_t dev)
error = ed_pccard_tc5299j(dev, pp);
if (error != 0) {
error = ed_probe_Novell_generic(dev, flags);
- printf("Novell probe generic %d\n", error);
+ printf("Novell generic probe failed: %d\n", error);
}
if (error != 0 && (pp->flags & NE2000DVF_TOSHIBA)) {
flags |= ED_FLAGS_TOSH_ETHER;
@@ -627,7 +663,7 @@ ed_pccard_dl100xx(device_t dev, const st
if (!(pp->flags & NE2000DVF_DL100XX))
return (ENXIO);
if (bootverbose)
- device_printf(dev, "Trying DL100xx probing\n");
+ device_printf(dev, "Trying DL100xx\n");
error = ed_probe_Novell_generic(dev, device_get_flags(dev));
if (bootverbose && error)
device_printf(dev, "Novell generic probe failed: %d\n", error);
@@ -678,16 +714,11 @@ ed_pccard_dl100xx(device_t dev, const st
sc->chip_type = (id & 0x90) == 0x90 ?
ED_CHIP_TYPE_DL10022 : ED_CHIP_TYPE_DL10019;
sc->type_str = ((id & 0x90) == 0x90) ? "DL10022" : "DL10019";
- sc->mii_readbits = ed_pccard_dl100xx_mii_readbits;
- sc->mii_writebits = ed_pccard_dl100xx_mii_writebits;
+ sc->mii_bitbang_ops = &ed_pccard_dl100xx_mii_bitbang_ops;
return (0);
}
/* MII bit-twiddling routines for cards using Dlink chipset */
-#define DL100XX_MIISET(sc, x) ed_asic_outb(sc, ED_DL100XX_MIIBUS, \
- ed_asic_inb(sc, ED_DL100XX_MIIBUS) | (x))
-#define DL100XX_MIICLR(sc, x) ed_asic_outb(sc, ED_DL100XX_MIIBUS, \
- ed_asic_inb(sc, ED_DL100XX_MIIBUS) & ~(x))
static void
ed_pccard_dl100xx_mii_reset(struct ed_softc *sc)
@@ -709,36 +740,29 @@ ed_pccard_dl100xx_mii_reset(struct ed_so
}
static void
-ed_pccard_dl100xx_mii_writebits(struct ed_softc *sc, u_int val, int nbits)
+ed_pccard_dl100xx_mii_bitbang_write(device_t dev, uint32_t val)
{
- int i;
+ struct ed_softc *sc;
- DL100XX_MIISET(sc, ED_DL100XX_MII_DIROUT);
- for (i = nbits - 1; i >= 0; i--) {
- if ((val >> i) & 1)
- DL100XX_MIISET(sc, ED_DL100XX_MII_DATAOUT);
- else
- DL100XX_MIICLR(sc, ED_DL100XX_MII_DATAOUT);
- DL100XX_MIISET(sc, ED_DL100XX_MII_CLK);
- DL100XX_MIICLR(sc, ED_DL100XX_MII_CLK);
- }
+ sc = device_get_softc(dev);
+
+ ed_asic_outb(sc, ED_DL100XX_MIIBUS, val);
+ ed_asic_barrier(sc, ED_DL100XX_MIIBUS, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
}
-static u_int
-ed_pccard_dl100xx_mii_readbits(struct ed_softc *sc, int nbits)
+static uint32_t
+ed_pccard_dl100xx_mii_bitbang_read(device_t dev)
{
- int i;
- u_int val = 0;
+ struct ed_softc *sc;
+ uint32_t val;
- DL100XX_MIICLR(sc, ED_DL100XX_MII_DIROUT);
- for (i = nbits - 1; i >= 0; i--) {
- DL100XX_MIISET(sc, ED_DL100XX_MII_CLK);
- val <<= 1;
- if (ed_asic_inb(sc, ED_DL100XX_MIIBUS) & ED_DL100XX_MII_DATAIN)
- val++;
- DL100XX_MIICLR(sc, ED_DL100XX_MII_CLK);
- }
- return val;
+ sc = device_get_softc(dev);
+
+ val = ed_asic_inb(sc, ED_DL100XX_MIIBUS);
+ ed_asic_barrier(sc, ED_DL100XX_MIIBUS, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ return (val);
}
static void
@@ -747,7 +771,11 @@ ed_pccard_ax88x90_reset(struct ed_softc
int i;
/* Reset Card */
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_nic_outb(sc, ED_P0_CR, ED_CR_RD2 | ED_CR_STP | ED_CR_PAGE_0);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_asic_outb(sc, ED_NOVELL_RESET, ed_asic_inb(sc, ED_NOVELL_RESET));
/* Wait for the RST bit to assert, but cap it at 10ms */
@@ -880,7 +908,6 @@ ed_pccard_ax88x90_check_mii(device_t dev
if (i == 32)
return (ENXIO);
return (0);
-
}
/*
@@ -910,18 +937,17 @@ ed_pccard_ax88x90(device_t dev, const st
pccard_ccr_write_1(dev, PCCARD_CCR_IOBASE0, iobase & 0xff);
pccard_ccr_write_1(dev, PCCARD_CCR_IOBASE1, (iobase >> 8) & 0xff);
- sc->mii_readbits = ed_pccard_ax88x90_mii_readbits;
- sc->mii_writebits = ed_pccard_ax88x90_mii_writebits;
error = ed_probe_ax88x90_generic(dev, device_get_flags(dev));
if (error) {
if (bootverbose)
device_printf(dev, "probe ax88x90 failed %d\n",
error);
- goto fail;
+ return (error);
}
+ sc->mii_bitbang_ops = &ed_pccard_ax88x90_mii_bitbang_ops;
error = ed_pccard_ax88x90_check_mii(dev, sc);
if (error)
- goto fail;
+ return (error);
sc->vendor = ED_VENDOR_NOVELL;
sc->type = ED_TYPE_NE2000;
if (sc->chip_type == ED_CHIP_TYPE_AX88190)
@@ -929,40 +955,32 @@ ed_pccard_ax88x90(device_t dev, const st
else
sc->type_str = "AX88790";
return (0);
-fail:;
- sc->mii_readbits = 0;
- sc->mii_writebits = 0;
- return (error);
}
static void
-ed_pccard_ax88x90_mii_writebits(struct ed_softc *sc, u_int val, int nbits)
+ed_pccard_ax88x90_mii_bitbang_write(device_t dev, uint32_t val)
{
- int i, data;
+ struct ed_softc *sc;
- for (i = nbits - 1; i >= 0; i--) {
- data = (val >> i) & 1 ? ED_AX88X90_MII_DATAOUT : 0;
- ed_asic_outb(sc, ED_AX88X90_MIIBUS, data);
- ed_asic_outb(sc, ED_AX88X90_MIIBUS, data | ED_AX88X90_MII_CLK);
- }
+ sc = device_get_softc(dev);
+
+ ed_asic_outb(sc, ED_AX88X90_MIIBUS, val);
+ ed_asic_barrier(sc, ED_AX88X90_MIIBUS, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
}
-static u_int
-ed_pccard_ax88x90_mii_readbits(struct ed_softc *sc, int nbits)
+static uint32_t
+ed_pccard_ax88x90_mii_bitbang_read(device_t dev)
{
- int i;
- u_int val = 0;
- uint8_t mdio;
+ struct ed_softc *sc;
+ uint32_t val;
- mdio = ED_AX88X90_MII_DIRIN;
- for (i = nbits - 1; i >= 0; i--) {
- ed_asic_outb(sc, ED_AX88X90_MIIBUS, mdio);
- val <<= 1;
- if (ed_asic_inb(sc, ED_AX88X90_MIIBUS) & ED_AX88X90_MII_DATAIN)
- val++;
- ed_asic_outb(sc, ED_AX88X90_MIIBUS, mdio | ED_AX88X90_MII_CLK);
- }
- return val;
+ sc = device_get_softc(dev);
+
+ val = ed_asic_inb(sc, ED_AX88X90_MIIBUS);
+ ed_asic_barrier(sc, ED_AX88X90_MIIBUS, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ return (val);
}
/*
@@ -983,7 +1001,7 @@ ed_pccard_tc5299j(device_t dev, const st
error = ed_probe_Novell_generic(dev, device_get_flags(dev));
if (bootverbose)
- device_printf(dev, "probe novel returns %d\n", error);
+ device_printf(dev, "Novell generic probe failed: %d\n", error);
if (error != 0)
return (error);
@@ -992,24 +1010,17 @@ ed_pccard_tc5299j(device_t dev, const st
* devices have MII and a PHY, so we use this to weed out chips that
* would otherwise make it through the tests we have after this point.
*/
- sc->mii_readbits = ed_pccard_tc5299j_mii_readbits;
- sc->mii_writebits = ed_pccard_tc5299j_mii_writebits;
+ sc->mii_bitbang_ops = &ed_pccard_tc5299j_mii_bitbang_ops;
for (i = 0; i < 32; i++) {
id = ed_miibus_readreg(dev, i, MII_PHYIDR1);
if (id != 0 && id != 0xffff)
break;
}
- if (i == 32) {
- sc->mii_readbits = 0;
- sc->mii_writebits = 0;
+ if (i == 32)
return (ENXIO);
- }
ts = "TC5299J";
- if (ed_pccard_rom_mac(dev, sc->enaddr) == 0) {
- sc->mii_readbits = 0;
- sc->mii_writebits = 0;
+ if (ed_pccard_rom_mac(dev, sc->enaddr) == 0)
return (ENXIO);
- }
sc->vendor = ED_VENDOR_NOVELL;
sc->type = ED_TYPE_NE2000;
sc->chip_type = ED_CHIP_TYPE_TC5299J;
@@ -1018,50 +1029,31 @@ ed_pccard_tc5299j(device_t dev, const st
}
static void
-ed_pccard_tc5299j_mii_writebits(struct ed_softc *sc, u_int val, int nbits)
+ed_pccard_tc5299j_mii_bitbang_write(device_t dev, uint32_t val)
{
- int i;
- uint8_t cr, data;
+ struct ed_softc *sc;
- /* Select page 3 */
- cr = ed_nic_inb(sc, ED_P0_CR);
- ed_nic_outb(sc, ED_P0_CR, cr | ED_CR_PAGE_3);
-
- for (i = nbits - 1; i >= 0; i--) {
- data = (val >> i) & 1 ? ED_TC5299J_MII_DATAOUT : 0;
- ed_nic_outb(sc, ED_TC5299J_MIIBUS, data);
- ed_nic_outb(sc, ED_TC5299J_MIIBUS, data | ED_TC5299J_MII_CLK);
- }
- ed_nic_outb(sc, ED_TC5299J_MIIBUS, 0);
-
- /* Restore prior page */
- ed_nic_outb(sc, ED_P0_CR, cr);
+ sc = device_get_softc(dev);
+
+ /* We are already on page 3. */
+ ed_nic_outb(sc, ED_TC5299J_MIIBUS, val);
+ ed_nic_barrier(sc, ED_TC5299J_MIIBUS, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
}
-static u_int
-ed_pccard_tc5299j_mii_readbits(struct ed_softc *sc, int nbits)
+static uint32_t
+ed_pccard_tc5299j_mii_bitbang_read(device_t dev)
{
- int i;
- u_int val = 0;
- uint8_t cr;
+ struct ed_softc *sc;
+ uint32_t val;
+
+ sc = device_get_softc(dev);
- /* Select page 3 */
- cr = ed_nic_inb(sc, ED_P0_CR);
- ed_nic_outb(sc, ED_P0_CR, cr | ED_CR_PAGE_3);
-
- ed_asic_outb(sc, ED_TC5299J_MIIBUS, ED_TC5299J_MII_DIROUT);
- for (i = nbits - 1; i >= 0; i--) {
- ed_nic_outb(sc, ED_TC5299J_MIIBUS,
- ED_TC5299J_MII_CLK | ED_TC5299J_MII_DIROUT);
- val <<= 1;
- if (ed_nic_inb(sc, ED_TC5299J_MIIBUS) & ED_TC5299J_MII_DATAIN)
- val++;
- ed_nic_outb(sc, ED_TC5299J_MIIBUS, ED_TC5299J_MII_DIROUT);
- }
-
- /* Restore prior page */
- ed_nic_outb(sc, ED_P0_CR, cr);
- return val;
+ /* We are already on page 3. */
+ val = ed_asic_inb(sc, ED_TC5299J_MIIBUS);
+ ed_nic_barrier(sc, ED_TC5299J_MIIBUS, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ return (val);
}
/*
@@ -1071,7 +1063,8 @@ static int
ed_miibus_readreg(device_t dev, int phy, int reg)
{
struct ed_softc *sc;
- int failed, val;
+ int val;
+ uint8_t cr = 0;
sc = device_get_softc(dev);
/*
@@ -1085,10 +1078,6 @@ ed_miibus_readreg(device_t dev, int phy,
* Also, PHYs above 16 appear to be phantoms on some cards, but not
* others. Registers read for this are often the same as prior values
* read. Filter all register requests to 17-31.
- *
- * I can't explain it, since I don't have the DL100xx data sheets, but
- * the DL100xx chips do 13-bits before the 'ACK' but, but the AX88x90
- * chips have 14. The linux pcnet and axnet drivers confirm this.
*/
if (sc->chip_type == ED_CHIP_TYPE_AX88790) {
if (phy > 0x10)
@@ -1098,29 +1087,33 @@ ed_miibus_readreg(device_t dev, int phy,
ED_AX88X90_GPIO_INT_PHY);
else
ed_asic_outb(sc, ED_AX88X90_GPIO, 0);
+ ed_asic_barrier(sc, ED_AX88X90_GPIO, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ } else if (sc->chip_type == ED_CHIP_TYPE_TC5299J) {
+ /* Select page 3. */
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ cr = ed_nic_inb(sc, ED_P0_CR);
+ ed_nic_outb(sc, ED_P0_CR, cr | ED_CR_PAGE_3);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ }
+ val = mii_bitbang_readreg(dev, sc->mii_bitbang_ops, phy, reg);
+ if (sc->chip_type == ED_CHIP_TYPE_TC5299J) {
+ /* Restore prior page. */
+ ed_nic_outb(sc, ED_P0_CR, cr);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
}
-
- (*sc->mii_writebits)(sc, 0xffffffff, 32);
- (*sc->mii_writebits)(sc, ED_MII_STARTDELIM, ED_MII_STARTDELIM_BITS);
- (*sc->mii_writebits)(sc, ED_MII_READOP, ED_MII_OP_BITS);
- (*sc->mii_writebits)(sc, phy, ED_MII_PHY_BITS);
- (*sc->mii_writebits)(sc, reg, ED_MII_REG_BITS);
- if (sc->chip_type == ED_CHIP_TYPE_AX88790 ||
- sc->chip_type == ED_CHIP_TYPE_AX88190)
- (*sc->mii_readbits)(sc, ED_MII_ACK_BITS);
- failed = (*sc->mii_readbits)(sc, ED_MII_ACK_BITS);
- val = (*sc->mii_readbits)(sc, ED_MII_DATA_BITS);
- (*sc->mii_writebits)(sc, ED_MII_IDLE, ED_MII_IDLE_BITS);
-/* printf("Reading phy %d reg %#x returning %#x (valid %d)\n", phy, reg, val, !failed); */
- return (failed ? 0 : val);
+ return (val);
}
static int
ed_miibus_writereg(device_t dev, int phy, int reg, int data)
{
struct ed_softc *sc;
+ uint8_t cr = 0;
-/* printf("Writing phy %d reg %#x data %#x\n", phy, reg, data); */
sc = device_get_softc(dev);
/* See ed_miibus_readreg for details */
if (sc->chip_type == ED_CHIP_TYPE_AX88790) {
@@ -1131,15 +1124,24 @@ ed_miibus_writereg(device_t dev, int phy
ED_AX88X90_GPIO_INT_PHY);
else
ed_asic_outb(sc, ED_AX88X90_GPIO, 0);
+ ed_asic_barrier(sc, ED_AX88X90_GPIO, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ } else if (sc->chip_type == ED_CHIP_TYPE_TC5299J) {
+ /* Select page 3. */
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ cr = ed_nic_inb(sc, ED_P0_CR);
+ ed_nic_outb(sc, ED_P0_CR, cr | ED_CR_PAGE_3);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ }
+ mii_bitbang_writereg(dev, sc->mii_bitbang_ops, phy, reg, data);
+ if (sc->chip_type == ED_CHIP_TYPE_TC5299J) {
+ /* Restore prior page. */
+ ed_nic_outb(sc, ED_P0_CR, cr);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
}
- (*sc->mii_writebits)(sc, 0xffffffff, 32);
- (*sc->mii_writebits)(sc, ED_MII_STARTDELIM, ED_MII_STARTDELIM_BITS);
- (*sc->mii_writebits)(sc, ED_MII_WRITEOP, ED_MII_OP_BITS);
- (*sc->mii_writebits)(sc, phy, ED_MII_PHY_BITS);
- (*sc->mii_writebits)(sc, reg, ED_MII_REG_BITS);
- (*sc->mii_writebits)(sc, ED_MII_TURNAROUND, ED_MII_TURNAROUND_BITS);
- (*sc->mii_writebits)(sc, data, ED_MII_DATA_BITS);
- (*sc->mii_writebits)(sc, ED_MII_IDLE, ED_MII_IDLE_BITS);
return (0);
}
@@ -1150,9 +1152,12 @@ ed_ifmedia_upd(struct ifnet *ifp)
int error;
sc = ifp->if_softc;
- if (sc->miibus == NULL)
- return (ENXIO);
ED_LOCK(sc);
+ if (sc->miibus == NULL) {
+ ED_UNLOCK(sc);
+ return (ENXIO);
+ }
+
error = ed_pccard_kick_phy(sc);
ED_UNLOCK(sc);
return (error);
@@ -1165,13 +1170,17 @@ ed_ifmedia_sts(struct ifnet *ifp, struct
struct mii_data *mii;
sc = ifp->if_softc;
- if (sc->miibus == NULL)
+ ED_LOCK(sc);
+ if (sc->miibus == NULL) {
return;
+ ED_UNLOCK(sc);
+ }
mii = device_get_softc(sc->miibus);
mii_pollstat(mii);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
+ ED_UNLOCK(sc);
}
static void
@@ -1226,7 +1235,7 @@ static device_method_t ed_pccard_methods
DEVMETHOD(miibus_readreg, ed_miibus_readreg),
DEVMETHOD(miibus_writereg, ed_miibus_writereg),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t ed_pccard_driver = {
@@ -1235,7 +1244,7 @@ static driver_t ed_pccard_driver = {
sizeof(struct ed_softc)
};
-DRIVER_MODULE(ed, pccard, ed_pccard_driver, ed_devclass, 0, 0);
-DRIVER_MODULE(miibus, ed, miibus_driver, miibus_devclass, 0, 0);
+DRIVER_MODULE(ed, pccard, ed_pccard_driver, ed_devclass, 0, NULL);
+DRIVER_MODULE(miibus, ed, miibus_driver, miibus_devclass, 0, NULL);
MODULE_DEPEND(ed, miibus, 1, 1, 1);
MODULE_DEPEND(ed, ether, 1, 1, 1);
Modified: head/sys/dev/ed/if_ed_rtl80x9.c
==============================================================================
--- head/sys/dev/ed/if_ed_rtl80x9.c Sun Dec 29 19:02:33 2013 (r260049)
+++ head/sys/dev/ed/if_ed_rtl80x9.c Sun Dec 29 19:21:59 2013 (r260050)
@@ -117,7 +117,11 @@ ed_probe_RTL80x9(device_t dev, int port_
ifmedia_add(&sc->ifmedia, IFM_ETHER | IFM_10_5, 0, 0);
ifmedia_add(&sc->ifmedia, IFM_ETHER | IFM_AUTO, 0, 0);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_nic_outb(sc, ED_P0_CR, ED_CR_RD2 | ED_CR_PAGE_3 | ED_CR_STP);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
switch (ed_nic_inb(sc, ED_RTL80X9_CONFIG2) & ED_RTL80X9_CF2_MEDIA) {
case ED_RTL80X9_CF2_AUTO:
@@ -145,8 +149,12 @@ ed_rtl_set_media(struct ifnet *ifp)
sc = ifp->if_softc;
ED_LOCK(sc);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_nic_outb(sc, ED_P0_CR, sc->cr_proto | ED_CR_PAGE_3
| (ed_nic_inb(sc, ED_P0_CR) & (ED_CR_STA | ED_CR_STP)));
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
switch(IFM_SUBTYPE(sc->ifmedia.ifm_cur->ifm_media)) {
case IFM_10_T:
@@ -190,8 +198,12 @@ ed_rtl_get_media(struct ifnet *ifp, stru
if (IFM_SUBTYPE(imr->ifm_active) == IFM_AUTO) {
ED_LOCK(sc);
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
ed_nic_outb(sc, ED_P0_CR, sc->cr_proto | ED_CR_PAGE_3 |
(ed_nic_inb(sc, ED_P0_CR) & (ED_CR_STA | ED_CR_STP)));
+ ed_nic_barrier(sc, ED_P0_CR, 1,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
switch (ed_nic_inb(sc, ED_RTL80X9_CONFIG0)
& (sc->chip_type == ED_CHIP_TYPE_RTL8029 ? ED_RTL80X9_CF0_BNC
Modified: head/sys/dev/ed/if_edreg.h
==============================================================================
--- head/sys/dev/ed/if_edreg.h Sun Dec 29 19:02:33 2013 (r260049)
+++ head/sys/dev/ed/if_edreg.h Sun Dec 29 19:21:59 2013 (r260050)
@@ -1079,22 +1079,3 @@ struct ed_ring {
#define ED_CHIP_TYPE_TC5299J 10
#define ED_CHIP_TYPE_W89C926 11
#define ED_CHIP_TYPE_WD790 12
-
-/*
- * MII bus definitions. These are common to both DL100xx and AX88x90
- * MII definitions, because they are standards based.
- */
-#define ED_MII_STARTDELIM 0x01
-#define ED_MII_WRITEOP 0x01
-#define ED_MII_READOP 0x02
-#define ED_MII_TURNAROUND 0x02
-#define ED_MII_IDLE 0x01
-
-#define ED_MII_STARTDELIM_BITS 2
-#define ED_MII_OP_BITS 2
-#define ED_MII_PHY_BITS 5
-#define ED_MII_REG_BITS 5
-#define ED_MII_TURNAROUND_BITS 2
-#define ED_MII_ACK_BITS 1
-#define ED_MII_DATA_BITS 16
-#define ED_MII_IDLE_BITS 1
Modified: head/sys/dev/ed/if_edvar.h
==============================================================================
--- head/sys/dev/ed/if_edvar.h Sun Dec 29 19:02:33 2013 (r260049)
+++ head/sys/dev/ed/if_edvar.h Sun Dec 29 19:21:59 2013 (r260050)
@@ -28,7 +28,10 @@
*/
#ifndef SYS_DEV_ED_IF_EDVAR_H
-#define SYS_DEV_ED_IF_EDVAR_H
+#define SYS_DEV_ED_IF_EDVAR_H
+
+#include <dev/mii/mii_bitbang.h>
+
/*
* ed_softc: per line info and status
*/
@@ -62,8 +65,7 @@ struct ed_softc {
u_long command);
void (*sc_mediachg)(struct ed_softc *);
device_t miibus; /* MII bus for cards with MII. */
- void (*mii_writebits)(struct ed_softc *, u_int, int);
- u_int (*mii_readbits)(struct ed_softc *, int);
+ mii_bitbang_ops_t mii_bitbang_ops;
struct callout tick_ch;
void (*sc_tick)(struct ed_softc *);
void (*readmem)(struct ed_softc *sc, bus_size_t src, uint8_t *dst,
@@ -109,6 +111,10 @@ struct ed_softc {
struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */
};
+#define ed_nic_barrier(sc, port, length, flags) \
+ bus_space_barrier(sc->port_bst, sc->port_bsh, \
+ (sc)->nic_offset + (port), (length), (flags))
+
#define ed_nic_inb(sc, port) \
bus_space_read_1(sc->port_bst, sc->port_bsh, (sc)->nic_offset + (port))
@@ -147,6 +153,10 @@ struct ed_softc {
bus_space_write_multi_4(sc->port_bst, sc->port_bsh, \
(sc)->nic_offset + (port), (uint32_t *)(addr), (count))
+#define ed_asic_barrier(sc, port, length, flags) \
+ bus_space_barrier(sc->port_bst, sc->port_bsh, \
+ (sc)->asic_offset + (port), (length), (flags))
+
#define ed_asic_inb(sc, port) \
bus_space_read_1(sc->port_bst, sc->port_bsh, \
(sc)->asic_offset + (port))
Modified: head/sys/dev/ed/tc5299jreg.h
==============================================================================
--- head/sys/dev/ed/tc5299jreg.h Sun Dec 29 19:02:33 2013 (r260049)
+++ head/sys/dev/ed/tc5299jreg.h Sun Dec 29 19:21:59 2013 (r260050)
@@ -34,5 +34,5 @@
#define ED_TC5299J_MII_CLK 0x01
#define ED_TC5299J_MII_DATAOUT 0x02
-#define ED_TC5299J_MII_DIROUT 0x04
+#define ED_TC5299J_MII_DIRIN 0x04
#define ED_TC5299J_MII_DATAIN 0x08
More information about the svn-src-head
mailing list