Page MenuHomeFreeBSD
Files F142592615

D18844.diff
No OneTemporary
Actions

D18844.diff
View Options

Index: head/sys/arm/allwinner/if_awg.c
===================================================================
--- head/sys/arm/allwinner/if_awg.c
+++ head/sys/arm/allwinner/if_awg.c
@@ -750,6 +750,31 @@
WR4(sc, EMAC_INT_EN, 0);
}
+static int
+awg_reset(struct awg_softc *sc)
+{
+ int retry;
+
+ /* Soft reset all registers and logic */
+ WR4(sc, EMAC_BASIC_CTL_1, BASIC_CTL_SOFT_RST);
+
+ /* Wait for soft reset bit to self-clear */
+ for (retry = SOFT_RST_RETRY; retry > 0; retry--) {
+ if ((RD4(sc, EMAC_BASIC_CTL_1) & BASIC_CTL_SOFT_RST) == 0)
+ break;
+ DELAY(10);
+ }
+ if (retry == 0) {
+ device_printf(sc->dev, "soft reset timed out\n");
+#ifdef AWG_DEBUG
+ awg_dump_regs(sc->dev);
+#endif
+ return (ETIMEDOUT);
+ }
+
+ return (0);
+}
+
static void
awg_init_locked(struct awg_softc *sc)
{
@@ -765,6 +790,12 @@
if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
return;
+ awg_reset(sc);
+
+ /* Write transmit and receive descriptor base address registers */
+ WR4(sc, EMAC_TX_DMA_LIST, sc->tx.desc_ring_paddr);
+ WR4(sc, EMAC_RX_DMA_LIST, sc->rx.desc_ring_paddr);
+
awg_setup_rxfilter(sc);
/* Configure DMA burst length and priorities */
@@ -1653,40 +1684,6 @@
return (0);
}
-static int
-awg_reset(device_t dev)
-{
- struct awg_softc *sc;
- int retry;
-
- sc = device_get_softc(dev);
-
- /* Reset PHY if necessary */
- if (awg_phy_reset(dev) != 0) {
- device_printf(dev, "failed to reset PHY\n");
- return (ENXIO);
- }
-
- /* Soft reset all registers and logic */
- WR4(sc, EMAC_BASIC_CTL_1, BASIC_CTL_SOFT_RST);
-
- /* Wait for soft reset bit to self-clear */
- for (retry = SOFT_RST_RETRY; retry > 0; retry--) {
- if ((RD4(sc, EMAC_BASIC_CTL_1) & BASIC_CTL_SOFT_RST) == 0)
- break;
- DELAY(10);
- }
- if (retry == 0) {
- device_printf(dev, "soft reset timed out\n");
-#ifdef AWG_DEBUG
- awg_dump_regs(dev);
-#endif
- return (ETIMEDOUT);
- }
-
- return (0);
-}
-
static void
awg_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error)
{
@@ -1840,10 +1837,6 @@
bus_dmamap_sync(sc->rx.desc_tag, sc->rx.desc_map,
BUS_DMASYNC_PREWRITE);
- /* Write transmit and receive descriptor base address registers */
- WR4(sc, EMAC_TX_DMA_LIST, sc->tx.desc_ring_paddr);
- WR4(sc, EMAC_RX_DMA_LIST, sc->rx.desc_ring_paddr);
-
return (0);
}
@@ -1888,10 +1881,12 @@
/* Read MAC address before resetting the chip */
awg_get_eaddr(dev, eaddr);
- /* Soft reset EMAC core */
- error = awg_reset(dev);
- if (error != 0)
+ /* Reset PHY if necessary */
+ error = awg_phy_reset(dev);
+ if (error != 0) {
+ device_printf(dev, "failed to reset PHY\n");
return (error);
+ }
/* Setup DMA descriptors */
error = awg_setup_dma(dev);

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 8:27 AM (12 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27837189
Default Alt Text
D18844.diff (2 KB)

Event Timeline