Deleted Added
full compact
mii_physubr.c (220938) mii_physubr.c (221407)
1/* $NetBSD: mii_physubr.c,v 1.5 1999/08/03 19:41:49 drochner Exp $ */
2
3/*-
4 * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,

--- 17 unchanged lines hidden (view full) ---

26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 * POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/* $NetBSD: mii_physubr.c,v 1.5 1999/08/03 19:41:49 drochner Exp $ */
2
3/*-
4 * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,

--- 17 unchanged lines hidden (view full) ---

26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 * POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/dev/mii/mii_physubr.c 220938 2011-04-22 09:22:27Z marius $");
34__FBSDID("$FreeBSD: head/sys/dev/mii/mii_physubr.c 221407 2011-05-03 19:51:29Z marius $");
35
36/*
37 * Subroutines common to all PHYs.
38 */
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>

--- 102 unchanged lines hidden (view full) ---

145 /* XXX Only 1000BASE-T has PAUSE_ASYM? */
146 if ((sc->mii_flags & MIIF_HAVE_GTCR) != 0 &&
147 (sc->mii_extcapabilities &
148 (EXTSR_1000THDX | EXTSR_1000TFDX)) != 0)
149 anar |= ANAR_X_PAUSE_ASYM;
150 }
151 }
152
35
36/*
37 * Subroutines common to all PHYs.
38 */
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>

--- 102 unchanged lines hidden (view full) ---

145 /* XXX Only 1000BASE-T has PAUSE_ASYM? */
146 if ((sc->mii_flags & MIIF_HAVE_GTCR) != 0 &&
147 (sc->mii_extcapabilities &
148 (EXTSR_1000THDX | EXTSR_1000TFDX)) != 0)
149 anar |= ANAR_X_PAUSE_ASYM;
150 }
151 }
152
153 if ((ife->ifm_media & IFM_LOOP) != 0)
154 bmcr |= BMCR_LOOP;
155
156 PHY_WRITE(sc, MII_ANAR, anar);
157 PHY_WRITE(sc, MII_BMCR, bmcr);
158 if ((sc->mii_flags & MIIF_HAVE_GTCR) != 0)
159 PHY_WRITE(sc, MII_100T2CR, gtcr);
160}
161
162int
163mii_phy_auto(struct mii_softc *sc)

--- 82 unchanged lines hidden (view full) ---

246 if (sc->mii_anegticks == 0)
247 sc->mii_anegticks = MII_ANEGTICKS_GIGE;
248
249 /* Only retry autonegotiation every mii_anegticks ticks. */
250 if (sc->mii_ticks <= sc->mii_anegticks)
251 return (EJUSTRETURN);
252
253 sc->mii_ticks = 0;
153 PHY_WRITE(sc, MII_ANAR, anar);
154 PHY_WRITE(sc, MII_BMCR, bmcr);
155 if ((sc->mii_flags & MIIF_HAVE_GTCR) != 0)
156 PHY_WRITE(sc, MII_100T2CR, gtcr);
157}
158
159int
160mii_phy_auto(struct mii_softc *sc)

--- 82 unchanged lines hidden (view full) ---

243 if (sc->mii_anegticks == 0)
244 sc->mii_anegticks = MII_ANEGTICKS_GIGE;
245
246 /* Only retry autonegotiation every mii_anegticks ticks. */
247 if (sc->mii_ticks <= sc->mii_anegticks)
248 return (EJUSTRETURN);
249
250 sc->mii_ticks = 0;
254 mii_phy_reset(sc);
251 PHY_RESET(sc);
255 mii_phy_auto(sc);
256 return (0);
257}
258
259void
260mii_phy_reset(struct mii_softc *sc)
261{
262 struct ifmedia_entry *ife = sc->mii_pdata->mii_media.ifm_cur;

--- 64 unchanged lines hidden (view full) ---

327 * Set the autonegotiation timer for 10/100 media. Gigabit media is
328 * handled below.
329 */
330 sc->mii_anegticks = MII_ANEGTICKS;
331
332#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL)
333#define PRINT(s) printf("%s%s", sep, s); sep = ", "
334
252 mii_phy_auto(sc);
253 return (0);
254}
255
256void
257mii_phy_reset(struct mii_softc *sc)
258{
259 struct ifmedia_entry *ife = sc->mii_pdata->mii_media.ifm_cur;

--- 64 unchanged lines hidden (view full) ---

324 * Set the autonegotiation timer for 10/100 media. Gigabit media is
325 * handled below.
326 */
327 sc->mii_anegticks = MII_ANEGTICKS;
328
329#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL)
330#define PRINT(s) printf("%s%s", sep, s); sep = ", "
331
335 if ((sc->mii_flags & MIIF_NOISOLATE) == 0)
332 if ((sc->mii_flags & MIIF_NOISOLATE) == 0) {
336 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_NONE, 0, sc->mii_inst),
337 MII_MEDIA_NONE);
333 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_NONE, 0, sc->mii_inst),
334 MII_MEDIA_NONE);
335 PRINT("none");
336 }
338
339 /*
340 * There are different interpretations for the bits in
341 * HomePNA PHYs. And there is really only one media type
342 * that is supported.
343 */
344 if ((sc->mii_flags & MIIF_IS_HPNA) != 0) {
345 if ((sc->mii_capabilities & BMSR_10THDX) != 0) {

--- 170 unchanged lines hidden (view full) ---

516 mpd = mii_phy_match(device_get_ivars(dev), mpd);
517 if (mpd != NULL) {
518 device_set_desc(dev, mpd->mpd_name);
519 return (mrv);
520 }
521 return (ENXIO);
522}
523
337
338 /*
339 * There are different interpretations for the bits in
340 * HomePNA PHYs. And there is really only one media type
341 * that is supported.
342 */
343 if ((sc->mii_flags & MIIF_IS_HPNA) != 0) {
344 if ((sc->mii_capabilities & BMSR_10THDX) != 0) {

--- 170 unchanged lines hidden (view full) ---

515 mpd = mii_phy_match(device_get_ivars(dev), mpd);
516 if (mpd != NULL) {
517 device_set_desc(dev, mpd->mpd_name);
518 return (mrv);
519 }
520 return (ENXIO);
521}
522
523void
524mii_phy_dev_attach(device_t dev, u_int flags, const struct mii_phy_funcs *mpf,
525 int add_media)
526{
527 struct mii_softc *sc;
528 struct mii_attach_args *ma;
529 struct mii_data *mii;
530
531 sc = device_get_softc(dev);
532 ma = device_get_ivars(dev);
533 sc->mii_dev = device_get_parent(dev);
534 mii = ma->mii_data;
535 LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
536
537 sc->mii_flags = flags | miibus_get_flags(dev);
538 sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
539 sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
540 sc->mii_mpd_rev = MII_REV(ma->mii_id2);
541 sc->mii_capmask = ma->mii_capmask;
542 sc->mii_inst = mii->mii_instance++;
543 sc->mii_phy = ma->mii_phyno;
544 sc->mii_offset = ma->mii_offset;
545 sc->mii_funcs = mpf;
546 sc->mii_pdata = mii;
547
548 if (bootverbose)
549 device_printf(dev, "OUI 0x%06x, model 0x%04x, rev. %d\n",
550 sc->mii_mpd_oui, sc->mii_mpd_model, sc->mii_mpd_rev);
551
552 if (add_media == 0)
553 return;
554
555 PHY_RESET(sc);
556
557 sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & sc->mii_capmask;
558 if (sc->mii_capabilities & BMSR_EXTSTAT)
559 sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR);
560 device_printf(dev, " ");
561 mii_phy_add_media(sc);
562 printf("\n");
563
564 MIIBUS_MEDIAINIT(sc->mii_dev);
565}
566
524/*
525 * Return the flow control status flag from MII_ANAR & MII_ANLPAR.
526 */
527u_int
528mii_phy_flowstatus(struct mii_softc *sc)
529{
530 int anar, anlpar;
531

--- 43 unchanged lines hidden ---
567/*
568 * Return the flow control status flag from MII_ANAR & MII_ANLPAR.
569 */
570u_int
571mii_phy_flowstatus(struct mii_softc *sc)
572{
573 int anar, anlpar;
574

--- 43 unchanged lines hidden ---