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

Introduce sf_ifmedia_upd_locked() and have driver reset PHY before

Browse Source 
switching to selected media.  While here, set if_drv_flags before
switching to selected media.
This commit is contained in:
Pyun YongHyeon 2012-02-23 05:23:21 +00:00
parent 0f881e21e5
commit 7ae32f8a3c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232025
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/sf/if_sf.c
View File

@ -172,6 +172,7 @@ static void sf_init_locked(struct sf_softc *);
static void sf_stop(struct sf_softc *); static void sf_stop(struct sf_softc *);
static void sf_watchdog(struct sf_softc *); static void sf_watchdog(struct sf_softc *);
static int sf_ifmedia_upd(struct ifnet *); static int sf_ifmedia_upd(struct ifnet *);
static int sf_ifmedia_upd_locked(struct ifnet *);
static void sf_ifmedia_sts(struct ifnet *, struct ifmediareq *); static void sf_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static void sf_reset(struct sf_softc *); static void sf_reset(struct sf_softc *);
static int sf_dma_alloc(struct sf_softc *); static int sf_dma_alloc(struct sf_softc *);
@ -523,20 +524,27 @@ static int
sf_ifmedia_upd(struct ifnet *ifp) sf_ifmedia_upd(struct ifnet *ifp)
{ {
struct sf_softc *sc; struct sf_softc *sc;
struct mii_data *mii;
struct mii_softc *miisc;
int error; int error;
sc = ifp->if_softc; sc = ifp->if_softc;
SF_LOCK(sc); SF_LOCK(sc);
error = sf_ifmedia_upd_locked(ifp);
SF_UNLOCK(sc);
return (error);
}
static int
sf_ifmedia_upd_locked(struct ifnet *ifp)
{
struct sf_softc *sc;
struct mii_data *mii;
struct mii_softc *miisc;
sc = ifp->if_softc;
mii = device_get_softc(sc->sf_miibus); mii = device_get_softc(sc->sf_miibus);
LIST_FOREACH(miisc, &mii->mii_phys, mii_list) LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
PHY_RESET(miisc); PHY_RESET(miisc);
error = mii_mediachg(mii); return (mii_mediachg(mii));
SF_UNLOCK(sc);
return (error);
} }
/* /*
@ -2136,12 +2144,12 @@ sf_init_locked(struct sf_softc *sc)
else else
SF_CLRBIT(sc, SF_GEN_ETH_CTL, SF_ETHCTL_RXGFP_ENB); SF_CLRBIT(sc, SF_GEN_ETH_CTL, SF_ETHCTL_RXGFP_ENB);
sc->sf_link = 0;
mii_mediachg(mii);
ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
sc->sf_link = 0;
sf_ifmedia_upd_locked(ifp);
callout_reset(&sc->sf_co, hz, sf_tick, sc); callout_reset(&sc->sf_co, hz, sf_tick, sc);
} }