d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cpsw_detach() to not panic when called from cpsw_attach().

Browse Source 
For an unkown reason (at moment), sometimes if_cpsw cannot read from PHY
and fails to attach calling cpsw_detach() which end up in a panic.

Fix it by doing the proper check before detach the miibus and also fix the
leak of few variables.

And to actually make it work, ether_ifattach() has to be moved to the end
of cpsw_attach() to avoid a race where calling ether_ifdetach() before
domain_init() (which will only run later on) would make it crash at
INP_INFO_RLOCK() on in_pcbpurgeif0().

Tested on:	BBB (am335x)
MFC after:	1 week
This commit is contained in:
Luiz Otavio O Souza 2014-10-24 21:08:02 +00:00
parent f53b045631
commit 1210d2685f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/arm/ti/cpsw/if_cpsw.c
View File

@ -666,9 +666,6 @@ cpsw_attach(device_t dev)
sc->mac_addr[4] = reg & 0xFF; sc->mac_addr[4] = reg & 0xFF;
sc->mac_addr[5] = (reg >> 8) & 0xFF; sc->mac_addr[5] = (reg >> 8) & 0xFF;
ether_ifattach(ifp, sc->mac_addr);
callout_init(&sc->watchdog.callout, 0);
/* Initialze MDIO - ENABLE, PREAMBLE=0, FAULTENB, CLKDIV=0xFF */ /* Initialze MDIO - ENABLE, PREAMBLE=0, FAULTENB, CLKDIV=0xFF */
/* TODO Calculate MDCLK=CLK/(CLKDIV+1) */ /* TODO Calculate MDCLK=CLK/(CLKDIV+1) */
cpsw_write_4(sc, MDIOCONTROL, 1 << 30 | 1 << 18 | 0xFF); cpsw_write_4(sc, MDIOCONTROL, 1 << 30 | 1 << 18 | 0xFF);
@ -703,6 +700,9 @@ cpsw_attach(device_t dev)
return (ENXIO); return (ENXIO);
} }
ether_ifattach(ifp, sc->mac_addr);
callout_init(&sc->watchdog.callout, 0);
return (0); return (0);
} }
@ -740,15 +740,21 @@ cpsw_detach(device_t dev)
} }
bus_generic_detach(dev); bus_generic_detach(dev);
if (sc->miibus)
device_delete_child(dev, sc->miibus); device_delete_child(dev, sc->miibus);
/* Stop and release all interrupts */ /* Stop and release all interrupts */
cpsw_detach_interrupts(sc); cpsw_detach_interrupts(sc);
/* Free dmamaps and mbufs */ /* Free dmamaps and mbufs */
for (i = 0; i < sizeof(sc->_slots) / sizeof(sc->_slots[0]); ++i) { for (i = 0; i < sizeof(sc->_slots) / sizeof(sc->_slots[0]); ++i)
cpsw_free_slot(sc, &sc->_slots[i]); cpsw_free_slot(sc, &sc->_slots[i]);
if (sc->null_mbuf_dmamap) {
error = bus_dmamap_destroy(sc->mbuf_dtag, sc->null_mbuf_dmamap);
KASSERT(error == 0, ("Mapping still active"));
} }
if (sc->null_mbuf)
m_freem(sc->null_mbuf);
/* Free DMA tag */ /* Free DMA tag */
error = bus_dma_tag_destroy(sc->mbuf_dtag); error = bus_dma_tag_destroy(sc->mbuf_dtag);
@ -757,6 +763,9 @@ cpsw_detach(device_t dev)
/* Free IO memory handler */ /* Free IO memory handler */
bus_release_resources(dev, res_spec, sc->res); bus_release_resources(dev, res_spec, sc->res);
if (sc->ifp != NULL)
if_free(sc->ifp);
/* Destroy mutexes */ /* Destroy mutexes */
mtx_destroy(&sc->rx.lock); mtx_destroy(&sc->rx.lock);
mtx_destroy(&sc->tx.lock); mtx_destroy(&sc->tx.lock);